diff --git a/package.json b/package.json index 278441c1..e3efdde8 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Spec reporter for jasmine behavior-driven development framework", "main": "src/jasmine-spec-reporter.js", "scripts": { - "test": "node node_modules/jasmine-node/bin/jasmine-node --coffee --noStack spec", + "test": "node node_modules/jasmine/bin/jasmine.js", "example": "node node_modules/jasmine-node/bin/jasmine-node --coffee example" }, "repository": { @@ -28,6 +28,7 @@ "colors": "~0.6.2" }, "devDependencies": { - "jasmine-node": "~1.14.3" + "coffee-script": "1.8.0", + "jasmine": "2.1.1", } } diff --git a/spec/custom-processor.spec.coffee b/spec/custom-processor.spec.coffee index 2d05f77b..3d4a3244 100644 --- a/spec/custom-processor.spec.coffee +++ b/spec/custom-processor.spec.coffee @@ -1,6 +1,6 @@ -require('./lib/test-helper.coffee') +require('./helpers/test-helper.coffee') SpecReporter = require('../src/jasmine-spec-reporter.js') -TestProcessor = require('./lib/test-processor.js') +TestProcessor = require('./helpers/test-processor.js') describe 'spec reporter', -> addMatchers() diff --git a/spec/helpers/coffee-helper.js b/spec/helpers/coffee-helper.js new file mode 100644 index 00000000..753c4a46 --- /dev/null +++ b/spec/helpers/coffee-helper.js @@ -0,0 +1 @@ +require('coffee-script/register'); diff --git a/spec/lib/test-helper.coffee b/spec/helpers/test-helper.coffee similarity index 100% rename from spec/lib/test-helper.coffee rename to spec/helpers/test-helper.coffee diff --git a/spec/lib/test-processor.js b/spec/helpers/test-processor.js similarity index 100% rename from spec/lib/test-processor.js rename to spec/helpers/test-processor.js diff --git a/spec/jasmine-spec-reporter.spec.coffee b/spec/jasmine-spec-reporter.spec.coffee index cc8e9a9f..9922696f 100644 --- a/spec/jasmine-spec-reporter.spec.coffee +++ b/spec/jasmine-spec-reporter.spec.coffee @@ -1,4 +1,4 @@ -require('./lib/test-helper.coffee') +require('./helpers/test-helper.coffee') SpecReporter = require('../src/jasmine-spec-reporter.js') describe 'spec reporter', -> diff --git a/spec/suite-numbering.spec.coffee b/spec/suite-numbering.spec.coffee index 14b64e62..c0f8fbe1 100644 --- a/spec/suite-numbering.spec.coffee +++ b/spec/suite-numbering.spec.coffee @@ -1,4 +1,4 @@ -require('./lib/test-helper.coffee') +require('./helpers/test-helper.coffee') SpecReporter = require('../src/jasmine-spec-reporter.js') describe 'spec reporter', -> diff --git a/spec/support/jasmine.json b/spec/support/jasmine.json new file mode 100644 index 00000000..f90aeda2 --- /dev/null +++ b/spec/support/jasmine.json @@ -0,0 +1,10 @@ +{ + "spec_dir": "spec", + "spec_files": [ + "**/*[sS]pec.coffee" + ], + "helpers": [ + "helpers/**/*.js", + "helpers/**/*.coffee" + ] +}