From 8eb22243846262384cddcc50598da52d7e842dca Mon Sep 17 00:00:00 2001
From: "Glen E. Ivey" <gleneivey@wontology.org>
Date: Wed, 14 Apr 2010 17:34:10 -0700
Subject: [PATCH] Fixed another test that wouldn't run in the browser.  Found
 problem introduced in one of my earlier fixes to 'html' tests (ant-build
 only, couldn't get "head" element of the document because boot.js didn't set
 location= to the test's index.html.  alas).

---
 specs/helpers.js        |   5 +
 specs/html/boot.js      |  11 +-
 specs/html/index.html   |   2 +
 specs/html/spec.js      |   6 +-
 specs/window/boot.js    |   1 +
 specs/window/index.html |   2 +
 specs/window/spec.js    | 224 +++++++++++++++++++++-------------------
 7 files changed, 140 insertions(+), 111 deletions(-)
 create mode 100644 specs/helpers.js

diff --git a/specs/helpers.js b/specs/helpers.js
new file mode 100644
index 00000000..af3cbc5c
--- /dev/null
+++ b/specs/helpers.js
@@ -0,0 +1,5 @@
+// helpers available to all tests
+
+function runningUnderEnvjs(){
+    return navigator.userAgent.search( /Envjs/ ) > -1;
+}
diff --git a/specs/html/boot.js b/specs/html/boot.js
index 9604bd21..8fe27500 100644
--- a/specs/html/boot.js
+++ b/specs/html/boot.js
@@ -5,6 +5,7 @@
 
 load('specs/qunit.js');
 load('specs/env.qunit.js');
+load('specs/helpers.js');
 QUnit.init();
 
 load('dist/platform/core.js');
@@ -13,6 +14,14 @@ load('dist/console.js');
 load('dist/dom.js');
 load('dist/event.js');
 load('dist/html.js');
+load('dist/timer.js');
+load('dist/parser.js');
+load('dist/xhr.js');
+load('dist/window.js');
+
+load('local_settings.js');
 load('specs/html/spec.js');
-start();
 
+
+location =  'specs/html/index.html';
+start();
diff --git a/specs/html/index.html b/specs/html/index.html
index bde474aa..cf0ea55c 100644
--- a/specs/html/index.html
+++ b/specs/html/index.html
@@ -9,6 +9,8 @@
         
         <script src="../qunit.js"            
                 type="text/javascript" ></script>
+        <script src="../helpers.js"
+                type="text/javascript" ></script>
         <script src="spec.js"               
                 type="text/javascript" ></script>
         
diff --git a/specs/html/spec.js b/specs/html/spec.js
index c289ee8f..6c6f8deb 100644
--- a/specs/html/spec.js
+++ b/specs/html/spec.js
@@ -2,9 +2,7 @@ QUnit.module('html');
 
 test('HTML Interfaces Available', function(){
 
-    var areInEnvjs = navigator.userAgent.search( /Envjs/ ) > -1;
-
-    if (areInEnvjs)
+    if (runningUnderEnvjs())
         expect(53);
     else
         expect(51);
@@ -54,7 +52,7 @@ test('HTML Interfaces Available', function(){
     ok(HTMLTableSectionElement, 'HTMLTableSectionElement defined');
     ok(HTMLTableCellElement,    'HTMLTableCellElement defined');
 
-    if (areInEnvjs){
+    if (runningUnderEnvjs()){
         ok(HTMLTableDataCellElement,    'HTMLTableDataCellElement defined');
         ok(HTMLTableHeaderCellElement,  'HTMLTableHeaderCellElement defined');
     }
diff --git a/specs/window/boot.js b/specs/window/boot.js
index 77b1566c..ff455636 100644
--- a/specs/window/boot.js
+++ b/specs/window/boot.js
@@ -15,6 +15,7 @@ load('dist/window.js');
 
 load('specs/qunit.js');
 load('specs/env.qunit.js');
+load('specs/helpers.js');
 
 load('local_settings.js');
 load('specs/window/spec.js');
diff --git a/specs/window/index.html b/specs/window/index.html
index d35a4cb8..00bc68f3 100644
--- a/specs/window/index.html
+++ b/specs/window/index.html
@@ -10,6 +10,8 @@
         
         <script src="../qunit.js"            
                 type="text/javascript" ></script>
+        <script src="../helpers.js"
+                type="text/javascript" ></script>
         <script src="spec.js"            
                 type="text/javascript" ></script>
         <script type="text/javascript">
diff --git a/specs/window/spec.js b/specs/window/spec.js
index 28978849..59aef82a 100644
--- a/specs/window/spec.js
+++ b/specs/window/spec.js
@@ -188,111 +188,123 @@ test('window.location', function(){
     //ok(location.assign,         'location.resolveURL');
 });
 
-test('Location object', function() {
-    // to use the example from
-    // https://developer.mozilla.org/En/DOM/Window.location
-    var x = Location('http://www.google.com:80/search?q=devmo#test');
-
-    // we are modifying x.assign to we can intercept the new
-    // reconstituted url
-    x.assign = function(url) {};
-
-    // test basic parsing
-    equals(x.hash, '#test');
-    equals(x.host, 'www.google.com:80');
-    equals(x.hostname, 'www.google.com');
-    equals(x.href, 'http://www.google.com:80/search?q=devmo#test');
-    equals(x.pathname, '/search');
-    equals(x.protocol, 'http:');
-    equals(x.port, '80');
-    equals(typeof x.port, 'string');
-    equals(x.search, '?q=devmo');
-
-    // setter for hostname
-    x = Location('http://www.google.com:80/search?q=devmo#test');
-    x.assign = function(url) {};
-    // TBD, not clear what should happen
-    // SafarI 4: accept
-    // Firefox 3.6: Error
-    x.protocol = '';
-    // envjs crash
-    //equals(x.protocol, 'http:', 'Setting protocol to emptry string is ignored');
-    x.protocol = 'https:';
-    equals(x.protocol, 'https:', 'Setting protocol with trailing colon');
-    x.protocol = 'http';
-    equals(x.protocol, 'http:', 'Setting protocol without trailing colon');
-
-    // setter for host
-    x = Location('http://www.google.com:80/search?q=devmo#test');
-    x.assign = function(url) {};
-    x.host = '';
-    // SafarI 4: accept (infinite loop)
-    // Firefox 3.6: Error
-    equals(x.host, 'www.google.com:80', 'Setting host to emptry string is ignored');
-
-    x.host = 'www.yahoo.com';
-    equals(x.host, 'www.yahoo.com', 'Setting host with no port')
-    equals(x.hostname, 'www.yahoo.com', 'Setting host updates hostname');
-    equals(x.port, '', 'Setting host updates port');
-    equals(x.href, 'http://www.yahoo.com/search?q=devmo#test');
-
-    x.host = 'www.google.com:80';
-    equals(x.host, 'www.google.com:80', 'Setting host with port');
-    equals(x.hostname,'www.google.com', 'Setting host updates hostname');
-    equals(x.port, '80', 'Setting host updates port');
-    equals(x.href, 'http://www.google.com:80/search?q=devmo#test');
-
-    // setter for host
-    x = Location('http://www.google.com:80/search?q=devmo#test');
-    x.assign = function(url) {};
-    x.host = 'www.yahoo.com';
-    equals(x.host, 'www.yahoo.com');
-
-    // setter for port
-    // Safari 4: file://:90/Users/nickg/javascript.html
-    // Firefox: Error
-    x = Location('http://www.google.com:80/search?q=devmo#test');
-    x.assign = function(url) {};
-    x.port = 81;
-    equals(x.port, 81, 'Setting port as integer');
-    equals(x.host, 'www.google.com:81');
-    equals(x.href, 'http://www.google.com:81/search?q=devmo#test');
-    x.port = '82';
-    equals(x.port, '82', 'Setting port as string');
-    equals(x.host, 'www.google.com:82');
-    equals(x.href, 'http://www.google.com:82/search?q=devmo#test');
-
-    // setter for path
-    x = Location('http://www.google.com:80/search?q=devmo#test');
-    x.assign = function(url) {};
-    x.pathname = '/foo';
-    equals(x.pathname, '/foo', 'Setting path starting with "/"');
-    equals(x.href, 'http://www.google.com:80/foo?q=devmo#test');
-    x.pathname = 'foobar';
-    equals(x.pathname, '/foobar', 'Setting path starting without "/"');
-    equals(x.href, 'http://www.google.com:80/foobar?q=devmo#test');
-
-    // setter for search (query string)
-    x = Location('http://www.google.com:80/search?q=devmo#test');
-    x.assign = function(url) {};
-    x.search='?q=foo';
-    equals(x.search, '?q=foo', 'Setting search with starting "?"');
-    equals(x.href, 'http://www.google.com:80/search?q=foo#test');
-    x.search='q=bar';
-    equals(x.search, '?q=bar', 'Setting search without starting "?"');
-    equals(x.href, 'http://www.google.com:80/search?q=bar#test');
-
-    // setter for hash (fragment)
-    x = Location('http://www.google.com:80/search?q=devmo#test');
-    x.assign = function(url) {};
-    x.hash = '#foo';
-    equals(x.hash, '#foo', 'Setting hash with starting "#"');
-    equals(x.href, 'http://www.google.com:80/search?q=devmo#foo');
-    x.hash = '#bar';
-    equals(x.hash, '#bar', 'Setting hash without starting "#"');
-    equals(x.href, 'http://www.google.com:80/search?q=devmo#bar');
-});
+if (runningUnderEnvjs()){
+    /* This test won't run in a browser.  In-browser testing with
+     * modern versions of IE, Safari, and FF shows that "Location"
+     * ranges from being entirely undefined to not callable as an
+     * object constructor, but Envjs seems to be the only system that
+     * allows for instances of the Location object outside of being a
+     * member of the 'window' object.  I'm leaving the test as it is
+     * written, however, because performing these validations on
+     * window.location itself would cause the browser (simulation) to
+     * attempt to navigate all over the place creating huge problems.
+     */
 
+    test('Location object', function() {
+        // to use the example from
+        // https://developer.mozilla.org/En/DOM/Window.location
+        var x = new Location('http://www.google.com:80/search?q=devmo#test');
+
+        // we are modifying x.assign to we can intercept the new
+        // reconstituted url
+        x.assign = function(url) {};
+
+        // test basic parsing
+        equals(x.hash, '#test');
+        equals(x.host, 'www.google.com:80');
+        equals(x.hostname, 'www.google.com');
+        equals(x.href, 'http://www.google.com:80/search?q=devmo#test');
+        equals(x.pathname, '/search');
+        equals(x.protocol, 'http:');
+        equals(x.port, '80');
+        equals(typeof x.port, 'string');
+        equals(x.search, '?q=devmo');
+
+        // setter for hostname
+        x = Location('http://www.google.com:80/search?q=devmo#test');
+        x.assign = function(url) {};
+        // TBD, not clear what should happen
+        // SafarI 4: accept
+        // Firefox 3.6: Error
+        x.protocol = '';
+        // envjs crash
+        //equals(x.protocol, 'http:', 'Setting protocol to emptry string is ignored');
+        x.protocol = 'https:';
+        equals(x.protocol, 'https:', 'Setting protocol with trailing colon');
+        x.protocol = 'http';
+        equals(x.protocol, 'http:', 'Setting protocol without trailing colon');
+
+        // setter for host
+        x = Location('http://www.google.com:80/search?q=devmo#test');
+        x.assign = function(url) {};
+        x.host = '';
+        // SafarI 4: accept (infinite loop)
+        // Firefox 3.6: Error
+        equals(x.host, 'www.google.com:80', 'Setting host to emptry string is ignored');
+
+        x.host = 'www.yahoo.com';
+        equals(x.host, 'www.yahoo.com', 'Setting host with no port')
+        equals(x.hostname, 'www.yahoo.com', 'Setting host updates hostname');
+        equals(x.port, '', 'Setting host updates port');
+        equals(x.href, 'http://www.yahoo.com/search?q=devmo#test');
+
+        x.host = 'www.google.com:80';
+        equals(x.host, 'www.google.com:80', 'Setting host with port');
+        equals(x.hostname,'www.google.com', 'Setting host updates hostname');
+        equals(x.port, '80', 'Setting host updates port');
+        equals(x.href, 'http://www.google.com:80/search?q=devmo#test');
+
+        // setter for host
+        x = Location('http://www.google.com:80/search?q=devmo#test');
+        x.assign = function(url) {};
+        x.host = 'www.yahoo.com';
+        equals(x.host, 'www.yahoo.com');
+
+        // setter for port
+        // Safari 4: file://:90/Users/nickg/javascript.html
+        // Firefox: Error
+        x = Location('http://www.google.com:80/search?q=devmo#test');
+        x.assign = function(url) {};
+        x.port = 81;
+        equals(x.port, 81, 'Setting port as integer');
+        equals(x.host, 'www.google.com:81');
+        equals(x.href, 'http://www.google.com:81/search?q=devmo#test');
+        x.port = '82';
+        equals(x.port, '82', 'Setting port as string');
+        equals(x.host, 'www.google.com:82');
+        equals(x.href, 'http://www.google.com:82/search?q=devmo#test');
+
+        // setter for path
+        x = Location('http://www.google.com:80/search?q=devmo#test');
+        x.assign = function(url) {};
+        x.pathname = '/foo';
+        equals(x.pathname, '/foo', 'Setting path starting with "/"');
+        equals(x.href, 'http://www.google.com:80/foo?q=devmo#test');
+        x.pathname = 'foobar';
+        equals(x.pathname, '/foobar', 'Setting path starting without "/"');
+        equals(x.href, 'http://www.google.com:80/foobar?q=devmo#test');
+
+        // setter for search (query string)
+        x = Location('http://www.google.com:80/search?q=devmo#test');
+        x.assign = function(url) {};
+        x.search='?q=foo';
+        equals(x.search, '?q=foo', 'Setting search with starting "?"');
+        equals(x.href, 'http://www.google.com:80/search?q=foo#test');
+        x.search='q=bar';
+        equals(x.search, '?q=bar', 'Setting search without starting "?"');
+        equals(x.href, 'http://www.google.com:80/search?q=bar#test');
+
+        // setter for hash (fragment)
+        x = Location('http://www.google.com:80/search?q=devmo#test');
+        x.assign = function(url) {};
+        x.hash = '#foo';
+        equals(x.hash, '#foo', 'Setting hash with starting "#"');
+        equals(x.href, 'http://www.google.com:80/search?q=devmo#foo');
+        x.hash = '#bar';
+        equals(x.hash, '#bar', 'Setting hash without starting "#"');
+        equals(x.href, 'http://www.google.com:80/search?q=devmo#bar');
+    });
+}
 
 test('window.screen', function(){
 
@@ -570,7 +582,7 @@ test('Form Named Element Lookup', function(){
     elements = doc.bar.elements;
     equals(elements.length, 1);
     equals(form.length, 1);
-    print('element is : ' + elements.input1);
+    //print('element is : ' + elements.input1);
     ok(elements.input1 instanceof HTMLInputElement);
     ok(form.input1 instanceof HTMLInputElement);
 
@@ -579,4 +591,4 @@ test('Form Named Element Lookup', function(){
     node2 = doc.foo;
     ok(! node2, 'old named element is gone');
     */
-});
\ No newline at end of file
+});