From d53ac4c66ff009de67748c2498c3ac989eb834be Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Mon, 28 Dec 2015 08:24:23 -0600 Subject: [PATCH] tests: Add ability to use ES2015 in karma tests --- karma.conf.js | 3 ++- package.json | 1 + test/spec/controllers/inviteToGroupCtrlSpec.js | 4 ++-- test/spec/specHelper.js | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 6af0403ebd..b888c19ac1 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -78,7 +78,8 @@ module.exports = function(config) { browsers: ['PhantomJS'], preprocessors: { - 'website/public/js/**/*.js': ['coverage'] + 'website/public/js/**/*.js': ['coverage'], + 'test/**/*.js': ['babel'], }, coverageReporter: { diff --git a/package.json b/package.json index 29fd67de2d..b19c0ee078 100644 --- a/package.json +++ b/package.json @@ -105,6 +105,7 @@ "istanbul": "^0.3.14", "phantomjs": "^1.9", "karma": "~0.13.15", + "karma-babel-preprocessor": "^5.0.0", "karma-chai-plugins": "~0.6.0", "karma-coverage": "^0.5.3", "karma-mocha": "^0.2.0", diff --git a/test/spec/controllers/inviteToGroupCtrlSpec.js b/test/spec/controllers/inviteToGroupCtrlSpec.js index 91d251dc58..385f42dda1 100644 --- a/test/spec/controllers/inviteToGroupCtrlSpec.js +++ b/test/spec/controllers/inviteToGroupCtrlSpec.js @@ -68,13 +68,13 @@ describe('Invite to Group Controller', function() { it('uses provided name', function() { scope.group.name = 'test party'; scope.inviteNewUsers('uuid'); - expect(group.name).to.eql('test party'); + expect(scope.group.name).to.eql('test party'); }); it('names the group if no name is provided', function() { scope.group.name = ''; scope.inviteNewUsers('uuid'); - expect(group.name).to.eql(env.t('possessiveParty', {name: user.profile.name})); + expect(scope.group.name).to.eql(env.t('possessiveParty', {name: user.profile.name})); }); }); diff --git a/test/spec/specHelper.js b/test/spec/specHelper.js index eb818a6ee0..9324fa5d8b 100644 --- a/test/spec/specHelper.js +++ b/test/spec/specHelper.js @@ -26,7 +26,7 @@ var specHelper = {}; gear: { equipped: {}, costume: {}, owned: {} } }; - user = { + var user = { _id: 'unique-user-id', auth: { timestamps: {} }, stats: stats, @@ -53,7 +53,7 @@ var specHelper = {}; function newGroup(overrides) { var quest = { progress: { }, active: false }; - group = { + var group = { _id: 'group-id', leader : 'leader-id', memberCount : 1,