From 5d7ebd82a4d621aa40f893c176d1e0f09c8458d7 Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@gmail.com>
Date: Wed, 11 May 2016 17:06:16 -0500
Subject: [PATCH] Updated party and group tests

---
 test/spec/controllers/groupCtrlSpec.js | 10 ++--------
 test/spec/controllers/partyCtrlSpec.js | 14 +++++++-------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/test/spec/controllers/groupCtrlSpec.js b/test/spec/controllers/groupCtrlSpec.js
index cade1bb658..6a5819ec67 100644
--- a/test/spec/controllers/groupCtrlSpec.js
+++ b/test/spec/controllers/groupCtrlSpec.js
@@ -93,12 +93,9 @@ describe('Groups Controller', function() {
         members: [user._id]
       });
 
-      var myGuilds = sandbox.stub(groups, "myGuilds", function() {
-        return [guild];
-      });
+      user.guilds = [guild._id];
 
       expect(scope.isMemberOfGroup(user._id, guild)).to.be.ok;
-      expect(myGuilds).to.be.called;
     });
 
     it('does not return true if guild is not included in myGuilds call', function(){
@@ -109,12 +106,9 @@ describe('Groups Controller', function() {
         members: ['not-user-id']
       });
 
-      var myGuilds = sandbox.stub(groups,"myGuilds", function() {
-        return [];
-      });
+      user.guilds = [];
 
       expect(scope.isMemberOfGroup(user._id, guild)).to.not.be.ok;
-      expect(myGuilds).to.be.calledOnce;
     });
   });
 
diff --git a/test/spec/controllers/partyCtrlSpec.js b/test/spec/controllers/partyCtrlSpec.js
index 88a94cfc28..f9571c8ef1 100644
--- a/test/spec/controllers/partyCtrlSpec.js
+++ b/test/spec/controllers/partyCtrlSpec.js
@@ -78,11 +78,11 @@ describe("Party Controller", function() {
           initializeControllerWithStubbedState();
 
           setTimeout(function() {
-            expect(User.set).to.be.calledTwice;
+            expect(User.set).to.be.calledOnce;
             expect(User.set).to.be.calledWith(
               { 'achievements.partyUp': true }
             );
-            expect(rootScope.openModal).to.be.calledTwice;
+            expect(rootScope.openModal).to.be.calledOnce;
             expect(rootScope.openModal).to.be.calledWith('achievements/partyUp');
             done();
           }, 1000);
@@ -103,11 +103,11 @@ describe("Party Controller", function() {
           initializeControllerWithStubbedState();
 
           setTimeout(function(){
-            expect(User.set).to.be.calledTwice;
+            expect(User.set).to.be.calledOnce;
             expect(User.set).to.be.calledWith(
               { 'achievements.partyOn': true }
             );
-            expect(rootScope.openModal).to.be.calledTwice;
+            expect(rootScope.openModal).to.be.calledOnce;
             expect(rootScope.openModal).to.be.calledWith('achievements/partyOn');
             done();
           }, 1000);
@@ -152,9 +152,9 @@ describe("Party Controller", function() {
     var partyStub;
 
     beforeEach(function () {
-      partyStub = sandbox.stub(groups.Group, "create", function() {
-        return party;
-      });
+      partyStub = sinon.stub(groups.Group, "create");
+      partyStub.returns(Promise.resolve(party));
+      sinon.stub(rootScope, 'hardRedirect');
     });
 
     it("creates a new party", function() {