Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: CoffeeScript version bumped and wording fixes. #426

Closed
wants to merge 1 commit into from
Closed

fix: CoffeeScript version bumped and wording fixes. #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ BETA `2.0.0` Support is available in the `Jasmine2.0` branch.
what's new
----------
* Growl notifications with the `--growl` flag (requires Growl to be installed)
* Ability to test specs written in Literate Coffee-Script
* Ability to test specs written in Literate CoffeeScript
* Teamcity Reporter reinstated.
* Ability to specify multiple files to test via list in command line
* Ability to suppress stack trace with `--noStack`
Expand Down Expand Up @@ -244,7 +244,7 @@ changelog
* _1.14.2_ Uhhh...not sure what happened here.
* _1.14.1_ Default to noColors if not in a TTY
* _1.14.0_ Add support for `iit`, `ddescribe` (thanks to [mgcrea](https://github.com/mgcrea))
* _1.13.1_ Add coffee-script support for 1.7.x (thanks to [nathancarter](https://github.com/nathancarter))
* _1.13.1_ Add CoffeeScript support for 1.7.x (thanks to [nathancarter](https://github.com/nathancarter))
* _1.13.0_ Added timing to the verbose reporter (thanks to [rick-kilgore](https://github.com/rick-kilgore))
* _1.12.1_ Fixed an issue where an undefined variable caused an unhelpful
exception in --watch Resolves #278
Expand All @@ -271,7 +271,7 @@ changelog
* _1.7.1 - Removed unneeded fs dependency (thanks to
[kevinsawicki](https://github.com/kevinsawicki)) Fixed broken fs call in
node `0.6` (thanks to [abe33](https://github.com/abe33))_
* _1.7.0 - Literate Coffee-Script now testable (thanks to [magicmoose](https://github.com/magicmoose))_
* _1.7.0 - Literate CoffeeScript now testable (thanks to [magicmoose](https://github.com/magicmoose))_
* _1.6.0 - Teamcity Reporter Reinstated (thanks to [bhcleek](https://github.com/bhcleek))_
* _1.5.1 - Missing files and require exceptions will now report instead of failing silently_
* _1.5.0 - Now takes multiple files for execution. (thanks to [abe33](https://github.com/abe33))_
Expand Down
10 changes: 5 additions & 5 deletions lib/jasmine-node/cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ while(args.length) {
break;
case '--coffee':
try {
require('coffee-script/register'); // support CoffeeScript >=1.7.0
require('coffeescript/register'); // support CoffeeScript >=1.7.0
} catch ( e ) {
require('coffee-script'); // support CoffeeScript <=1.6.3
require('coffeescript'); // support CoffeeScript <=1.6.3
}
extensions = "js|coffee|litcoffee";
break;
Expand Down Expand Up @@ -175,9 +175,9 @@ if (specFolders.length === 0) {
}

if (autotest) {

var patterns = ['**/*.js'];

if (extensions.indexOf("coffee") !== -1) {
patterns.push('**/*.coffee');
}
Expand Down Expand Up @@ -260,7 +260,7 @@ function help(){
, ' -m, --match REGEXP - load only specs containing "REGEXPspec"'
, ' --matchall - relax requirement of "spec" in spec file names'
, ' --verbose - print extra information per each test run'
, ' --coffee - load coffee-script which allows execution .coffee files'
, ' --coffee - load CoffeeScript which allows execution of .coffee files'
, ' --junitreport - export tests results as junitreport xml format'
, ' --output - defines the output folder for junitreport files'
, ' --teamcity - converts all console output to teamcity custom test runner commands. (Normally auto detected.)'
Expand Down
2 changes: 1 addition & 1 deletion lib/jasmine-node/cs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/*global define, window, XMLHttpRequest, importScripts, Packages, java,
ActiveXObject, process, require */

define(['coffee-script'], function (CoffeeScript) {
define(['coffeescript'], function (CoffeeScript) {
'use strict';
var fs, getXhr,
progIds = ['Msxml2.XMLHTTP', 'Microsoft.XMLHTTP', 'Msxml2.XMLHTTP.4.0'],
Expand Down
2 changes: 1 addition & 1 deletion lib/jasmine-node/requirejs-runner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports.executeJsRunner = function(specCollection, done, jasmineEnv, setupFile)
requirejs = require('requirejs'),
vm = require('vm'),
fs = require('fs'),
coffeescript = require('coffee-script'),
coffeescript = require('coffeescript'),
template = fs.readFileSync(
setupFile || (__dirname + '/requirejs-wrapper-template.js'),
'utf8'
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"MIT"
],
"dependencies": {
"coffee-script": ">=1.0.1",
"coffeescript": "^2.2.3",
"jasmine-reporters": "~1.0.0",
"jasmine-growl-reporter": "~0.0.2",
"requirejs": ">=0.27.1",
Expand Down