Skip to content

Commit 898ccd6

Browse files
author
Tyler Brandt
authored
Merge branch 'master' into 2.1.x
2 parents a19752b + c3a31e0 commit 898ccd6

File tree

17 files changed

+100
-96
lines changed

17 files changed

+100
-96
lines changed

‎.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ env:
1818
before_script:
1919
- npm install grunt-cli -g
2020
install: npm install
21+
addons:
22+
srcclr: true
2123
script:
2224
- npm run test-travis
2325
after_success:

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</h3>
44

55
<p align="center">
6-
This repository houses the JavaScript SDK for use with Optimizely X Full Stack
6+
This repository houses the official JavaScript SDK for use with Optimizely X Full Stack
77
</p>
88

99
## Packages
@@ -21,4 +21,4 @@ This repository is a monorepo that we manage using [Lerna](https://github.com/le
2121

2222
### Contributing
2323

24-
Please see [CONTRIBUTING](CONTRIBUTING.md).
24+
Please see [CONTRIBUTING](CONTRIBUTING.md).

‎packages/optimizely-sdk/lib/core/decision_service/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ DecisionService.prototype.getVariation = function(experimentKey, userId, attribu
6868
if (!fns.isEmpty(attributes)) {
6969
if (attributes.hasOwnProperty(enums.CONTROL_ATTRIBUTES.BUCKETING_ID)) {
7070
bucketingId = attributes[enums.CONTROL_ATTRIBUTES.BUCKETING_ID];
71-
this.logger.log(LOG_LEVEL.DEBUG, sprintf('Setting the bucketing ID to %s.', bucketingId))
71+
this.logger.log(LOG_LEVEL.DEBUG, sprintf('Setting the bucketing ID to %s.', bucketingId));
7272
}
7373
}
7474

‎packages/optimizely-sdk/lib/core/decision_service/index.tests.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ describe('lib/core/decision_service', function() {
360360

361361
var testUserAttributes = {
362362
'browser_type': 'firefox',
363-
}
363+
};
364364
var userAttributesWithBucketingId = {
365365
'browser_type': 'firefox',
366366
'$opt_bucketing_id': '123456789'
@@ -436,7 +436,7 @@ describe('lib/core/decision_service', function() {
436436
var userProfileServiceInstance = {
437437
lookup: function () {
438438
},
439-
}
439+
};
440440
userProfileLookupStub = sinon.stub(userProfileServiceInstance, 'lookup');
441441
userProfileLookupStub.returns({
442442
user_id: 'test_user',

‎packages/optimizely-sdk/lib/core/event_builder/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function getCommonEventParams(options) {
6666
key: attributeKey,
6767
type: CUSTOM_ATTRIBUTE_FEATURE_TYPE,
6868
value: attributes[attributeKey],
69-
});
69+
});
7070
}
7171
});
7272

@@ -77,7 +77,7 @@ function getCommonEventParams(options) {
7777
type: CUSTOM_ATTRIBUTE_FEATURE_TYPE,
7878
value: botFiltering,
7979
});
80-
};
80+
}
8181
return commonParams;
8282
}
8383

‎packages/optimizely-sdk/lib/core/event_builder/index.tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ describe('lib/core/event_builder', function() {
290290

291291
assert.deepEqual(actualParams, expectedParams);
292292
});
293-
293+
294294
it('should fill in userFeatures for user agent and bot filtering (bot filtering enabled)', function() {
295295
var v4ConfigObj = projectConfig.createProjectConfig(testData.getTestProjectConfigWithFeatures());
296296
var expectedParams = {

‎packages/optimizely-sdk/lib/core/project_config/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ module.exports = {
141141
var hasReservedPrefix = attributeKey.indexOf(RESERVED_ATTRIBUTE_PREFIX) === 0;
142142
if (attribute) {
143143
if (hasReservedPrefix) {
144-
logger.log(LOG_LEVEL.WARN,
144+
logger.log(LOG_LEVEL.WARN,
145145
sprintf('Attribute %s unexpectedly has reserved prefix %s; using attribute ID instead of reserved attribute name.', attributeKey, RESERVED_ATTRIBUTE_PREFIX));
146146
}
147147
return attribute.id;
@@ -372,7 +372,7 @@ module.exports = {
372372
} else {
373373
// catching improperly formatted experiments
374374
logger.log(LOG_LEVEL.ERROR, sprintf(ERROR_MESSAGES.IMPROPERLY_FORMATTED_EXPERIMENT, MODULE_NAME, experimentKey));
375-
return null
375+
return null;
376376
}
377377
} catch (ex) {
378378
// catching experiment not in datafile

‎packages/optimizely-sdk/lib/core/project_config/index.tests.js

Lines changed: 49 additions & 49 deletions
Large diffs are not rendered by default.

‎packages/optimizely-sdk/lib/index.browser.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ module.exports = {
5656
}
5757
}
5858

59-
if (config.skipJSONValidation == null) {
59+
// Explicitly check for null or undefined
60+
if (config.skipJSONValidation == null) { // eslint-disable-line eqeqeq
6061
config.skipJSONValidation = true;
6162
}
6263

‎packages/optimizely-sdk/lib/index.browser.tests.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ describe('javascript-sdk', function() {
4141
xhr = sinon.useFakeXMLHttpRequest();
4242
global.XMLHttpRequest = xhr;
4343
requests = [];
44-
xhr.onCreate = function (xhr) {
45-
requests.push(xhr);
44+
xhr.onCreate = function (req) {
45+
requests.push(req);
4646
};
4747
});
4848

@@ -124,7 +124,7 @@ describe('javascript-sdk', function() {
124124
assert.strictEqual(didSetVariation, true);
125125

126126
var variation = optlyInstance.getForcedVariation('testExperiment', 'testUser');
127-
assert.strictEqual(variation, 'control')
127+
assert.strictEqual(variation, 'control');
128128
done();
129129
});
130130

@@ -140,13 +140,13 @@ describe('javascript-sdk', function() {
140140
assert.strictEqual(didSetVariation, true);
141141

142142
var variation = optlyInstance.getForcedVariation('testExperiment', 'testUser');
143-
assert.strictEqual(variation, 'control')
143+
assert.strictEqual(variation, 'control');
144144

145145
var didSetVariation2 = optlyInstance.setForcedVariation('testExperiment', 'testUser', null);
146146
assert.strictEqual(didSetVariation2, true);
147147

148148
var variation2 = optlyInstance.getForcedVariation('testExperiment', 'testUser');
149-
assert.strictEqual(variation2, null)
149+
assert.strictEqual(variation2, null);
150150
done();
151151
});
152152

@@ -166,10 +166,10 @@ describe('javascript-sdk', function() {
166166

167167

168168
var variation = optlyInstance.getForcedVariation('testExperiment', 'testUser');
169-
assert.strictEqual(variation, 'control')
169+
assert.strictEqual(variation, 'control');
170170

171171
var variation2 = optlyInstance.getForcedVariation('testExperimentLaunched', 'testUser');
172-
assert.strictEqual(variation2, 'controlLaunched')
172+
assert.strictEqual(variation2, 'controlLaunched');
173173
done();
174174
});
175175

@@ -191,10 +191,10 @@ describe('javascript-sdk', function() {
191191
assert.strictEqual(didSetVariation2, true);
192192

193193
var variation = optlyInstance.getForcedVariation('testExperiment', 'testUser');
194-
assert.strictEqual(variation, 'control')
194+
assert.strictEqual(variation, 'control');
195195

196196
var variation2 = optlyInstance.getForcedVariation('testExperimentLaunched', 'testUser');
197-
assert.strictEqual(variation2, null)
197+
assert.strictEqual(variation2, null);
198198
done();
199199
});
200200

@@ -216,10 +216,10 @@ describe('javascript-sdk', function() {
216216
assert.strictEqual(didSetVariation2, true);
217217

218218
var variation = optlyInstance.getForcedVariation('testExperiment', 'testUser');
219-
assert.strictEqual(variation, 'control')
219+
assert.strictEqual(variation, 'control');
220220

221221
var variation2 = optlyInstance.getForcedVariation('testExperimentLaunched', 'testUser');
222-
assert.strictEqual(variation2, 'variationLaunched')
222+
assert.strictEqual(variation2, 'variationLaunched');
223223
done();
224224
});
225225

@@ -235,13 +235,13 @@ describe('javascript-sdk', function() {
235235
assert.strictEqual(didSetVariation, true);
236236

237237
var variation = optlyInstance.getVariation('testExperiment', 'testUser');
238-
assert.strictEqual(variation, 'control')
238+
assert.strictEqual(variation, 'control');
239239

240240
var didSetVariation2 = optlyInstance.setForcedVariation('testExperiment', 'testUser', 'variation');
241241
assert.strictEqual(didSetVariation2, true);
242242

243243
var variation = optlyInstance.getVariation('testExperiment', 'testUser');
244-
assert.strictEqual(variation, 'variation')
244+
assert.strictEqual(variation, 'variation');
245245
done();
246246
});
247247

@@ -257,7 +257,7 @@ describe('javascript-sdk', function() {
257257
assert.strictEqual(didSetVariation, true);
258258

259259
var variation = optlyInstance.getVariation('testExperimentNotRunning', 'testUser');
260-
assert.strictEqual(variation, null)
260+
assert.strictEqual(variation, null);
261261

262262
done();
263263
});

0 commit comments

Comments
 (0)