Skip to content

Commit 4d1e731

Browse files
committed
should pass travis
1 parent 9263f75 commit 4d1e731

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

app/styles/main.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@import 'sass-bootstrap/lib/bootstrap';
22

33
.hero-unit {
4-
margin: 50px auto 0 auto;
5-
width: 400px;
6-
}
4+
margin: 50px auto 0;
5+
width: 400px;
6+
}

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"lint:changed": "git diff --name-only --diff-filter=ACMRTUB `git merge-base HEAD master` | grep '\\.js$' | xargs eslint --",
1111
"start": "gulp build:watch",
1212
"watch": "gulp build:watch",
13-
"test": "mocha-phantomjs -R dot /test/SpecRunner.js"
13+
"test": "mocha-phantomjs -R spec test/index.html"
1414
},
1515
"private": true,
1616
"preferGlobal": true,
@@ -59,6 +59,7 @@
5959
"del": "^2.2.0",
6060
"eslint": "^2.10.2",
6161
"eslint-plugin-extra-rules": "^0.6.1",
62+
"sass-lint": "~1.10.2",
6263
"matchdep": "~0.1.2",
6364
"mocha-phantomjs": "~3.1.0",
6465
"chai": "~3.5.0",

test/SpecRunner.js

+11-9
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require.config({
1717

1818
/* alias all marionette libs */
1919
'backbone.marionette': '../bower_components/backbone.marionette/lib/core/amd/backbone.marionette',
20-
'backbone.wreqr': '../bower_components/backbone.wreqr/lib/amd/backbone.wreqr',
20+
'backbone.wreqr': '../bower_components/backbone.wreqr/lib/amd/backbone.wreqr',
2121
'backbone.babysitter': '../bower_components/backbone.babysitter/lib/amd/backbone.babysitter',
2222

2323
/* alias the bootstrap js lib */
@@ -26,7 +26,7 @@ require.config({
2626

2727
/* Alias text.js for template loading and shortcut the templates dir to tmpl */
2828
text: '../bower_components/requirejs-text/text',
29-
tmpl: '../templates',
29+
tmpl: "../templates",
3030

3131
/* handlebars from the require handlerbars plugin below */
3232
handlebars: '../bower_components/require-handlebars-plugin/Handlebars',
@@ -40,7 +40,7 @@ require.config({
4040
hbs: {
4141
disableI18n: true
4242
}
43-
})
43+
});
4444

4545
/* require test suite */
4646
require([
@@ -49,18 +49,20 @@ require([
4949
],
5050
function( $, testSuite ) {
5151

52-
'use strict'
52+
'use strict';
5353

5454
/* on dom ready require all specs and run */
5555
$( function() {
5656
require(testSuite.specs, function() {
5757

5858
if (window.mochaPhantomJS) {
59-
mochaPhantomJS.run()
59+
mochaPhantomJS.run();
6060
}
6161
else {
62-
mocha.run()
62+
mocha.run();
6363
}
64-
})
65-
})
66-
})
64+
65+
});
66+
});
67+
});
68+

test/spec/testSuite.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ define(function() {
33

44
/* return an array of specs to be run */
55
return {
6-
specs: ['spec/exampleTest'
6+
specs: [
7+
'spec/exampleTest'
78
]
89
};
910
});

0 commit comments

Comments
 (0)