Merge pull request #109 from lukasoppermann/mocha

Lukas Oppermann · Lukas Oppermann · commit 1456fc87fc30 · 2015-04-30T14:45:25.000+02:00
adding more tests
diff --git a/gulpfile.js b/gulpfile.js
@@ -48,7 +48,7 @@ gulp.task('umd', function() {
           name: '$',
           amd: 'jquery',
           cjs: 'jquery',
-          global: 'jquery'
+          global: 'jQuery'
         }];
       },
       exports: function() {
diff --git a/package.json b/package.json
@@ -31,6 +31,7 @@
     "email": "andu@ctrlz.ro"
   },
   "devDependencies": {
+    "chai": "^2.3.0",
     "del": "^1.1.1",
     "gulp": "^3.8.11",
     "gulp-bump": "^0.3.0",
@@ -41,12 +42,19 @@
     "gulp-uglify": "^1.2.0",
     "gulp-umd": "^0.1.3",
     "gulp-util": "^3.0.4",
+    "jsdom": "^3.x",
     "jshint-stylish": "^1.0.1",
+    "mocha": "^2.2.4",
+    "mocha-phantomjs": "^3.5.3",
     "mochify": "^2.8.1",
-    "phantomjs": "^1.9.16"
+    "phantomjs": "^1.9.16",
+    "requirejs": "^2.1.17"
   },
   "scripts": {
-    "test": "node_modules/.bin/mochify --phantomjs node_modules/.bin/phantomjs && gulp test",
+    "test": "npm run test-mocha && npm run test-phantom && npm run test-require && gulp test",
+    "test-mocha": "./node_modules/.bin/mocha test/api.js test/angular.js",
+    "test-require": "./node_modules/.bin/mochify --phantomjs ./node_modules/.bin/phantomjs ./test/test_browserify.js -R spec",
+    "test-phantom": "./node_modules/.bin/mocha-phantomjs -p ./node_modules/.bin/phantomjs ./test/html/*.html",
     "build": "gulp build"
   },
   "dependencies": {
diff --git a/test/amd.js b/test/amd.js
@@ -0,0 +1,26 @@
+require.config({
+	baseUrl: "./",
+	paths: {
+    "jquery": "../../node_modules/jquery/dist/jquery"
+  }
+});
+require(["../../dist/html.sortable.js"], function(sortable) {
+  // test specific use cases
+  describe("AMD", function () {
+    it("should require jQuery", function () {
+      assert.typeOf($,"function");
+    });
+
+    it("should define sortable", function () {
+      assert.typeOf(sortable,"function");
+    });
+
+    it("should define $().sortable", function () {
+      assert.typeOf($().sortable,"function");
+    });
+
+  });
+
+  if (window.mochaPhantomJS) { mochaPhantomJS.run(); }
+  else { mocha.run(); }
+});
diff --git a/test/api.js b/test/api.js
@@ -1 +1,16 @@
 // testing basic api
+var assert = require("chai").assert;
+var sortable;
+
+describe('Basics', function(){
+  before(function(){
+    GLOBAL.document = require("jsdom").jsdom('<html lang="en-US"></html>');
+    GLOBAL.window = document.defaultView;
+    sortable = require("../dist/html.sortable.js");
+  });
+
+  it('sortable should be a function', function(){
+    assert.typeOf(sortable,"function");
+  });
+  
+})
diff --git a/test/html/amd.html b/test/html/amd.html
@@ -0,0 +1,15 @@
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<html>
+    <body>
+        <div id="mocha"></div>
+        <link rel="stylesheet" href="../../node_modules/mocha/mocha.css" />
+        <script src="../../node_modules/mocha/mocha.js"></script>
+        <script src="../../node_modules/chai/chai.js"></script>
+        <script>
+            mocha.ui('bdd');
+            mocha.reporter('html');
+            var assert = chai.assert;
+        </script>
+      	<script data-main="../amd.js" src="../../node_modules/requirejs/require.js"></script>
+    </body>
+</html>
diff --git a/test/integration.js b/test/integration.js
diff --git a/test/test_browserify.js b/test/test_browserify.js
@@ -1,14 +1,14 @@
 assert = require('assert');
 
 describe('Browserify', function(){
-    it('should be able to require jquery', function() {
-      require('jquery');
-    });
-    it('should be able to require html.sortable', function() {
-      require('../dist/html.sortable.js');
-    });
-    it('should find the exported function on a jQuery object', function() {
-      var $ = require('jquery');
-      assert.equal((typeof $().sortable), 'function');
-    });
+  it('should be able to require jquery', function() {
+    require('jquery');
+  });
+  it('should be able to require html.sortable', function() {
+    require('../dist/html.sortable.js');
+  });
+  it('should find the exported function on a jQuery object', function() {
+    var $ = require('jquery');
+    assert.equal((typeof $().sortable), 'function');
+  });
 });
