Refactor tests (#52)

* test(power-assert): refactor tests

Author: falsandtru

.gitignore

@@ -1,5 +1,4 @@
 /node_modules
-/bower_components
 /.idea
 /TODO.txt
 /espowered_tests

.travis.yml

@@ -16,13 +16,9 @@ addons:
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
-  - "npm install -g bower"
   - "npm install -g browserify"
   - "npm install -g dereserve"
   - "npm install -g derequire"
   - "npm install -g mocha"
-  - "npm install -g mocha-phantomjs"
-before_script:
-  - "npm run bower"
 script:
   - "npm test"

bower.json

@@ -61,10 +61,5 @@
   "repository": {
     "type": "git",
     "url": "git://github.com/power-assert-js/power-assert.git"
-  },
-  "devDependencies": {
-    "expect": "~0.3.1",
-    "mocha": "~2.4.5",
-    "requirejs": "~2.1.22"
   }
 }

karma.conf.js

@@ -3,10 +3,14 @@ module.exports = function (config) {
         basePath: '',
         frameworks: ['mocha', 'expect'],
         files: [
+            { pattern: 'node_modules/requirejs/require.js', included: false },
+            { pattern: 'test/fixture/amd.html', watched: true, served: true, included: false },
             { pattern: 'build/power-assert.js', watched: true, served: true, included: true },
-            { pattern: 'espowered_tests/tobe_instrumented/power_assert_test.js', watched: true, served: true, included: true },
-            { pattern: 'espowered_tests/tobe_instrumented/es6_test.js', watched: true, served: true, included: true },
-            { pattern: 'espowered_tests/not_tobe_instrumented/not_instrumented_test.js', watched: true, served: true, included: true }
+            { pattern: 'espowered_tests/tobe_instrumented/assertion.js', watched: true, served: true, included: true },
+            { pattern: 'espowered_tests/tobe_instrumented/assertion.es6.js', watched: true, served: true, included: true },
+            { pattern: 'espowered_tests/tobe_instrumented/customization.js', watched: true, served: true, included: true },
+            { pattern: 'espowered_tests/not_tobe_instrumented/not_instrumented.js', watched: true, served: true, included: true },
+            { pattern: 'espowered_tests/tobe_instrumented/modules.js', watched: true, served: true, included: true }
         ],
         reporters: ['dots'],
         port: 9876,

package.json

@@ -64,7 +64,8 @@
     "mocha": "^2.4.5",
     "phantomjs-prebuilt": "^2.1.7",
     "qunit-tap": "^1.5.0",
-    "qunitjs": "1.14.0"
+    "qunitjs": "1.14.0",
+    "requirejs": "^2.2.0"
   },
   "files": [
     "CHANGELOG.md",
@@ -91,17 +92,15 @@
     "url": "https://github.com/power-assert-js/power-assert.git"
   },
   "scripts": {
-    "bower": "bower install --config.interactive=false",
     "build": "mkdir -p ./build && npm prune && npm dedupe && browserify -p licensify --standalone assert ./index.js | dereserve | derequire > build/power-assert.js",
     "clean": "rm -rf ./espowered_tests && rm -rf ./build",
     "setup-dir": "mkdir -p ./build && mkdir -p ./espowered_tests/tobe_instrumented && cp -r test/not_tobe_instrumented/ ./espowered_tests/not_tobe_instrumented/",
-    "setup-espower": "for i in $(find ./test/tobe_instrumented -name '*_test.js'); do babel --plugins babel-plugin-espower --blacklist strict $i > ./espowered_tests/tobe_instrumented/$(basename $i); done",
+    "setup-espower": "for i in $(find ./test/tobe_instrumented -name '*.js'); do babel --plugins babel-plugin-espower --blacklist strict $i > ./espowered_tests/tobe_instrumented/$(basename $i); done",
     "setup": "npm run clean && npm run setup-dir && npm run setup-espower && npm run build",
-    "test-unit": "mocha --reporter dot --require ./enable_power_assert.js ./test/**/*_test.js",
-    "test-generated": "mocha --reporter dot ./espowered_tests/**/*_test.js",
+    "test-unit": "mocha --reporter dot --require ./enable_power_assert.js ./test/**/*.js",
+    "test-generated": "mocha --reporter dot ./espowered_tests/**/*.js",
     "test-browser": "karma start",
-    "test-amd": "mocha-phantomjs --reporter dot test/test-amd.html",
-    "test-all": "npm run test-unit && npm run test-generated && npm run test-browser && npm run test-amd",
+    "test-all": "npm run test-unit && npm run test-generated && npm run test-browser",
     "test": "npm run setup && npm run test-all"
   }
 }

test/fixture/amd.html

@@ -0,0 +1,13 @@
+<script type="text/javascript" src="/base/node_modules/requirejs/require.js"></script>
+<script type="text/javascript">
+  require.config({
+    paths: {
+      "power-assert": "/base/build/power-assert"
+    },
+    shim: {
+      "power-assert": {
+        exports: "assert"
+      }
+    }
+  });
+</script>

test/not_tobe_instrumented/not_instrumented_test.js renamed to test/not_tobe_instrumented/not_instrumented.js

@@ -1,14 +1,7 @@
-(function (root, factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define(['power-assert', 'expect'], factory);
-    } else if (typeof exports === 'object') {
-        factory(require('../..'), require('expect.js'));
-    } else {
-        factory(root.assert, root.expect);
-    }
-}(this, function (assert, expect) {
+if (typeof window === 'undefined') {
+    var expect = require('expect.js');
+    var assert = require('../..');
+}
 
 describe('power-assert client should work with not-instrumented code', function () {
     beforeEach(function () {
@@ -37,5 +30,3 @@ describe('power-assert client should work with not-instrumented code', function
         });
     });
 });
-
-}));

test/rjsconfig.js

@@ -1,14 +1,9 @@
-(function (root, factory) {
-    'use strict';
+if (typeof window === 'undefined') {
+    var expect = require('expect.js');
+    var assert = require('../..');
+}
 
-    if (typeof define === 'function' && define.amd) {
-        define(['power-assert', 'expect'], factory);
-    } else if (typeof exports === 'object') {
-        factory(require('../..'), require('expect.js'));
-    } else {
-        factory(root.assert, root.expect);
-    }
-}(this, (assert, expect) => {
+describe('power-assert es6', function () {
     'use strict';
 
     function expectPowerAssertMessage (body, expectedLines) {
@@ -80,4 +75,4 @@
         });
     });
 
-}));
+});

test/test-amd.html

@@ -1,14 +1,7 @@
-(function (root, factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define(['power-assert', 'expect'], factory);
-    } else if (typeof exports === 'object') {
-        factory(require('../..'), require('expect.js'));
-    } else {
-        factory(root.assert, root.expect);
-    }
-}(this, function (assert, expect) {
+if (typeof window === 'undefined') {
+    var expect = require('expect.js');
+    var assert = require('../..');
+}
 
 describe('power-assert message', function () {
     beforeEach(function () {
@@ -867,5 +860,3 @@ describe('power-assert message', function () {
     });
 
 });
-
-}));

test/tobe_instrumented/es6_test.js renamed to test/tobe_instrumented/assertion.es6.js

@@ -1,15 +1,9 @@
-(function (root, factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define(['power-assert', 'expect'], factory);
-    } else if (typeof exports === 'object') {
-        factory(require('../..'), require('expect.js'));
-    } else {
-        factory(root.assert, root.expect);
-    }
-}(this, function (assert, expect) {
+if (typeof window === 'undefined') {
+    var expect = require('expect.js');
+    var assert = require('../..');
+}
 
+describe('power-assert customization', function () {
     var orininalAssert = assert;
 
     function expectPowerAssertMessage (body, expectedLines) {
@@ -20,9 +14,7 @@
             if (e.message === 'AssertionError should be thrown') {
                 throw e;
             }
-            expect(e.message.split('\n').slice(2, -1)).to.eql(expectedLines.map(function (line) {
-                return line;
-            }));
+            expect(e.message.split('\n').slice(2, -1)).to.eql(expectedLines);
         }
     };
 
@@ -143,4 +135,4 @@
 
     });
 
-}));
+});

test/tobe_instrumented/power_assert_test.js renamed to test/tobe_instrumented/assertion.js

@@ -0,0 +1,24 @@
+describe('power-assert modules', function () {
+    if (typeof window === 'undefined') return;
+
+    it('global', function () {
+        assert(true);
+    });
+
+    it('amd', function (done) {
+        var iframe = document.createElement('iframe');
+        iframe.src = '/base/test/fixture/amd.html';
+        document.body.appendChild(iframe);
+
+        iframe.onload = function () {
+            var require = iframe.contentWindow.require;
+            require([
+                "power-assert"
+            ], function (assert) {
+                assert(true);
+                done();
+            });
+        };
+    });
+
+});