github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into pr-remove-by-key

Browse source 
# Conflicts:
#	test/unit/coffee/NotificationsTests.coffee
This commit is contained in:
Shane Kilkelly 2016-08-12 09:43:38 +01:00
commit 7bb6e6e18c
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/notifications/Gruntfile.coffee
View file

@ -31,6 +31,8 @@ module.exports = (grunt) ->
unit:
options:
reporter: grunt.option('reporter') or 'spec'
grep: grunt.option("grep")
src: ["test/unit/js/**/*.js"]
grunt.loadNpmTasks 'grunt-contrib-coffee'

11
services/notifications/test/unit/coffee/NotificationsTests.coffee
View file

@ -18,7 +18,6 @@ describe 'Notifications Tests', ->
@insertStub = sinon.stub()
@countStub = sinon.stub()
@updateStub = sinon.stub()
@mongojs = =>
notifications:
update: self.mongojsUpdate
@ -37,11 +36,11 @@ describe 'Notifications Tests', ->
@stubbedNotificationArray = [@stubbedNotification]
describe 'getUserNotifications', ->
it "should find all notifications and return it", (done)->
it "should find all notifications and return i", (done)->
@findStub.callsArgWith(1, null, @stubbedNotificationArray)
@notifications.getUserNotifications user_id, (err, notifications)=>
notifications.should.equal @stubbedNotificationArray
@findStub.calledWith({"user_id" : ObjectId(user_id), "templateKey": {"$exists":true}}).should.equal true
assert.deepEqual(@findStub.args[0][0], {"user_id" :ObjectId(user_id), "templateKey": {"$exists":true}})
done()
describe 'addNotification', ->
@ -114,7 +113,8 @@ describe 'Notifications Tests', ->
_id:ObjectId(notification_id)
updateOperation =
"$unset": {templateKey:true, messageOpts:true}
@updateStub.calledWith(searchOps, updateOperation).should.equal true
assert.deepEqual(@updateStub.args[0][0], searchOps)
assert.deepEqual(@updateStub.args[0][1], updateOperation)
done()
describe 'removeNotificationKey', ->
@ -139,5 +139,6 @@ describe 'Notifications Tests', ->
key: notification_key
updateOperation =
"$unset": {templateKey:true}
@updateStub.calledWith(searchOps, updateOperation).should.equal true
assert.deepEqual(@updateStub.args[0][0], searchOps)
assert.deepEqual(@updateStub.args[0][1], updateOperation)
done()