Skip to content

Commit

Permalink
Runs tests against src rather than built library.
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesplease committed Sep 10, 2014
1 parent 6fb7615 commit 849a091
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 7 deletions.
8 changes: 4 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@ module.exports = function(grunt) {

env: {
coverage: {
APP_DIR_FOR_CODE_COVERAGE: '../../../test/tmp/'
APP_DIR_FOR_CODE_COVERAGE: '../../../test/src/'
}
},

instrument: {
files: 'tmp/backbone.marionette.js',
files: 'src/*.js',
options: {
lazy: true,
basePath: 'test'
Expand Down Expand Up @@ -306,13 +306,13 @@ module.exports = function(grunt) {

grunt.registerTask('lint', 'Lints our sources', ['lintspaces', 'jshint']);

grunt.registerTask('test', 'Run the unit tests.', ['verify-bower', 'lint', 'unwrap', 'preprocess:bundle', 'api', 'template:bundle', 'mochaTest']);
grunt.registerTask('test', 'Run the unit tests.', ['verify-bower', 'lint', 'api', 'mochaTest']);

grunt.registerTask('coverage', ['unwrap', 'preprocess:bundle', 'template:bundle', 'env:coverage', 'instrument', 'mochaTest', 'storeCoverage', 'makeReport', 'coveralls']);

grunt.registerTask('dev', 'Auto-lints while writing code.', ['test', 'watch:marionette']);

grunt.registerTask('api', 'Build jsdoc api files', ['jsDocFiles']);

grunt.registerTask('build', 'Build all three versions of the library.', ['clean:lib', 'bower:install', 'lint', 'unwrap', 'preprocess', 'template', 'mochaTest', 'concat', 'uglify']);
grunt.registerTask('build', 'Build all three versions of the library.', ['clean:lib', 'bower:install', 'lint', 'mochaTest', 'unwrap', 'preprocess', 'template', 'concat', 'uglify']);
};
31 changes: 30 additions & 1 deletion SpecRunner.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,37 @@
<script src="bower_components/jquery/dist/jquery.js"></script>
<script src="bower_components/underscore/underscore.js"></script>
<script src="bower_components/backbone/backbone.js"></script>
<script src="bower_components/backbone.wreqr/lib/backbone.wreqr.js"></script>
<script src="bower_components/backbone.babysitter/lib/backbone.babysitter.js"></script>

<script src="tmp/backbone.marionette.js"></script>

<script>
window.Marionette = Backbone.Marionette = {};
window.slice = Array.prototype.slice;
Marionette.Deferred = Backbone.$.Deferred;
</script>
<script src="src/marionette.callbacks.js"></script>
<script src="src/marionette.triggermethod.js"></script>
<script src="src/marionette.bindEntityEvents.js"></script>
<script src="src/marionette.domRefresh.js"></script>
<script src="src/marionette.helpers.js"></script>
<script src="src/marionette.error.js"></script>
<script src="src/marionette.renderer.js"></script>
<script src="src/marionette.templatecache.js"></script>
<script src="src/marionette.object.js"></script>
<script src="src/marionette.controller.js"></script>
<script src="src/marionette.approuter.js"></script>
<script src="src/marionette.application.js"></script>
<script src="src/marionette.module.js"></script>
<script src="src/marionette.region.js"></script>
<script src="src/marionette.regionManager.js"></script>
<script src="src/marionette.behavior.js"></script>
<script src="src/marionette.behaviors.js"></script>
<script src="src/marionette.view.js"></script>
<script src="src/marionette.itemview.js"></script>
<script src="src/marionette.layoutview.js"></script>
<script src="src/marionette.collectionview.js"></script>
<script src="src/marionette.compositeview.js"></script>

<script src="spec/javascripts/application.appRegions.spec.js"></script>
<script src="spec/javascripts/application.spec.js"></script>
Expand Down
28 changes: 27 additions & 1 deletion spec/javascripts/setup/node.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,30 @@ global.$ = global.jQuery = require('jquery');
global._ = require('underscore');
global.Backbone = require('backbone');
global.Backbone.$ = global.$;
global.Marionette = requireHelper('backbone.marionette');
global.Marionette = Backbone.Marionette = {};
require('backbone.wreqr');
require('backbone.babysitter');
global.slice = Array.prototype.slice;
Marionette.Deferred = global.Backbone.$.Deferred;
requireHelper('marionette.bindEntityEvents');
requireHelper('marionette.callbacks');
requireHelper('marionette.triggermethod');
requireHelper('marionette.helpers');
requireHelper('marionette.domRefresh');
requireHelper('marionette.object');
requireHelper('marionette.controller');
requireHelper('marionette.approuter');
requireHelper('marionette.application');
requireHelper('marionette.module');
requireHelper('marionette.renderer');
requireHelper('marionette.templatecache');
requireHelper('marionette.view');
requireHelper('marionette.itemview');
requireHelper('marionette.layoutview');
requireHelper('marionette.collectionview');
requireHelper('marionette.compositeview');
requireHelper('marionette.behavior');
requireHelper('marionette.behaviors');
requireHelper('marionette.region');
requireHelper('marionette.regionManager');
requireHelper('marionette.error');
2 changes: 1 addition & 1 deletion spec/javascripts/setup/require_helper.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = function (path) {
return require((process.env.APP_DIR_FOR_CODE_COVERAGE || '../../../tmp/') + path);
return require((process.env.APP_DIR_FOR_CODE_COVERAGE || '../../../src/') + path);
};

0 comments on commit 849a091

Please sign in to comment.