codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-05-02 08:53:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
phoenixeliot 2016-06-06 16:01:00 -07:00
commit 16bfe09d08
2 changed files with 5 additions and 5 deletions

8
spec/server/functional/article.spec.coffee
View file

@ -127,7 +127,7 @@ describe 'POST /db/article', ->
@admin = yield utils.initAdmin({}) @admin = yield utils.initAdmin({})
yield utils.loginUser(@admin) yield utils.loginUser(@admin)
[@res, @body] = yield request.postAsync { [@res, @body] = yield request.postAsync {
uri: getURL('/db/article'), json: articleData uri: getURL('/db/article'), json: articleData
} }
done() done()
@ -163,8 +163,8 @@ describe 'POST /db/article', ->
it 'returns 422 when properties do not pass validation', utils.wrap (done) -> it 'returns 422 when properties do not pass validation', utils.wrap (done) ->
[res, body] = yield request.postAsync { [res, body] = yield request.postAsync {
uri: getURL('/db/article'), json: { i18nCoverage: 9001 } uri: getURL('/db/article'), json: { i18nCoverage: 9001 }
} }
expect(res.statusCode).toBe(422) expect(res.statusCode).toBe(422)
expect(body.validationErrors).toBeDefined() expect(body.validationErrors).toBeDefined()
@ -461,7 +461,7 @@ describe 'POST /db/article/:handle/new-version', ->
it 'notifies watchers of changes', utils.wrap (done) -> it 'notifies watchers of changes', utils.wrap (done) ->
sendwithus = require '../../../server/sendwithus' sendwithus = require '../../../server/sendwithus'
spyOn(sendwithus.api, 'send').and.callFake (context, cb) -> spyOn(sendwithus.api, 'send').and.callFake (context, cb) ->
expect(context.email_id).toBe(sendwithus.templates.change_made_notify_watcher) expect(context.email_id).toBe(sendwithus.templates.change_made_notify_watcher.id)
expect(context.recipient.address).toBe('test@gmail.com') expect(context.recipient.address).toBe('test@gmail.com')
done() done()
user = yield User({email: 'test@gmail.com', name: 'a user'}).save() user = yield User({email: 'test@gmail.com', name: 'a user'}).save()

2
spec/server/functional/classrooms.spec.coffee
View file

@ -375,7 +375,7 @@ describe 'POST /db/classroom/:id/invite-members', ->
data = { emails: ['test@test.com'] } data = { emails: ['test@test.com'] }
sendwithus = require '../../../server/sendwithus' sendwithus = require '../../../server/sendwithus'
spyOn(sendwithus.api, 'send').and.callFake (context, cb) -> spyOn(sendwithus.api, 'send').and.callFake (context, cb) ->
expect(context.email_id).toBe(sendwithus.templates.course_invite_email) expect(context.email_id).toBe(sendwithus.templates.course_invite_email.id)
expect(context.recipient.address).toBe('test@test.com') expect(context.recipient.address).toBe('test@test.com')
expect(context.email_data.teacher_name).toBe('Mr Professerson') expect(context.email_data.teacher_name).toBe('Mr Professerson')
done() done()