From: Wolfram Schneider <wosch@indexdata.dk>
Date: Fri, 3 Jan 2014 15:44:53 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into onload
X-Git-Tag: 1.0.0~1747^2
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=fdfbf0e206320cf9c988096eb97de7e1beb7ac01;hp=3cd7917e3ada63d397a128a681685c1b7cab04c1;p=mkws-moved-to-github.git

Merge remote branch 'origin/master' into onload
---

diff --git a/test/Makefile b/test/Makefile
index e434e05..c47ab00 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -23,7 +23,7 @@ jsbeautifier jsb indent:
 
 node-modules: node_modules
 node_modules:
-	npm install jquery jsdom request jasmine-node
+	npm install jQuery xmlhttprequest jsdom request jasmine-node
 
 help:
 	@echo "make [ all | check | clean | distclean ]"
diff --git a/test/spec/jquery.spec.js b/test/spec/jquery.spec.js
index 2f3baa8..1f473c9 100644
--- a/test/spec/jquery.spec.js
+++ b/test/spec/jquery.spec.js
@@ -5,7 +5,7 @@
  */
 
 describe("jQuery suite simple", function () {
-    var $ = require('jquery');
+    var $ = require('jQuery');
 
     it("jQuery append test", function () {
         $("body").append("<h1>test passes h1</h1>");
diff --git a/test/spec/jsdom.spec.js b/test/spec/jsdom.spec.js
index 725d052..c83809a 100644
--- a/test/spec/jsdom.spec.js
+++ b/test/spec/jsdom.spec.js
@@ -8,9 +8,9 @@ describe("jQuery suite", function () {
     var jsdom = require('jsdom').jsdom;
     var myWindow = jsdom().createWindow();
 
-    var $ = require('jquery');
-    var jq = require('jquery').create();
-    var jQuery = require('jquery').create(myWindow);
+    var $ = require('jQuery');
+    var jq = require('jQuery').create();
+    var jQuery = require('jQuery').create(myWindow);
 
     it("jQuery append test", function () {
         jQuery("<h1>test passes h1</h1>").appendTo("body");
diff --git a/test/spec/mkws-index-jsdom.spec.js b/test/spec/mkws-index-jsdom.spec.js
index 8ed7993..471c03e 100644
--- a/test/spec/mkws-index-jsdom.spec.js
+++ b/test/spec/mkws-index-jsdom.spec.js
@@ -26,7 +26,7 @@ function jsdom_check(file, tags_array, ignore_doctype) {
         }).createWindow();
 
         /* apply jquery to the window */
-        var $ = require('jquery').create(window);
+        var $ = require('jQuery').create(window);
 
 
         it("html jquery test", function () {