Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync

test/spec/controllers/authCtrlSpec.js

@@ -10,8 +10,8 @@ describe('Auth Controller', function() {
       scope = $rootScope.$new();
       scope.loginUsername = 'user';
       scope.loginPassword = 'pass';
-      $window = { location: { href: ""}, alert: sinon.spy() };
-      user = { user: {}, authenticate: sinon.spy() };
+      $window = { location: { href: ""}, alert: sandbox.spy() };
+      user = { user: {}, authenticate: sandbox.spy() };
 
       ctrl = $controller('AuthCtrl', {$scope: scope, $window: $window, User: user});
     }));
@@ -20,16 +20,16 @@ describe('Auth Controller', function() {
       $httpBackend.expectPOST('/api/v2/user/auth/local').respond({id: 'abc', token: 'abc'});
       scope.auth();
       $httpBackend.flush();
-      sinon.assert.calledOnce(user.authenticate);
-      sinon.assert.notCalled($window.alert);
+      expect(user.authenticate).to.be.calledOnce;
+      expect($window.alert).to.not.be.called;
     });
 
     it('should not log in users with incorrect uname / pass', function() {
       $httpBackend.expectPOST('/api/v2/user/auth/local').respond(404, '');
       scope.auth();
       $httpBackend.flush();
-      sinon.assert.notCalled(user.authenticate);
-      sinon.assert.calledOnce($window.alert);
+      expect(user.authenticate).to.not.be.called;
+      expect($window.alert).to.be.calledOnce;
     });
   });
 

test/spec/controllers/challengesCtrlSpec.js

@@ -174,4 +174,12 @@ describe('Challenges Controller', function() {
       expect(scope.filterChallenges(notOwnNotMem)).to.eql(true);
     });
   });
+
+  describe('editTask', function() {
+    it('is Tasks.editTask', function() {
+      inject(function(Tasks) {
+        expect(scope.editTask).to.eql(Tasks.editTask);
+      });
+    });
+  });
 });

test/spec/controllers/groupCtrlSpec.js

@@ -30,7 +30,7 @@ describe('Groups Controller', function() {
       party.type = 'party';
       party.members = []; // Ensure we wouldn't pass automatically.
 
-      var partyStub = sinon.stub(groups,"party", function() {
+      var partyStub = sandbox.stub(groups,"party", function() {
         return party;
       });
 
@@ -44,7 +44,7 @@ describe('Groups Controller', function() {
       guild.type = 'guild';
       guild.members.push(user._id);
 
-      var myGuilds = sinon.stub(groups,"myGuilds", function() {
+      var myGuilds = sandbox.stub(groups,"myGuilds", function() {
         return [guild];
       });
 
@@ -58,7 +58,7 @@ describe('Groups Controller', function() {
       guild._id = "unique-guild-id";
       guild.type = 'guild';
 
-      var myGuilds = sinon.stub(groups,"myGuilds", function() {
+      var myGuilds = sandbox.stub(groups,"myGuilds", function() {
         return [];
       });
 
@@ -98,7 +98,7 @@ describe("Chat Controller", function() {
         name: "Princess Bride"
       };
 
-      var modalSpy = sinon.spy($rootScope, "openModal");
+      var modalSpy = sandbox.spy($rootScope, "openModal");
       var message = {
         uuid: 'the-dread-pirate-roberts',
         user: 'Wesley',
@@ -120,7 +120,7 @@ describe("Chat Controller", function() {
         name: "Princess Bride"
       };
 
-      var modalSpy = sinon.spy($rootScope, "openModal");
+      var modalSpy = sandbox.spy($rootScope, "openModal");
       var message = {
         uuid: 'system',
         text: 'Wesley attacked the ROUS in the Fire Swamp'
@@ -221,7 +221,7 @@ describe("Autocomplete controller", function() {
 
   describe("performCompletion", function() {
     it('triggers autoComplete', function() {
-      scope.autoComplete = sinon.spy();
+      scope.autoComplete = sandbox.spy();
 
       var msg = {user: "boo"}; // scope.autoComplete only cares about user
       scope.query = {text: "b"};
@@ -247,7 +247,7 @@ describe("Autocomplete controller", function() {
 
   describe("chatChanged", function() {
     it('if a new chat arrives, the new user name is extracted', function() {
-      var chatChanged = sinon.spy(scope, 'chatChanged');
+      var chatChanged = sandbox.spy(scope, 'chatChanged');
       scope.$watch('group.chat',scope.chatChanged); // reinstantiate watch so spy works
 
       scope.$digest(); // trigger watch
@@ -269,11 +269,11 @@ describe("CopyMessageModal controller", function() {
       user = specHelper.newUser();
       user._id = "unique-user-id";
       user.ops = {
-        addTask: sinon.spy()
+        addTask: sandbox.spy()
       };
 
       scope = $rootScope.$new();
-      scope.$close = sinon.spy();
+      scope.$close = sandbox.spy();
 
       $controller = _$controller_;
 
@@ -283,7 +283,7 @@ describe("CopyMessageModal controller", function() {
       ctrl = $controller('CopyMessageModalCtrl', {$scope: scope, User: {user: user}});
 
       Notification = _Notification_;
-      Notification.text = sinon.spy();
+      Notification.text = sandbox.spy();
     });
   });
 

test/spec/controllers/hallCtrlSpec.js

@@ -22,15 +22,12 @@ describe('Hall of Heroes Controller', function() {
   });
 
   it('populates contributor input with selected hero id', function(){
-    var loadHero = sinon.spy(scope, "loadHero");
-    var scrollTo = sinon.spy(window, "scrollTo");
+    var loadHero = sandbox.spy(scope, "loadHero");
+    var scrollTo = sandbox.spy(window, "scrollTo");
 
     scope.populateContributorInput(user._id);
     expect(scope._heroID).to.eql(user._id);
     expect(loadHero.callCount).to.eql(1);
     expect(scrollTo.callCount).to.eql(1);
-
-    scope.loadHero.restore();
-    window.scrollTo.restore();
   });
 });

test/spec/controllers/headerCtrlSpec.js

@@ -26,13 +26,8 @@ describe('Header Controller', function() {
 
   context('inviteOrStartParty', function(){
     beforeEach(function(){
-      sinon.stub($location, 'path');
-      sinon.stub($rootScope, 'openModal');
-    });
-
-    afterEach(function(){
-      $location.path.restore();
-      $rootScope.openModal.restore();
+      sandbox.stub($location, 'path');
+      sandbox.stub($rootScope, 'openModal');
     });
 
     it('redirects to party page if user does not have a party', function(){

test/spec/controllers/rootCtrlSpec.js

@@ -24,13 +24,13 @@ describe('Root Controller', function() {
       $httpBackend = _$httpBackend_;
 
       notification = Notification;
-      sinon.stub(notification, 'text');
-      sinon.stub(notification, 'markdown');
+      sandbox.stub(notification, 'text');
+      sandbox.stub(notification, 'markdown');
 
       user = specHelper.newUser();
       User = {user: user};
-      User.save = sinon.spy();
-      User.sync = sinon.spy();
+      User.save = sandbox.spy();
+      User.sync = sandbox.spy();
 
       $httpBackend.whenGET(/partials/).respond();
 
@@ -38,13 +38,6 @@ describe('Root Controller', function() {
     });
   });
 
-  afterEach(function() {
-    notification.text.reset();
-    notification.markdown.reset();
-    User.save.reset();
-    User.sync.reset();
-  });
-
   describe('contribText', function(){
     it('shows contributor level text', function(){
       expect(scope.contribText()).to.eql(undefined);

test/spec/controllers/tasksCtrlSpec.js

@@ -0,0 +1,31 @@
+'use strict';
+
+describe('Tasks Controller', function() {
+  var $rootScope, scope, user, ctrl;
+
+  beforeEach(function() {
+    user = specHelper.newUser();
+    module(function($provide) {
+      $provide.value('User', {user: user});
+      $provide.value('Guide', {});
+    });
+
+    inject(function($rootScope, $controller){
+
+      scope = $rootScope.$new();
+
+      $controller('RootCtrl',  {$scope: scope, User: {user: user}});
+
+      ctrl = $controller('TasksCtrl', {$scope: scope, User: {user: user}});
+
+    });
+  });
+
+  describe('editTask', function() {
+    it('is Tasks.editTask', function() {
+      inject(function(Tasks) {
+        expect(scope.editTask).to.eql(Tasks.editTask);
+      });
+    });
+  });
+});