Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/Add-britepool-userid-submodule' …
Browse files Browse the repository at this point in the history
…into Add-britepool-userid-submodule

# Conflicts:
#	test/spec/modules/userId_spec.js
  • Loading branch information
bansawbanchee committed Oct 17, 2019
2 parents 05c90d2 + 0fd8701 commit 44266b8
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions test/spec/modules/userId_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ describe('User ID', function() {
userSync: {
syncDelay: 0,
userIds: [
(configArr1 && configArr1.length === 3) ? getStorageMock.apply(null, configArr1) : null,
(configArr2 && configArr2.length === 3) ? getStorageMock.apply(null, configArr2) : null,
(configArr3 && configArr3.length === 3) ? getStorageMock.apply(null, configArr3) : null,
(configArr4 && configArr4.length === 3) ? getStorageMock.apply(null, configArr4) : null,
(configArr5 && configArr5.length === 3) ? getStorageMock.apply(null, configArr5) : null
(configArr1 && configArr1.length >= 3) ? getStorageMock.apply(null, configArr1) : null,
(configArr2 && configArr2.length >= 3) ? getStorageMock.apply(null, configArr2) : null,
(configArr3 && configArr3.length >= 3) ? getStorageMock.apply(null, configArr3) : null,
(configArr4 && configArr4.length >= 3) ? getStorageMock.apply(null, configArr4) : null,
(configArr5 && configArr5.length >= 3) ? getStorageMock.apply(null, configArr5) : null
].filter(i => i)}
}
}
Expand Down

0 comments on commit 44266b8

Please sign in to comment.