Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into sabrecat/more-modals

Browse Source
This commit is contained in:
Sabe Jones
2015-11-03 14:29:23 -05:00
parent eaad27dfee 1fa15ba24a
commit 502e7f0af2
285 changed files with 9747 additions and 9362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/api-legacy/pushNotifications.coffee
+3 -3
View File
@@ -19,7 +19,7 @@ describe "Push-Notifications", ->
done()
context "Challenges", ->
challenges = rewire("../../website/src/controllers/challenges")
challenges = rewire("../../website/src/controllers/api-v2/challenges")
challenges.__set__('pushNotify', pushSpy)
challengeMock = {
findById: (arg, cb) ->
@@ -65,7 +65,7 @@ describe "Push-Notifications", ->
recipient = null
groups = rewire("../../website/src/controllers/groups")
groups = rewire("../../website/src/controllers/api-v2/groups")
groups.__set__('pushNotify', pushSpy)
before (done) ->
@@ -226,7 +226,7 @@ describe "Push-Notifications", ->
, false
context "sending gems from balance", ->
members = rewire("../../website/src/controllers/members")
members = rewire("../../website/src/controllers/api-v2/members")
members.sendMessage = -> true
members.__set__('pushNotify', pushSpy)