diff --git a/app/styles/main.scss b/app/styles/main.scss index dae7e04..32865bd 100644 --- a/app/styles/main.scss +++ b/app/styles/main.scss @@ -1,6 +1,6 @@ @import 'sass-bootstrap/lib/bootstrap'; .hero-unit { - margin: 50px auto 0 auto; - width: 400px; -} \ No newline at end of file + margin: 50px auto 0; + width: 400px; +} diff --git a/package.json b/package.json index c0ef434..cc96fc0 100644 --- a/package.json +++ b/package.json @@ -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, @@ -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", diff --git a/test/SpecRunner.js b/test/SpecRunner.js index 0dcd12e..0e3f47f 100644 --- a/test/SpecRunner.js +++ b/test/SpecRunner.js @@ -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 */ @@ -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', @@ -40,7 +40,7 @@ require.config({ hbs: { disableI18n: true } -}) +}); /* require test suite */ require([ @@ -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(); } - }) - }) -}) + + }); + }); +}); + \ No newline at end of file diff --git a/test/spec/testSuite.js b/test/spec/testSuite.js index f377297..7e673ba 100644 --- a/test/spec/testSuite.js +++ b/test/spec/testSuite.js @@ -3,7 +3,8 @@ define(function() { /* return an array of specs to be run */ return { - specs: ['spec/exampleTest' + specs: [ + 'spec/exampleTest' ] }; });