Merge master/resolved conflicts

2015-08-13 12:26:14 -04:00
parent ed3e3b0eb8
commit 9c80429d0d
16 changed files with 3230 additions and 1032 deletions
--- a/tests/javascript/mochaTestHelper.js
+++ b/tests/javascript/mochaTestHelper.js
@@ -0,0 +1,30 @@
+var chai = require('chai');
+var sinon = require('sinon');
+var sinonChai = require('sinon-chai');
+var chaiJq = require('chai-jq');
+
+chai.use(sinonChai);
+chai.use(chaiJq);
+
+global.expect = chai.expect;
+global.sinon = sinon;
+
+if (!global.document || !global.window) {
+    var jsdom = require('jsdom').jsdom;
+
+    global.document = jsdom('<html><head><script></script></head><body></body></html>', {}, {
+        FetchExternalResources: ['script'],
+        ProcessExternalResources: ['script'],
+        MutationEvents: '2.0',
+        QuerySelector: false
+    });
+
+    global.window = document.parentWindow;
+    global.navigator = global.window.navigator;
+
+    global.window.Node.prototype.contains = function (node) {
+        return this.compareDocumentPosition(node) & 16;
+    };
+}
+
+global.$ = global.jQuery = global.window.jQuery = require('jquery');