Skip to content

Commit

Permalink
should pass travis
Browse files Browse the repository at this point in the history
  • Loading branch information
mtaylor769 committed Feb 27, 2017
1 parent 9263f75 commit 4d1e731
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 14 deletions.
6 changes: 3 additions & 3 deletions app/styles/main.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import 'sass-bootstrap/lib/bootstrap';

.hero-unit {
margin: 50px auto 0 auto;
width: 400px;
}
margin: 50px auto 0;
width: 400px;
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"lint:changed": "git diff --name-only --diff-filter=ACMRTUB `git merge-base HEAD master` | grep '\\.js$' | xargs eslint --",
"start": "gulp build:watch",
"watch": "gulp build:watch",
"test": "mocha-phantomjs -R dot /test/SpecRunner.js"
"test": "mocha-phantomjs -R spec test/index.html"
},
"private": true,
"preferGlobal": true,
Expand Down Expand Up @@ -59,6 +59,7 @@
"del": "^2.2.0",
"eslint": "^2.10.2",
"eslint-plugin-extra-rules": "^0.6.1",
"sass-lint": "~1.10.2",
"matchdep": "~0.1.2",
"mocha-phantomjs": "~3.1.0",
"chai": "~3.5.0",
Expand Down
20 changes: 11 additions & 9 deletions test/SpecRunner.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require.config({

/* alias all marionette libs */
'backbone.marionette': '../bower_components/backbone.marionette/lib/core/amd/backbone.marionette',
'backbone.wreqr': '../bower_components/backbone.wreqr/lib/amd/backbone.wreqr',
'backbone.wreqr': '../bower_components/backbone.wreqr/lib/amd/backbone.wreqr',
'backbone.babysitter': '../bower_components/backbone.babysitter/lib/amd/backbone.babysitter',

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

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

/* handlebars from the require handlerbars plugin below */
handlebars: '../bower_components/require-handlebars-plugin/Handlebars',
Expand All @@ -40,7 +40,7 @@ require.config({
hbs: {
disableI18n: true
}
})
});

/* require test suite */
require([
Expand All @@ -49,18 +49,20 @@ require([
],
function( $, testSuite ) {

'use strict'
'use strict';

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

if (window.mochaPhantomJS) {
mochaPhantomJS.run()
mochaPhantomJS.run();
}
else {
mocha.run()
mocha.run();
}
})
})
})

});
});
});

3 changes: 2 additions & 1 deletion test/spec/testSuite.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ define(function() {

/* return an array of specs to be run */
return {
specs: ['spec/exampleTest'
specs: [
'spec/exampleTest'
]
};
});

0 comments on commit 4d1e731

Please sign in to comment.