codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 10:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/codecombat/codecombat

Browse source
This commit is contained in:
Nick Winter 2014-04-15 09:28:23 -07:00
commit fcb1341295
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/users/User.coffee
View file

@ -62,7 +62,7 @@ UserSchema.statics.updateMailChimp = (doc, callback) ->
doc.updatedMailChimp = true doc.updatedMailChimp = true
callback?() callback?()
mc.lists.subscribe params, onSuccess, onFailure mc?.lists.subscribe params, onSuccess, onFailure
UserSchema.pre('save', (next) -> UserSchema.pre('save', (next) ->

9
test/server/functional/file.spec.coffee
View file

@ -27,15 +27,6 @@ describe '/file', ->
dropGridFS -> dropGridFS ->
done() done()
it 'can\'t be created by ordinary users.', (done) ->
func = (err, res, body) ->
expect(res.statusCode).toBe(403)
expect(body.metadata).toBeUndefined()
done()
loginJoe ->
request.post(options, func)
it 'can\'t be created if invalid (property path is required)', (done) -> it 'can\'t be created if invalid (property path is required)', (done) ->
func = (err, res, body) -> func = (err, res, body) ->
expect(res.statusCode).toBe(422) expect(res.statusCode).toBe(422)