From 4d890f58d713d43e27f8e875dc54c4df8a003881 Mon Sep 17 00:00:00 2001 From: Radek Stepan Date: Wed, 20 Mar 2013 15:50:20 +0000 Subject: [PATCH] do not reuse class names, make us work on codeship --- package.json | 2 +- test/basic.spec.coffee | 1 - test/cache.spec.coffee | 1 - test/children.spec.coffee | 1 - test/children_nested.spec.coffee | 23 +++++++++++++---------- test/delete.spec.coffee | 1 - test/mapping.spec.coffee | 1 - test/markdown.spec.coffee | 1 - test/menu.spec.coffee | 1 - test/parent.spec.coffee | 1 - test/siblings.spec.coffee | 1 - test/sitemap.spec.coffee | 1 - test/url.spec.coffee | 7 +++---- 13 files changed, 17 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index b0731d5..1bd92fe 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "A forms based node.js CMS ala SilverStripe, but smaller", "keywords": [ "cms" ], "author": "Radek ", - "version": "2.3.2", + "version": "2.3.3", "preferGlobal": false, "engines": { "node": "0.8.x", diff --git a/test/basic.spec.coffee b/test/basic.spec.coffee index bc2cb1d..5ccf02a 100644 --- a/test/basic.spec.coffee +++ b/test/basic.spec.coffee @@ -3,7 +3,6 @@ request = require 'request' querystring = require 'querystring' { start, blad } = require '../index.js' - config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ] # ------------------------------------------------------------------- diff --git a/test/cache.spec.coffee b/test/cache.spec.coffee index aa733cd..c4db897 100644 --- a/test/cache.spec.coffee +++ b/test/cache.spec.coffee @@ -3,7 +3,6 @@ request = require 'request' querystring = require 'querystring' { start, blad } = require '../index.js' - config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ] # ------------------------------------------------------------------- diff --git a/test/children.spec.coffee b/test/children.spec.coffee index 0b473de..359bd73 100644 --- a/test/children.spec.coffee +++ b/test/children.spec.coffee @@ -3,7 +3,6 @@ request = require 'request' querystring = require 'querystring' { start, blad } = require '../index.js' - config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ] # ------------------------------------------------------------------- diff --git a/test/children_nested.spec.coffee b/test/children_nested.spec.coffee index 69987ae..5d41c26 100644 --- a/test/children_nested.spec.coffee +++ b/test/children_nested.spec.coffee @@ -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 @@ -17,7 +16,7 @@ class HasChildrenDocument extends blad.Type 'lvl1': @children 1 , false -blad.types.HasChildrenDocument = HasChildrenDocument +blad.types.HasNestedChildrenDocument = HasNestedChildrenDocument # ------------------------------------------------------------------- @@ -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 @@ -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': @@ -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': @@ -91,6 +90,10 @@ 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 @@ -98,7 +101,7 @@ describe "document that has children actions", -> clean.push doc clean.should.includeEql - "type": "HasChildrenDocument" + "type": "HasNestedChildrenDocument" "name": "child0" "url": "/group1/child0" @@ -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" @@ -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 @@ -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 diff --git a/test/delete.spec.coffee b/test/delete.spec.coffee index 1548472..1634454 100644 --- a/test/delete.spec.coffee +++ b/test/delete.spec.coffee @@ -3,7 +3,6 @@ request = require 'request' querystring = require 'querystring' { start, blad } = require '../index.js' - config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ] # ------------------------------------------------------------------- diff --git a/test/mapping.spec.coffee b/test/mapping.spec.coffee index 7c55ad7..ace2ad2 100644 --- a/test/mapping.spec.coffee +++ b/test/mapping.spec.coffee @@ -3,7 +3,6 @@ request = require 'request' querystring = require 'querystring' { start, blad } = require '../index.js' - config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ] # ------------------------------------------------------------------- diff --git a/test/markdown.spec.coffee b/test/markdown.spec.coffee index 822a4e1..5b01353 100644 --- a/test/markdown.spec.coffee +++ b/test/markdown.spec.coffee @@ -3,7 +3,6 @@ request = require 'request' querystring = require 'querystring' { start, blad } = require '../index.js' - config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ] # ------------------------------------------------------------------- diff --git a/test/menu.spec.coffee b/test/menu.spec.coffee index a6f5c23..1fe2a2b 100644 --- a/test/menu.spec.coffee +++ b/test/menu.spec.coffee @@ -3,7 +3,6 @@ request = require 'request' querystring = require 'querystring' { start, blad } = require '../index.js' - config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ] # ------------------------------------------------------------------- diff --git a/test/parent.spec.coffee b/test/parent.spec.coffee index e89c2aa..0e2701d 100644 --- a/test/parent.spec.coffee +++ b/test/parent.spec.coffee @@ -3,7 +3,6 @@ request = require 'request' querystring = require 'querystring' { start, blad } = require '../index.js' - config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ] # ------------------------------------------------------------------- diff --git a/test/siblings.spec.coffee b/test/siblings.spec.coffee index 8940929..d3b0359 100644 --- a/test/siblings.spec.coffee +++ b/test/siblings.spec.coffee @@ -3,7 +3,6 @@ request = require 'request' querystring = require 'querystring' { start, blad } = require '../index.js' - config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ] # ------------------------------------------------------------------- diff --git a/test/sitemap.spec.coffee b/test/sitemap.spec.coffee index 4976bc8..8835c06 100644 --- a/test/sitemap.spec.coffee +++ b/test/sitemap.spec.coffee @@ -3,7 +3,6 @@ request = require 'request' querystring = require 'querystring' { start, blad } = require '../index.js' - config = 'env': 'test', 'middleware': [], 'browserid': 'hashes': [ '@dummy' ] # ------------------------------------------------------------------- diff --git a/test/url.spec.coffee b/test/url.spec.coffee index 2804313..2fdc670 100644 --- a/test/url.spec.coffee +++ b/test/url.spec.coffee @@ -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) -> @@ -18,7 +17,7 @@ class BasicDocument extends blad.Type 'url': @url , false -blad.types.BasicDocument = BasicDocument +blad.types.URLDocument = URLDocument # ------------------------------------------------------------------- @@ -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