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

Merge branch 'master' into production

Browse source
This commit is contained in:
Matt Lott 2015-10-09 15:54:30 -07:00
commit c4763c97b8
1 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
test/server/functional/user.spec.coffee
View file

@ -269,20 +269,10 @@ describe 'GET /db/user', ->
expect(body.type).toBeDefined()
done()
it 'is able to do a sweet query', (done) ->
conditions = [
['limit', 20]
['where', 'email']
['equals', 'admin@afc.com']
['sort', '-dateCreated']
]
it 'is able to do a semi-sweet query', (done) ->
options = {
url: getURL(urlUser)
qs: {
conditions: JSON.stringify(conditions)
url: getURL(urlUser) + "?conditions[limit]=20&conditions[sort]=-dateCreated"
}
}
req = request.get(options, (error, response) ->
expect(response.statusCode).toBe(200)
res = JSON.parse(response.body)
@ -291,14 +281,8 @@ describe 'GET /db/user', ->
)
it 'rejects bad conditions', (done) ->
conditions = [
['lime', 20]
]
options = {
url: getURL(urlUser)
qs: {
conditions: JSON.stringify(conditions)
}
url: getURL(urlUser) + "?conditions[lime]=20&conditions[sort]=-dateCreated"
}
req = request.get(options, (error, response) ->