Test and examples use new library path

jsdom · Jun 20, 2010 · d8ba99d · d8ba99d
1 parent de0b474
commit d8ba99d
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 30 deletions.
diff --git a/example/browser/browser.js b/example/browser/browser.js
@@ -1,8 +1,8 @@
 
 var sys = require('sys');
 
-var dom = require('../../lib/level1/core').dom.level1.core;
-var browser = require('../../lib/browser/index').windowAugmentation(dom);
+var dom = require('../../lib/jsdom/level1/core').dom.level1.core;
+var browser = require('../../lib/jsdom/browser/index').windowAugmentation(dom);
 
 var document = browser.document;
 var window = browser.window;

diff --git a/example/jquery/run.js b/example/jquery/run.js
@@ -1,7 +1,7 @@
 var sys = require("sys"), fs = require("fs"); 
 
-var dom = require("../../lib/level1/core").dom.level1.core;
-var window = require("../../lib/browser").windowAugmentation(dom).window;
+var dom = require("../../lib/jsdom/level1/core").dom.level1.core;
+var window = require("../../lib/jsdom/browser").windowAugmentation(dom).window;
 var document = window.document;
 var location = window.location;
 var navigator = window.navigator;

diff --git a/example/node-xml/run.js b/example/node-xml/run.js
@@ -1,5 +1,5 @@
 var sys = require('sys');
-process.mixin(GLOBAL, require("../../lib/level1/core").dom.level1.core);
+process.mixin(GLOBAL, require("../../lib/jsdom/level1/core").dom.level1.core);
 
 // git clone git://github.com/robrighter/node-xml.git into ~/.node_libraries
 var xml = require("node-xml/lib/node-xml");

diff --git a/example/pure/run.js b/example/pure/run.js
@@ -1,5 +1,5 @@
-var browser = require("../../lib/browser");
-var dom = new browser.browserAugmentation(require("../../lib/level1/core").dom.level1.core);
+var browser = require("../../lib/jsdom/browser");
+var dom = new browser.browserAugmentation(require("../../lib/jsdom/level1/core").dom.level1.core);
 var sax = require("./sax");
 var sys = require("sys");
 
@@ -63,21 +63,21 @@ dom.Element.prototype.__defineSetter__('innerHTML', function(html) {
 
 var doc = new dom.Document("html");  
 
-var implementation = new dom.DOMImplementation(doc, {
-  "HTML" : "1.0",
-  "DisableLiveLists" : "1.0"
-});
-
-var notations = new dom.NotationNodeMap(
-  doc,
-  doc.createNotationNode("notation1","notation1File", null),
-  doc.createNotationNode("notation2",null, "notation2File")
-);
-
-var entities = new dom.EntityNodeMap(doc);
-
-var doctype = new dom.DocumentType(doc, "html", entities, notations);
-doc.doctype = doctype;
+var implementation = new dom.DOMImplementation(doc, {
+  "HTML" : "1.0",
+  "DisableLiveLists" : "1.0"
+});
+
+var notations = new dom.NotationNodeMap(
+  doc,
+  doc.createNotationNode("notation1","notation1File", null),
+  doc.createNotationNode("notation2",null, "notation2File")
+);
+
+var entities = new dom.EntityNodeMap(doc);
+
+var doctype = new dom.DocumentType(doc, "html", entities, notations);
+doc.doctype = doctype;
 doc.implementation = implementation;
 
 doc.innerHTML = '<html><head></head><body><div class="who"></div></body></html>';

diff --git a/example/sizzle/run.js b/example/sizzle/run.js
@@ -1,5 +1,5 @@
-var browser = require("../../lib/browser");
-var dom = browser.browserAugmentation(require("../../lib/level1/core").dom.level1.core);
+var browser = require("../../lib/jsdom/browser");
+var dom = browser.browserAugmentation(require("../../lib/jsdom/level1/core").dom.level1.core);
 
 var sys = require("sys");
 

diff --git a/test/runner.js b/test/runner.js
@@ -20,7 +20,7 @@ var mixin = function(target) {
   return target;
 };
 
-mixin(global, require("../lib/level1/core").dom.level1.core);
+mixin(global, require("../lib/jsdom/level1/core").dom.level1.core);
 mixin(global, require(__dirname + "/mjsunit"));
 mixin(global, require("./DOMTestCase"));
 
@@ -73,16 +73,16 @@ var suites = {
     }
   },
   "level2/core" : { cases: require("./level2/core").tests, setUp : function() {
-      mixin(global, require("../lib/level2/core").dom.level2.core);
+      mixin(global, require("../lib/jsdom/level2/core").dom.level2.core);
       global.builder.contentType   = "text/xml";
       global.builder.type          = "xml";
       global.builder.testDirectory = "level2/core"; 
 
     }
   },  
   "browser"     : { cases: require("./browser").tests, setUp : function() {
-      global.dom = require(__dirname + "/../lib/level1/core").dom.level1.core;
-      global.browser = require(__dirname + "/../lib/browser").browserAugmentation(dom);
+      global.dom = require(__dirname + "/../lib/jsdom/level1/core").dom.level1.core;
+      global.browser = require(__dirname + "/../lib/jsdom/browser").browserAugmentation(dom);
 
 
       global.builder.contentType   = "text/html";
@@ -91,8 +91,8 @@ var suites = {
     }
   },
   "window"     : { cases: require("./window").tests, setUp : function() {
-      global.dom = require(__dirname + "/../lib/level1/core").dom.level1.core;
-      global.window = require(__dirname + "/../lib/browser").windowAugmentation(dom);
+      global.dom = require(__dirname + "/../lib/jsdom/level1/core").dom.level1.core;
+      global.window = require(__dirname + "/../lib/jsdom/browser").windowAugmentation(dom);
 
 
       global.builder.contentType   = "text/html";