normalize: keep traits in options

analytics.js

@@ -18893,7 +18893,6 @@ var toplevel = [
   'context',
   'groupId',
   'userId',
-  'traits',
   'event',
   'name'
 ];

lib/normalize.js

@@ -36,7 +36,6 @@ var toplevel = [
   'context',
   'groupId',
   'userId',
-  'traits',
   'event',
   'name'
 ];

test/analytics.js

@@ -538,6 +538,14 @@ describe('Analytics', function () {
       assert.equal('id', page.obj.anonymousId);
     });
 
+    it('should accept context.traits', function(){
+      analytics.page({ prop: true }, { traits: { trait: true } });
+      var page = analytics._invoke.args[0][1];
+      assert.deepEqual(page.context(), {
+        traits: { trait: true }
+      });
+    });
+
     it('should emit page', function (done) {
       defaults.category = 'category';
       defaults.name = 'name';
@@ -746,6 +754,15 @@ describe('Analytics', function () {
       var identify = analytics._invoke.args[0][1];
       assert.deepEqual(app, identify.obj.context.app);
     });
+
+    it('should accept context.traits', function(){
+      analytics.identify(1, { trait: 1 }, { traits: { trait: true } });
+      var identify = analytics._invoke.args[0][1];
+      assert.deepEqual(identify.traits(), { trait: 1, id: 1 });
+      assert.deepEqual(identify.context(), {
+        traits: { trait: true }
+      });
+    });
   });
 
   describe('#user', function () {
@@ -910,6 +927,15 @@ describe('Analytics', function () {
       var group = analytics._invoke.args[0][1];
       assert.deepEqual(app, group.obj.context.app);
     });
+
+    it('should accept context.traits', function(){
+      analytics.group(1, { trait: 1 }, { traits: { trait: true } });
+      var group = analytics._invoke.args[0][1];
+      assert.deepEqual(group.traits(), { trait: 1, id: 1 });
+      assert.deepEqual(group.context(), {
+        traits: { trait: true }
+      });
+    });
   });
 
   describe('#track', function () {
@@ -1060,7 +1086,16 @@ describe('Analytics', function () {
       analytics.track('event', {}, { campaign: {} });
       var msg = analytics._invoke.args[0][1];
       assert.deepEqual({}, msg.proxy('context.campaign'));
-    })
+    });
+
+    it('should accept context.traits', function(){
+      analytics.track('event', { prop: 1 }, { traits: { trait: true } });
+      var track = analytics._invoke.args[0][1];
+      assert.deepEqual(track.properties(), { prop: 1 });
+      assert.deepEqual(track.context(), {
+        traits: { trait: true }
+      });
+    });
   });
 
   describe('#trackLink', function () {

test/normalize.js

@@ -36,7 +36,6 @@ describe('normalize', function(){
       opts.groupId = 'group-id';
       opts.integrations = { foo: 1 };
       opts.properties = { prop: 1 };
-      opts.traits = { trait: 1 };
       opts.previousId = 'previous-id';
       opts.context = { context: 1 };
 
@@ -50,7 +49,6 @@ describe('normalize', function(){
       assert.equal(out.groupId, 'group-id');
       assert.deepEqual(out.integrations, { foo: 1 });
       assert.deepEqual(out.properties, { prop: 1 });
-      assert.deepEqual(out.traits, { trait: 1 });
       assert.equal(out.previousId, 'previous-id');
       assert.deepEqual(out.context, { context: 1 });
     });
@@ -59,11 +57,13 @@ describe('normalize', function(){
       opts.context = { foo: 1 };
       opts.campaign = { name: 'campaign-name' };
       opts.library = 'analytics-wordpress';
+      opts.traits = { trait: true };
       assert.deepEqual(normalize(msg, list), {
         integrations: {},
         context: {
           campaign: { name: 'campaign-name' },
           library: 'analytics-wordpress',
+          traits: { trait: true },
           foo: 1
         }
       });