Added Grunt support for running Jasmine test cases.

- Added grunt modules to run jasmine test cases via build process - Added test server (run npm run start)
purtuga · Apr 5, 2015 · de8670d · de8670d
1 parent 1ca74b7
commit de8670d
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 37 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -494,7 +494,7 @@ module.exports = function(grunt) {
             },
             test : {
                 files : '<%= jshint.test.src %>',
-                tasks : ['jshint:test']
+                tasks : ['jshint:test', 'test']
             },
         },
 
@@ -578,7 +578,31 @@ module.exports = function(grunt) {
 
             } // end: requirejs:compile
 
-        } //end: requirejs
+        }, //end: requirejs
+
+        connect: {
+            test: {
+                options: {
+                    port: 8182
+                }
+            }
+        },
+        jasmine: {
+            all: {
+                options: {
+                    specs: "test/specs/**/*.js",
+                    host: "http://127.0.0.1:8182/",
+                    template: require('grunt-template-jasmine-requirejs'),
+                    templateOptions: {
+                        requireConfigFile: "test/setup/requirejs.config.js",
+                        requireConfig: {
+                            baseUrl: "./"
+                        }
+                    }
+
+                }
+            }
+        }
 
     }); //end: config()
 
@@ -590,6 +614,8 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-contrib-requirejs');
     grunt.loadNpmTasks('grunt-jsdoc');
+    grunt.loadNpmTasks('grunt-contrib-jasmine');
+    grunt.loadNpmTasks('grunt-contrib-connect');
 
     /**
      * Default TASK
@@ -609,6 +635,7 @@ module.exports = function(grunt) {
 
         grunt.task.run([
             "jshint",
+            "test",
             "clean:build",
             "copy:build"
         ]);
@@ -634,5 +661,6 @@ module.exports = function(grunt) {
      */
     grunt.registerTask('deploy', ["copy:deploy"]);
 
+    grunt.registerTask('test', ["connect:test", "jasmine"]);
 
 }; //end: module.exports
diff --git a/package.json b/package.json
@@ -4,8 +4,8 @@
   "description": "SharePoint widgets and tools for custom client side web solutions",
   "main": "dist/jquery.SPWidgets.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "server": "node tools/server.js"
+    "test": "grunt test",
+    "start": "node tools/server.js"
   },
   "repository": {
     "type": "git",
@@ -18,17 +18,19 @@
   "license": "MIT",
   "devDependencies": {
     "amdclean": "https://github.com/purtuga/amdclean/archive/master.tar.gz",
-    "connect": "^3.3.5",
     "csso": "^1.3.11",
     "grunt": "~0.4.1",
     "grunt-contrib-clean": "~0.4.0",
     "grunt-contrib-concat": "~0.3.0",
+    "grunt-contrib-connect": "^0.10.1",
     "grunt-contrib-copy": "^0.7.0",
+    "grunt-contrib-jasmine": "^0.8.2",
     "grunt-contrib-jshint": "^0.10.0",
     "grunt-contrib-requirejs": "^0.4.4",
     "grunt-contrib-uglify": "^0.7.0",
     "grunt-contrib-watch": "~0.4.0",
     "grunt-jsdoc": "~0.5.4",
+    "grunt-template-jasmine-requirejs": "^0.2.2",
     "html-minifier": "^0.6.9",
     "less": "^1.7.5",
     "open": "0.0.5",

diff --git a/src/dateFieldWidget/dateField.js b/src/dateFieldWidget/dateField.js
@@ -6,7 +6,7 @@ define([
     '../sputils/parseDateString',
     '../uiutils/makeSameHeight',
     //--------------------------------
-    'less!./dateField.less'
+    'less!./dateField'
 ], function(
     $,
     dateFieldTemplate,

diff --git a/test/index.html b/test/index.html
@@ -17,32 +17,10 @@
 </head>
 <body>
     <script type="text/javascript" src="../vendor/requirejs/require.js"></script>
+    <script type="text/javascript" src="setup/requirejs.config.js"></script>
     <script type="text/javascript">
 
     (function(){
-        var require = requirejs.config({
-                baseUrl: "../",
-                urlArgs: '@BUILD',
-                paths: {
-                    jquery      : 'vendor/jquery/dist/jquery',
-                    'jquery-ui' : 'vendor/jquery-ui/jquery-ui',
-                    less        : 'vendor/require-less/less',
-                    lessc       : 'vendor/require-less/lessc',
-                    normalize   : 'vendor/require-less/normalize',
-                    text        : 'vendor/requirejs-text/text'
-                },
-                shim: {
-                    'jquery-ui': {
-                        deps: ['jquery']
-                    },
-                    'SPWidgets': {
-                        deps: ['jquery', 'jquery-ui']
-                    }
-                },
-                less: {
-                    relativeUrls: true
-                }
-            });
 
         require([
             'require',
@@ -51,13 +29,7 @@
             'jquery-ui',
             "src/SPWidgets"
         ], function(require){
-            require([
-                // List all test case files below
-                "./test/test.SPWidgets"
-
-            ], function(){
-                window.runTests();
-            });
+            require(["./test/suite"], function(){ window.runTests(); });
         });
 
     }());

diff --git a/test/setup/requirejs.config.js b/test/setup/requirejs.config.js
@@ -0,0 +1,24 @@
+require.config({
+    baseUrl: "../",
+    urlArgs: '@BUILD',
+    paths: {
+        jquery      : 'vendor/jquery/dist/jquery',
+        'jquery-ui' : 'vendor/jquery-ui/jquery-ui',
+        less        : 'vendor/require-less/less',
+        lessc       : 'vendor/require-less/lessc',
+        normalize   : 'vendor/require-less/normalize',
+        text        : 'vendor/requirejs-text/text'
+    },
+    shim: {
+        'jquery-ui': {
+            deps: ['jquery']
+        },
+        'SPWidgets': {
+            deps: ['jquery', 'jquery-ui']
+        }
+    },
+    less: {
+        relativeUrls: true,
+        logLevel    : 2
+    }
+});
diff --git a/test/test.SPWidgets.js → test/specs/jquery.SPWidgets.js b/test/test.SPWidgets.js → test/specs/jquery.SPWidgets.js
diff --git a/test/suite.js b/test/suite.js
@@ -0,0 +1,6 @@
+define([
+    // All test cases should resize in the test/specs folder and be
+    // referenced below as a dependency.
+    "./specs/jquery.SPWidgets"
+
+], function(){});
diff --git a/tools/server.js b/tools/server.js
@@ -1,4 +1,4 @@
-var connect = require('connect');
+var connect = require('../node_modules/grunt-contrib-connect/node_modules/connect');
 var serveStatic = require('serve-static');
 var path = require("path");
 var open = require("open");