diff --git a/.gitignore b/.gitignore
index 4117a537..35e1ec4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
Thumbs.db
.DS_Store
/node_modules/
+.grunt/
diff --git a/Gruntfile.js b/Gruntfile.js
index 520689a8..1db1750f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -80,18 +80,16 @@ module.exports = function(grunt) {
test: {
options: {
port: 8041,
- open: 'http://localhost:8041/SpecRunner.html',
- base: [
- "scripts",
- "test"
- ]
+ open: 'http://localhost:8041/_SpecRunner.html',
+ base: "."
}
}
},
jasmine: {
- src: 'scripts/**/*.js',
+ scripts: 'scripts/**/*.js',
options: {
+ build: true,
specs: 'test/*Spec.js',
helpers: 'test/*Helper.js',
vendor: [
@@ -153,12 +151,12 @@ module.exports = function(grunt) {
buildType = "scss";
}
- grunt.task.run(["newer:jshint", "test", buildType]);
+ grunt.task.run(["newer:jshint", "jasmine:scripts", buildType]);
});
grunt.registerTask("test", [
- "connect:test",
- "jasmine"
+ "jasmine:scripts:build",
+ "connect:test"
]);
grunt.registerTask("serve", function(target){
diff --git a/_SpecRunner.html b/_SpecRunner.html
new file mode 100644
index 00000000..fd7e0764
--- /dev/null
+++ b/_SpecRunner.html
@@ -0,0 +1,43 @@
+
+
+
+
+ Jasmine Spec Runner
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/SpecRunner.html b/test/SpecRunner.html
deleted file mode 100644
index a5ff35bd..00000000
--- a/test/SpecRunner.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- Unit Tests Bootstrap Material Design
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/materialSpec.js b/test/materialSpec.js
index 79cc45ec..19e026fb 100644
--- a/test/materialSpec.js
+++ b/test/materialSpec.js
@@ -2,6 +2,7 @@
describe('Material', function (){
+ //Dummy test just to ensure tests are accurately configured
it('jquery should be loaded', function () {
expect($).toBeDefined();
});