Merge branch 'develop' into sabrecat/more-modals

2015-10-30 16:33:17 -04:00
parent c28afc9abc ad6fbef85c
commit 5d3f41637f
233 changed files with 2017 additions and 2111 deletions
@@ -11,21 +11,6 @@ describe "Push-Notifications", ->
  before (done) ->
    registerNewUser(done, true)

-  describe "POST /user/pushDevice", ->
-    it "Registers a DeviceID", (done) ->
-      request.post(baseURL + "/user/pushDevice").send(
-        { regId: "123123", type: "android"}
-      ).end (err, res) ->
-        expectCode res, 200
-
-        User.findOne
-          _id: global.user._id
-        , (err, _user) ->
-          expect(_user.pushDevices.length).to.equal 1
-          expect(_user.pushDevices[0].regId).to.equal "123123"
-
-          done()
-
  describe "Events that send push notifications", ->
    pushSpy = { sendNotify: sinon.spy() }