Skip to content

Commit

Permalink
all the changes
Browse files Browse the repository at this point in the history
  • Loading branch information
jackfranklin committed Oct 24, 2013
1 parent 917d0c7 commit ee3db2b
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 9 deletions.
17 changes: 15 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,27 @@ module.exports = function(grunt) {
jshint: {
all: ['Gruntfile.js', 'src/*.js']
},
jasmine: {
test: {
src: 'src/*.js',
options: {
specs: 'spec/*.js'
}
}
},
watch: {
files: ['src/*.js', 'Gruntfile.js'],
tasks: ['jshint']
tasks: ['default']
},
concurrent: {
target1: ['jasmine', 'jshint'],
}
});
grunt.loadNpmTasks("grunt-contrib-uglify");
grunt.loadNpmTasks("grunt-contrib-jshint");
grunt.loadNpmTasks("grunt-contrib-watch");
grunt.loadNpmTasks("grunt-contrib-jasmine");
grunt.loadNpmTasks("grunt-notify");
grunt.registerTask("default", ["jshint", "uglify:withBanner"]);
grunt.loadNpmTasks('grunt-concurrent');
grunt.registerTask("default", ["concurrent:target1", "uglify:withBanner"]);
};
2 changes: 1 addition & 1 deletion dist/out.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/*Hello World*/console.log("file 1"),console.log("file 3"),console.log("file 2");
/*Hello World*/!function(){return"file one"}();var three=3;window.two=function(){return 2};
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
"grunt-contrib-uglify": "~0.2.4",
"grunt-contrib-jshint": "~0.6.4",
"grunt-contrib-watch": "~0.5.3",
"grunt-notify": "~0.2.13"
"grunt-notify": "~0.2.13",
"grunt-concurrent": "~0.4.1",
"grunt-contrib-jasmine": "~0.5.2"
}
}
5 changes: 5 additions & 0 deletions spec/test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
describe("my app", function() {
it("passes", function() {
expect(two()).toEqual(2);
});
});
4 changes: 3 additions & 1 deletion src/one.js
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
console.log("file 1");
(function() {
return "file one";
})();
2 changes: 1 addition & 1 deletion src/three.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
console.log("file 3");
var three = 3;
6 changes: 3 additions & 3 deletions src/two.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// JSHint won't like the missing semi colon
console.log("file 2")

window.two = function() {
return 2;
};

0 comments on commit ee3db2b

Please sign in to comment.