Skip to content

Commit 1fd51c6

Browse files
committed
Applied corrections of code review
1 parent a49103b commit 1fd51c6

5 files changed

Lines changed: 16 additions & 12 deletions

File tree

.jshintrc

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,16 @@
44
"undef": true,
55

66
"predef": [
7-
"Handlebars", "Ember",
7+
"Handlebars",
8+
"Ember",
89
"EmberCPM",
9-
"describe", "it", "expect", "beforeEach", "afterEach"
10+
"describe",
11+
"it",
12+
"expect",
13+
"beforeEach",
14+
"afterEach",
15+
"require",
16+
"module",
17+
"process"
1018
]
1119
}

Brocfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var minifiedFile = concat(emberCPMmin, {
2323

2424
var outTrees = [emberCPM, minifiedFile];
2525

26-
if (process.argv[2] != 'build') {
26+
if (process.argv[2] !== 'build') {
2727
var testDeps = pickFiles('node_modules/testem/public/testem/', {
2828
srcDir: '/',
2929
files: ['mocha.css', 'mocha.js', 'chai.js'],

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,7 @@ ensure_phantomjs:
1919
@which phantomjs > /dev/null || (echo "Couldn't find phantomjs" && false)
2020

2121
jshint: $(jshint_bin)
22-
@jshint src/*.js spec/*Spec.js
22+
@jshint Brocfile.js src/*.js spec/*Spec.js
2323
@echo "JSHint OK"
24+
25+
.PHONY: ensure_phantomjs install_dependencies test test-ci jshint

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ To run the rest suite in interactive mode execute `make test` and enter `http://
2727

2828
To run the test suite just once and exit run `make test-ci`.
2929

30-
You can also run the test suitein watch mode with `broccoli serve`.
30+
You can also run the test suite in watch mode with `broccoli serve`.
3131

3232
### Run tests
3333

spec/index.html

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@
77
<script src="ember-cpm.js"></script>
88
<script src="chai.js"></script>
99
<script src="mocha.js"></script>
10-
<script>
11-
Ember.testing = true;
12-
expect = chai.expect;
13-
mocha.ui('bdd');
14-
mocha.reporter('html');
15-
mocha.globals([ 'jQuery*' ]);
16-
</script>
10+
<script>mocha.setup('bdd');</script>
1711
<script src="ember-cpm-specs.js"></script>
1812
<link rel="stylesheet" href="mocha.css" />
1913
</head>

0 commit comments

Comments
 (0)