Skip to content

Commit

Permalink
do not reuse class names, make us work on codeship
Browse files Browse the repository at this point in the history
  • Loading branch information
Radek Stepan committed Mar 20, 2013
1 parent 82c16fe commit 4d890f5
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 25 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Expand Up @@ -3,7 +3,7 @@
"description": "A forms based node.js CMS ala SilverStripe, but smaller",
"keywords": [ "cms" ],
"author": "Radek <rs676@cam.ac.uk>",
"version": "2.3.2",
"version": "2.3.3",
"preferGlobal": false,
"engines": {
"node": "0.8.x",
Expand Down
1 change: 0 additions & 1 deletion test/basic.spec.coffee
View file
Expand Up @@ -3,7 +3,6 @@ request = require 'request'
querystring = require 'querystring'

{ start, blad } = require '../index.js'

config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ]

# -------------------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion test/cache.spec.coffee
View file
Expand Up @@ -3,7 +3,6 @@ request = require 'request'
querystring = require 'querystring'

{ start, blad } = require '../index.js'

config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ]

# -------------------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion test/children.spec.coffee
View file
Expand Up @@ -3,7 +3,6 @@ request = require 'request'
querystring = require 'querystring'

{ start, blad } = require '../index.js'

config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ]

# -------------------------------------------------------------------
Expand Down
23 changes: 13 additions & 10 deletions test/children_nested.spec.coffee
View file
Expand Up @@ -3,12 +3,11 @@ request = require 'request'
querystring = require 'querystring'

{ start, blad } = require '../index.js'

config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ]

# -------------------------------------------------------------------

class HasChildrenDocument extends blad.Type
class HasNestedChildrenDocument extends blad.Type

render: (done) ->
done
Expand All @@ -17,7 +16,7 @@ class HasChildrenDocument extends blad.Type
'lvl1': @children 1
, false

blad.types.HasChildrenDocument = HasChildrenDocument
blad.types.HasNestedChildrenDocument = HasNestedChildrenDocument

# -------------------------------------------------------------------

Expand All @@ -44,7 +43,7 @@ describe "document that has children actions", ->
request.post
'url': "#{url}/api/document"
'form':
'type': 'HasChildrenDocument'
'type': 'HasNestedChildrenDocument'
'name': "parent"
'url': "/group1"
'public': true
Expand All @@ -59,7 +58,7 @@ describe "document that has children actions", ->
request.post
'url': "#{url}/api/document"
'form':
'type': 'HasChildrenDocument'
'type': 'HasNestedChildrenDocument'
'name': "child0"
'url': "/group1/child0"
'headers':
Expand All @@ -73,7 +72,7 @@ describe "document that has children actions", ->
request.post
'url': "#{url}/api/document"
'form':
'type': 'HasChildrenDocument'
'type': 'HasNestedChildrenDocument'
'name': "child1"
'url': "/group1/rubbish/child1"
'headers':
Expand All @@ -91,14 +90,18 @@ describe "document that has children actions", ->
# Parse response.
children = JSON.parse(body)

children.should.have.property 'all'
children.should.have.property 'lvl0'
children.should.have.property 'lvl1'

clean = []
for doc in children.lvl0
delete doc._id
delete doc.modified
clean.push doc

clean.should.includeEql
"type": "HasChildrenDocument"
"type": "HasNestedChildrenDocument"
"name": "child0"
"url": "/group1/child0"

Expand All @@ -109,7 +112,7 @@ describe "document that has children actions", ->
clean.push doc

clean.should.includeEql
"type": "HasChildrenDocument"
"type": "HasNestedChildrenDocument"
"name": "child1"
"url": "/group1/rubbish/child1"

Expand All @@ -120,7 +123,7 @@ describe "document that has children actions", ->
request.post
'url': "#{url}/api/document"
'form':
'type': 'HasChildrenDocument'
'type': 'HasNestedChildrenDocument'
'name': "parent"
'url': "/"
'public': true
Expand All @@ -146,7 +149,7 @@ describe "document that has children actions", ->
delete clean.modified

clean.should.eql
"type": "HasChildrenDocument"
"type": "HasNestedChildrenDocument"
"name": "parent"
"url": "/group1"
"public": true
Expand Down
1 change: 0 additions & 1 deletion test/delete.spec.coffee
View file
Expand Up @@ -3,7 +3,6 @@ request = require 'request'
querystring = require 'querystring'

{ start, blad } = require '../index.js'

config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ]

# -------------------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion test/mapping.spec.coffee
View file
Expand Up @@ -3,7 +3,6 @@ request = require 'request'
querystring = require 'querystring'

{ start, blad } = require '../index.js'

config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ]

# -------------------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion test/markdown.spec.coffee
View file
Expand Up @@ -3,7 +3,6 @@ request = require 'request'
querystring = require 'querystring'

{ start, blad } = require '../index.js'

config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ]

# -------------------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion test/menu.spec.coffee
View file
Expand Up @@ -3,7 +3,6 @@ request = require 'request'
querystring = require 'querystring'

{ start, blad } = require '../index.js'

config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ]

# -------------------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion test/parent.spec.coffee
View file
Expand Up @@ -3,7 +3,6 @@ request = require 'request'
querystring = require 'querystring'

{ start, blad } = require '../index.js'

config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ]

# -------------------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion test/siblings.spec.coffee
View file
Expand Up @@ -3,7 +3,6 @@ request = require 'request'
querystring = require 'querystring'

{ start, blad } = require '../index.js'

config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ]

# -------------------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion test/sitemap.spec.coffee
View file
Expand Up @@ -3,7 +3,6 @@ request = require 'request'
querystring = require 'querystring'

{ start, blad } = require '../index.js'

config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ]

# -------------------------------------------------------------------
Expand Down
7 changes: 3 additions & 4 deletions test/url.spec.coffee
View file
Expand Up @@ -3,12 +3,11 @@ request = require 'request'
querystring = require 'querystring'

{ start, blad } = require '../index.js'

config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ]

# -------------------------------------------------------------------

class BasicDocument extends blad.Type
class URLDocument extends blad.Type

# Render as JSON as is.
render: (done) ->
Expand All @@ -18,7 +17,7 @@ class BasicDocument extends blad.Type
'url': @url
, false

blad.types.BasicDocument = BasicDocument
blad.types.URLDocument = URLDocument

# -------------------------------------------------------------------

Expand Down Expand Up @@ -46,7 +45,7 @@ describe "URL parsing vulnerabilities", ->
request.post
'url': "#{url}/api/document"
'form':
'type': 'BasicDocument'
'type': 'URLDocument'
'name': 'nessus'
'url': '/%NETHOOD%/'
'public': true
Expand Down

0 comments on commit 4d890f5

Please sign in to comment.