Merge branch 'master' of github.com:thatcher/env-js

thatcher · Apr 14, 2010 · 451b60b · 451b60b
2 parents 9194bfa + 1774c8a
commit 451b60b
Show file tree

Hide file tree

Showing 119 changed files with 116 additions and 141 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,4 @@
-dist/env.*.*.*.js
-dist/env.rhino.*.*.*.js
-dist/env-js.*.jar
+dist/*
 *~
 rhino/build
 jshost

diff --git a/README b/README
@@ -83,12 +83,12 @@ Getting the code:
 
 == contributing tests with patches ==
 
-    Each module has a spec in env-js/test/spec.  Most tests will run whether you 
+    Each module has a spec in env-js/specs.  Most tests will run whether you
     load them in the file:, http:, or https:, though once you get to xhr.js 
     the tests will fail for the 'file:' protocol in firefox because of 
     permissions.  To run xhr.js and window.js specs, copy settings.js to 
-    local_settings.js and run a local server to satisfy those urls included in
-    the spec.js;
+    local_settings.js, update it, and run a local server to satisfy
+    those urls included in the spec.js;
 
 
 == platforms ==

diff --git a/build.xml b/build.xml
@@ -36,7 +36,7 @@
             location="${PREFIX}/docs"
             description="Folder for docs target"  />
     <property name="TEST_DIR"
-            location="${PREFIX}/test"
+            location="${basedir}/specs"
             description="Folder for test target"  />
     <property name="DIST_DIR"
             location="${PREFIX}/"
@@ -174,7 +174,7 @@
         <java fork="true"
               jar="${RHINO_JAR}"
               failonerror="true">
-            <arg value="test/specs/platform/rhino.js"/>
+            <arg value="${TEST_DIR}/platform/rhino.js"/>
             <jvmarg value="-Dfile.encoding=utf-8"/>
             <jvmarg value="-Xmx256m"/>
         </java>
@@ -211,7 +211,7 @@
         <java fork="true"
               jar="${RHINO_JAR}"
               failonerror="true">
-            <arg value="test/specs/console/boot.js"/>
+            <arg value="${TEST_DIR}/console/boot.js"/>
             <jvmarg value="-Dfile.encoding=utf-8"/>
             <jvmarg value="-Xmx256m"/>
         </java>
@@ -274,7 +274,7 @@
         <java fork="true"
               jar="${RHINO_JAR}"
               failonerror="true">
-            <arg value="test/specs/dom/boot.js"/>
+            <arg value="${TEST_DIR}/dom/boot.js"/>
             <jvmarg value="-Dfile.encoding=utf-8"/>
             <jvmarg value="-Xmx256m"/>
         </java>
@@ -321,7 +321,7 @@
         <java fork="true"
               jar="${RHINO_JAR}"
               failonerror="true">
-            <arg value="test/specs/event/boot.js"/>
+            <arg value="${TEST_DIR}/event/boot.js"/>
             <jvmarg value="-Dfile.encoding=utf-8"/>
             <jvmarg value="-Xmx256m"/>
         </java>
@@ -358,7 +358,7 @@
         <java fork="true"
               jar="${RHINO_JAR}"
               failonerror="true">
-            <arg value="test/specs/timer/boot.js"/>
+            <arg value="${TEST_DIR}/timer/boot.js"/>
             <jvmarg value="-Dfile.encoding=utf-8"/>
             <jvmarg value="-Xmx256m"/>
         </java>
@@ -382,6 +382,7 @@
             <fileset dir="${SRC_DIR}" includes="common/__trim__.js" />
             <fileset dir="${SRC_DIR}" includes="common/__extend__.js" />
             <fileset dir="${SRC_DIR}" includes="common/__setArray__.js" />
+            <fileset dir="${SRC_DIR}" includes="html/cookie.js" />
             <fileset dir="${SRC_DIR}" includes="html/document.js" />
             <fileset dir="${SRC_DIR}" includes="html/htmlevents.js" />
             <fileset dir="${SRC_DIR}" includes="html/keyboardevents.js" />
@@ -429,6 +430,7 @@
             <fileset dir="${SRC_DIR}" includes="html/param.js" />
             <fileset dir="${SRC_DIR}" includes="html/script.js" />
             <fileset dir="${SRC_DIR}" includes="html/select.js" />
+            <fileset dir="${SRC_DIR}" includes="html/span.js" />
             <fileset dir="${SRC_DIR}" includes="html/style.js" />
             <fileset dir="${SRC_DIR}" includes="html/table.js" />
             <fileset dir="${SRC_DIR}" includes="html/tbody-thead-tfoot.js" />
@@ -453,7 +455,7 @@
         <java fork="true"
               jar="${RHINO_JAR}"
               failonerror="true">
-            <arg value="test/specs/html/boot.js"/>
+            <arg value="${TEST_DIR}/html/boot.js"/>
             <jvmarg value="-Dfile.encoding=utf-8"/>
             <jvmarg value="-Xmx256m"/>
         </java>
@@ -499,7 +501,7 @@
               failonerror="true">
             <arg value="-opt"/>
             <arg value="-1"/>
-            <arg value="test/specs/parser/boot.js"/>
+            <arg value="${TEST_DIR}/parser/boot.js"/>
             <jvmarg value="-Dfile.encoding=utf-8"/>
             <jvmarg value="-Xmx256m"/>
         </java>
@@ -543,7 +545,7 @@
         <java fork="true"
               jar="${RHINO_JAR}"
               failonerror="true">
-            <arg value="test/specs/xhr/boot.js"/>
+            <arg value="${TEST_DIR}/xhr/boot.js"/>
             <jvmarg value="-Dfile.encoding=utf-8"/>
             <jvmarg value="-Xmx256m"/>
         </java>
@@ -586,7 +588,7 @@
         <java fork="true"
               jar="${RHINO_JAR}"
               failonerror="true">
-            <arg value="test/specs/css/boot.js"/>
+            <arg value="${TEST_DIR}/css/boot.js"/>
             <jvmarg value="-Dfile.encoding=utf-8"/>
             <jvmarg value="-Xmx256m"/>
         </java>
@@ -632,7 +634,7 @@
         <java fork="true"
               jar="${RHINO_JAR}"
               failonerror="true">
-            <arg value="test/specs/window/boot.js"/>
+            <arg value="${TEST_DIR}/window/boot.js"/>
             <jvmarg value="-Dfile.encoding=utf-8"/>
             <jvmarg value="-Xmx256m"/>
         </java>

diff --git a/settings.js b/settings.js
@@ -8,5 +8,6 @@
 
 var SETTINGS = { 
     BASE_URI : 'file:///mnt/repos/thatcher/env-js/',
-    AJAX_BASE: 'http://github.com/thatcher/env-js/raw/master/'
+    AJAX_BASE: 'http://github.com/thatcher/env-js/raw/master/',
+    LOCAL_PORT: '8080'
 }; 
diff --git a/test/specs/console/boot.js → specs/console/boot.js b/test/specs/console/boot.js → specs/console/boot.js
@@ -3,14 +3,14 @@
  * @author thatcher
  */
 
-load('test/specs/qunit.js');
-load('test/specs/env.qunit.js');
+load('specs/qunit.js');
+load('specs/env.qunit.js');
 QUnit.init();
 
 load('dist/platform/core.js');
 load('dist/platform/core.js');
 load('dist/platform/rhino.js');
 load('dist/console.js');
-load('test/specs/console/spec.js');
+load('specs/console/spec.js');
 start();
 
diff --git a/test/specs/console/index.html → specs/console/index.html b/test/specs/console/index.html → specs/console/index.html
@@ -16,7 +16,7 @@
     </head>
     <body id="body">
         <h1 id="qunit-header">
-            <img src="../../fixtures/images/icon-green.png"/>
+            <img src="../fixtures/images/icon-green.png"/>
              <span>Envjs Console Spec</span>
          </h1>
         <h2  id="qunit-userAgent"></h2>

diff --git a/test/specs/console/spec.js → specs/console/spec.js b/test/specs/console/spec.js → specs/console/spec.js
diff --git a/test/specs/css/boot.js → specs/css/boot.js b/test/specs/css/boot.js → specs/css/boot.js
@@ -3,8 +3,8 @@
  * @author thatcher
  */
 
-load('test/specs/qunit.js');
-load('test/specs/env.qunit.js');
+load('specs/qunit.js');
+load('specs/env.qunit.js');
 QUnit.init();
 
 load('dist/platform/core.js');
@@ -14,6 +14,6 @@ load('dist/dom.js');
 load('dist/event.js');
 load('dist/html.js');
 load('dist/css.js');
-load('test/specs/css/spec.js');
+load('specs/css/spec.js');
 start();
 
diff --git a/test/specs/css/index.html → specs/css/index.html b/test/specs/css/index.html → specs/css/index.html
@@ -17,7 +17,7 @@
     </head>
     <body id="body">
         <h1 id="qunit-header">
-            <img src="../../fixtures/images/icon-green.png"/>
+            <img src="../fixtures/images/icon-green.png"/>
              <span>Envjs CSS Spec</span>
          </h1>
         <h2  id="qunit-banner"></h2>

diff --git a/test/specs/css/spec.js → specs/css/spec.js b/test/specs/css/spec.js → specs/css/spec.js
diff --git a/test/specs/dom/boot.js → specs/dom/boot.js b/test/specs/dom/boot.js → specs/dom/boot.js
@@ -3,14 +3,14 @@
  * @author thatcher
  */
 
-load('test/specs/qunit.js');
-load('test/specs/env.qunit.js');
+load('specs/qunit.js');
+load('specs/env.qunit.js');
 QUnit.init();
 
 load('dist/platform/core.js');
 load('dist/platform/rhino.js');
 load('dist/console.js');
 load('dist/dom.js');
-load('test/specs/dom/spec.js');
+load('specs/dom/spec.js');
 start();
 
diff --git a/test/specs/dom/index.html → specs/dom/index.html b/test/specs/dom/index.html → specs/dom/index.html
@@ -17,7 +17,7 @@
     </head>
     <body id="body">
         <h1 id="qunit-header">
-            <img src="../../fixtures/images/icon-green.png"/>
+            <img src="../fixtures/images/icon-green.png"/>
              <span>Envjs DOM Spec</span>
          </h1>
         <h2  id="qunit-userAgent"></h2>

diff --git a/test/specs/dom/spec.js → specs/dom/spec.js b/test/specs/dom/spec.js → specs/dom/spec.js
diff --git a/test/specs/env.qunit.js → specs/env.qunit.js b/test/specs/env.qunit.js → specs/env.qunit.js
diff --git a/test/specs/event/boot.js → specs/event/boot.js b/test/specs/event/boot.js → specs/event/boot.js
@@ -3,15 +3,15 @@
  * @author thatcher
  */
 
-load('test/specs/qunit.js');
-load('test/specs/env.qunit.js');
+load('specs/qunit.js');
+load('specs/env.qunit.js');
 QUnit.init();
 
 load('dist/platform/core.js');
 load('dist/platform/rhino.js');
 load('dist/console.js');
 load('dist/dom.js');
 load('dist/event.js');
-load('test/specs/event/spec.js');
+load('specs/event/spec.js');
 start();
 
diff --git a/test/specs/event/index.html → specs/event/index.html b/test/specs/event/index.html → specs/event/index.html
@@ -17,7 +17,7 @@
     </head>
     <body id="body">
         <h1 id="qunit-header">
-            <img src="../../fixtures/images/icon-green.png"/>
+            <img src="../fixtures/images/icon-green.png"/>
             <span>Envjs Event Spec</span>
         </h1>
         <h2  id="qunit-userAgent"></h2>

diff --git a/test/specs/event/spec.js → specs/event/spec.js b/test/specs/event/spec.js → specs/event/spec.js
diff --git a/test/fixtures/images/icon-blue.png → specs/fixtures/images/icon-blue.png b/test/fixtures/images/icon-blue.png → specs/fixtures/images/icon-blue.png
diff --git a/test/fixtures/images/icon-green.png → specs/fixtures/images/icon-green.png b/test/fixtures/images/icon-green.png → specs/fixtures/images/icon-green.png
diff --git a/test/fixtures/simple.txt → specs/fixtures/simple.txt b/test/fixtures/simple.txt → specs/fixtures/simple.txt
diff --git a/test/specs/frame/proxy.html → specs/frame/proxy.html b/test/specs/frame/proxy.html → specs/frame/proxy.html
@@ -17,7 +17,7 @@
     </head>
     <body id="body">
         <h1 id="qunit-header">
-            <img src="../../fixtures/images/icon-green.png"/>
+            <img src="../fixtures/images/icon-green.png"/>
             <span>Envjs Proxy Spec</span>
         </h1>
         <h2  id="qunit-userAgent"></h2>

diff --git a/test/specs/frame/proxy.js → specs/frame/proxy.js b/test/specs/frame/proxy.js → specs/frame/proxy.js
diff --git a/test/specs/html/boot.js → specs/html/boot.js b/test/specs/html/boot.js → specs/html/boot.js
@@ -3,8 +3,8 @@
  * @author thatcher
  */
 
-load('test/specs/qunit.js');
-load('test/specs/env.qunit.js');
+load('specs/qunit.js');
+load('specs/env.qunit.js');
 QUnit.init();
 
 load('dist/platform/core.js');
@@ -13,6 +13,6 @@ load('dist/console.js');
 load('dist/dom.js');
 load('dist/event.js');
 load('dist/html.js');
-load('test/specs/html/spec.js');
+load('specs/html/spec.js');
 start();
 
diff --git a/test/specs/html/index.html → specs/html/index.html b/test/specs/html/index.html → specs/html/index.html
@@ -16,7 +16,7 @@
     </head>
     <body id="body">
         <h1 id="qunit-header">
-            <img src="../../fixtures/images/icon-green.png"/>
+            <img src="../fixtures/images/icon-green.png"/>
             <span>Envjs HTML Spec</span>
         </h1>
         <h2  id="qunit-userAgent"></h2>

diff --git a/test/specs/html/spec.js → specs/html/spec.js b/test/specs/html/spec.js → specs/html/spec.js
@@ -2,7 +2,7 @@ QUnit.module('html');
 
 test('HTML Interfaces Available', function(){
 
-    expect(52);
+    expect(53);
     ok(HTMLDocument,            'HTMLDocument defined');
     ok(HTMLElement,             'HTMLElement defined');
     ok(HTMLCollection,          'HTMLCollection defined');
@@ -42,6 +42,7 @@ test('HTML Interfaces Available', function(){
     ok(HTMLParamElement,        'HTMLParamElement defined');
     ok(HTMLScriptElement,       'HTMLScriptElement defined');
     ok(HTMLSelectElement,       'HTMLSelectElement defined');
+    ok(HTMLSpanElement,       'HTMLSpanElement defined');
     ok(HTMLStyleElement,        'HTMLStyleElement defined');
     ok(HTMLTableElement,        'HTMLTableElement defined');
     ok(HTMLTableSectionElement, 'HTMLTableSectionElement defined');

diff --git a/test/call-load-test.js → specs/obsolete-tests/call-load-test.js b/test/call-load-test.js → specs/obsolete-tests/call-load-test.js
diff --git a/test/debug.js → specs/obsolete-tests/debug.js b/test/debug.js → specs/obsolete-tests/debug.js
diff --git a/test/firebug/.svn/all-wcprops → ...s/obsolete-tests/firebug/.svn/all-wcprops b/test/firebug/.svn/all-wcprops → ...s/obsolete-tests/firebug/.svn/all-wcprops
diff --git a/test/firebug/.svn/entries → specs/obsolete-tests/firebug/.svn/entries b/test/firebug/.svn/entries → specs/obsolete-tests/firebug/.svn/entries
diff --git a/test/firebug/.svn/format → specs/obsolete-tests/firebug/.svn/format b/test/firebug/.svn/format → specs/obsolete-tests/firebug/.svn/format
diff --git a/...bug/.svn/prop-base/errorIcon.png.svn-base → ...bug/.svn/prop-base/errorIcon.png.svn-base b/...bug/.svn/prop-base/errorIcon.png.svn-base → ...bug/.svn/prop-base/errorIcon.png.svn-base
diff --git a/...ebug/.svn/prop-base/infoIcon.png.svn-base → ...ebug/.svn/prop-base/infoIcon.png.svn-base b/...ebug/.svn/prop-base/infoIcon.png.svn-base → ...ebug/.svn/prop-base/infoIcon.png.svn-base
diff --git a/...g/.svn/prop-base/warningIcon.png.svn-base → ...g/.svn/prop-base/warningIcon.png.svn-base b/...g/.svn/prop-base/warningIcon.png.svn-base → ...g/.svn/prop-base/warningIcon.png.svn-base
diff --git a/...bug/.svn/text-base/errorIcon.png.svn-base → ...bug/.svn/text-base/errorIcon.png.svn-base b/...bug/.svn/text-base/errorIcon.png.svn-base → ...bug/.svn/text-base/errorIcon.png.svn-base
diff --git a/...rebug/.svn/text-base/firebug.css.svn-base → ...rebug/.svn/text-base/firebug.css.svn-base b/...rebug/.svn/text-base/firebug.css.svn-base → ...rebug/.svn/text-base/firebug.css.svn-base
diff --git a/...ebug/.svn/text-base/firebug.html.svn-base → ...ebug/.svn/text-base/firebug.html.svn-base b/...ebug/.svn/text-base/firebug.html.svn-base → ...ebug/.svn/text-base/firebug.html.svn-base
diff --git a/...irebug/.svn/text-base/firebug.js.svn-base → ...irebug/.svn/text-base/firebug.js.svn-base b/...irebug/.svn/text-base/firebug.js.svn-base → ...irebug/.svn/text-base/firebug.js.svn-base
diff --git a/...rebug/.svn/text-base/firebugx.js.svn-base → ...rebug/.svn/text-base/firebugx.js.svn-base b/...rebug/.svn/text-base/firebugx.js.svn-base → ...rebug/.svn/text-base/firebugx.js.svn-base
diff --git a/...ebug/.svn/text-base/infoIcon.png.svn-base → ...ebug/.svn/text-base/infoIcon.png.svn-base b/...ebug/.svn/text-base/infoIcon.png.svn-base → ...ebug/.svn/text-base/infoIcon.png.svn-base
diff --git a/...g/.svn/text-base/warningIcon.png.svn-base → ...g/.svn/text-base/warningIcon.png.svn-base b/...g/.svn/text-base/warningIcon.png.svn-base → ...g/.svn/text-base/warningIcon.png.svn-base
diff --git a/test/firebug/errorIcon.png → specs/obsolete-tests/firebug/errorIcon.png b/test/firebug/errorIcon.png → specs/obsolete-tests/firebug/errorIcon.png
diff --git a/test/firebug/firebug.css → specs/obsolete-tests/firebug/firebug.css b/test/firebug/firebug.css → specs/obsolete-tests/firebug/firebug.css
diff --git a/test/firebug/firebug.html → specs/obsolete-tests/firebug/firebug.html b/test/firebug/firebug.html → specs/obsolete-tests/firebug/firebug.html
diff --git a/test/firebug/firebug.js → specs/obsolete-tests/firebug/firebug.js b/test/firebug/firebug.js → specs/obsolete-tests/firebug/firebug.js
diff --git a/test/firebug/firebugx.js → specs/obsolete-tests/firebug/firebugx.js b/test/firebug/firebugx.js → specs/obsolete-tests/firebug/firebugx.js
diff --git a/test/firebug/infoIcon.png → specs/obsolete-tests/firebug/infoIcon.png b/test/firebug/infoIcon.png → specs/obsolete-tests/firebug/infoIcon.png
diff --git a/test/firebug/warningIcon.png → specs/obsolete-tests/firebug/warningIcon.png b/test/firebug/warningIcon.png → specs/obsolete-tests/firebug/warningIcon.png
diff --git a/test/fixtures/html/events.html → .../obsolete-tests/fixtures/html/events.html b/test/fixtures/html/events.html → .../obsolete-tests/fixtures/html/events.html
diff --git a/test/fixtures/html/iframe1.html → ...obsolete-tests/fixtures/html/iframe1.html b/test/fixtures/html/iframe1.html → ...obsolete-tests/fixtures/html/iframe1.html
diff --git a/test/fixtures/html/iframe1a.html → ...bsolete-tests/fixtures/html/iframe1a.html b/test/fixtures/html/iframe1a.html → ...bsolete-tests/fixtures/html/iframe1a.html
diff --git a/test/fixtures/html/iframe2.html → ...obsolete-tests/fixtures/html/iframe2.html b/test/fixtures/html/iframe2.html → ...obsolete-tests/fixtures/html/iframe2.html
diff --git a/test/fixtures/html/iframe3.html → ...obsolete-tests/fixtures/html/iframe3.html b/test/fixtures/html/iframe3.html → ...obsolete-tests/fixtures/html/iframe3.html
diff --git a/test/fixtures/html/iframeN.html → ...obsolete-tests/fixtures/html/iframeN.html b/test/fixtures/html/iframeN.html → ...obsolete-tests/fixtures/html/iframeN.html
diff --git a/test/fixtures/html/malformed.html → ...solete-tests/fixtures/html/malformed.html b/test/fixtures/html/malformed.html → ...solete-tests/fixtures/html/malformed.html
diff --git a/test/fixtures/html/scope.html → ...s/obsolete-tests/fixtures/html/scope.html b/test/fixtures/html/scope.html → ...s/obsolete-tests/fixtures/html/scope.html
diff --git a/test/fixtures/html/trivial.html → ...obsolete-tests/fixtures/html/trivial.html b/test/fixtures/html/trivial.html → ...obsolete-tests/fixtures/html/trivial.html
diff --git a/test/fixtures/html/with_js.html → ...obsolete-tests/fixtures/html/with_js.html b/test/fixtures/html/with_js.html → ...obsolete-tests/fixtures/html/with_js.html
diff --git a/test/fixtures/js/external_script.js → ...lete-tests/fixtures/js/external_script.js b/test/fixtures/js/external_script.js → ...lete-tests/fixtures/js/external_script.js
diff --git a/test/fixtures/js/jquery.js → specs/obsolete-tests/fixtures/js/jquery.js b/test/fixtures/js/jquery.js → specs/obsolete-tests/fixtures/js/jquery.js
diff --git a/test/fixtures/js/script.js → specs/obsolete-tests/fixtures/js/script.js b/test/fixtures/js/script.js → specs/obsolete-tests/fixtures/js/script.js
diff --git a/test/fixtures/js/script_error.js → ...bsolete-tests/fixtures/js/script_error.js b/test/fixtures/js/script_error.js → ...bsolete-tests/fixtures/js/script_error.js
diff --git a/test/fixtures/simple.html → specs/obsolete-tests/fixtures/simple.html b/test/fixtures/simple.html → specs/obsolete-tests/fixtures/simple.html
diff --git a/test/fixtures/simple.xml → specs/obsolete-tests/fixtures/simple.xml b/test/fixtures/simple.xml → specs/obsolete-tests/fixtures/simple.xml
diff --git a/test/html/events.html → specs/obsolete-tests/html/events.html b/test/html/events.html → specs/obsolete-tests/html/events.html
diff --git a/test/html/iframe1.html → specs/obsolete-tests/html/iframe1.html b/test/html/iframe1.html → specs/obsolete-tests/html/iframe1.html
diff --git a/test/html/iframe1a.html → specs/obsolete-tests/html/iframe1a.html b/test/html/iframe1a.html → specs/obsolete-tests/html/iframe1a.html
diff --git a/test/html/iframe2.html → specs/obsolete-tests/html/iframe2.html b/test/html/iframe2.html → specs/obsolete-tests/html/iframe2.html
diff --git a/test/html/iframe3.html → specs/obsolete-tests/html/iframe3.html b/test/html/iframe3.html → specs/obsolete-tests/html/iframe3.html
diff --git a/test/html/iframeN.html → specs/obsolete-tests/html/iframeN.html b/test/html/iframeN.html → specs/obsolete-tests/html/iframeN.html
diff --git a/test/html/malformed.html → specs/obsolete-tests/html/malformed.html b/test/html/malformed.html → specs/obsolete-tests/html/malformed.html
diff --git a/test/html/scope.html → specs/obsolete-tests/html/scope.html b/test/html/scope.html → specs/obsolete-tests/html/scope.html
diff --git a/test/html/script.js → specs/obsolete-tests/html/script.js b/test/html/script.js → specs/obsolete-tests/html/script.js
diff --git a/test/html/trivial.html → specs/obsolete-tests/html/trivial.html b/test/html/trivial.html → specs/obsolete-tests/html/trivial.html
diff --git a/test/html/with_js.html → specs/obsolete-tests/html/with_js.html b/test/html/with_js.html → specs/obsolete-tests/html/with_js.html
diff --git a/test/index.html → specs/obsolete-tests/index.html b/test/index.html → specs/obsolete-tests/index.html
diff --git a/test/jqUnit.js → specs/obsolete-tests/jqUnit.js b/test/jqUnit.js → specs/obsolete-tests/jqUnit.js
diff --git a/test/primary-tests.js → specs/obsolete-tests/primary-tests.js b/test/primary-tests.js → specs/obsolete-tests/primary-tests.js
diff --git a/test/prototype-test.js → specs/obsolete-tests/prototype-test.js b/test/prototype-test.js → specs/obsolete-tests/prototype-test.js
diff --git a/test/qunit.css → specs/obsolete-tests/qunit.css b/test/qunit.css → specs/obsolete-tests/qunit.css
diff --git a/test/qunit.js → specs/obsolete-tests/qunit.js b/test/qunit.js → specs/obsolete-tests/qunit.js
diff --git a/test/qunit/qunit/qunit.css → specs/obsolete-tests/qunit/qunit/qunit.css b/test/qunit/qunit/qunit.css → specs/obsolete-tests/qunit/qunit/qunit.css
diff --git a/test/qunit/qunit/qunit.js → specs/obsolete-tests/qunit/qunit/qunit.js b/test/qunit/qunit/qunit.js → specs/obsolete-tests/qunit/qunit/qunit.js
diff --git a/test/results.html → specs/obsolete-tests/results.html b/test/results.html → specs/obsolete-tests/results.html
diff --git a/test/test.js → specs/obsolete-tests/test.js b/test/test.js → specs/obsolete-tests/test.js
diff --git a/test/unit/dom.js → specs/obsolete-tests/unit/dom.js b/test/unit/dom.js → specs/obsolete-tests/unit/dom.js
diff --git a/test/unit/elementmembers.js → specs/obsolete-tests/unit/elementmembers.js b/test/unit/elementmembers.js → specs/obsolete-tests/unit/elementmembers.js
diff --git a/test/unit/events.js → specs/obsolete-tests/unit/events.js b/test/unit/events.js → specs/obsolete-tests/unit/events.js
diff --git a/test/unit/fixtures/external_script.js → ...te-tests/unit/fixtures/external_script.js b/test/unit/fixtures/external_script.js → ...te-tests/unit/fixtures/external_script.js
diff --git a/test/unit/iframe.js → specs/obsolete-tests/unit/iframe.js b/test/unit/iframe.js → specs/obsolete-tests/unit/iframe.js
diff --git a/test/unit/multi-window.js → specs/obsolete-tests/unit/multi-window.js b/test/unit/multi-window.js → specs/obsolete-tests/unit/multi-window.js
diff --git a/test/unit/nu.validator.js → specs/obsolete-tests/unit/nu.validator.js b/test/unit/nu.validator.js → specs/obsolete-tests/unit/nu.validator.js
diff --git a/test/unit/onload.js → specs/obsolete-tests/unit/onload.js b/test/unit/onload.js → specs/obsolete-tests/unit/onload.js
diff --git a/test/unit/parser.js → specs/obsolete-tests/unit/parser.js b/test/unit/parser.js → specs/obsolete-tests/unit/parser.js
diff --git a/test/unit/prototypecompat.js → specs/obsolete-tests/unit/prototypecompat.js b/test/unit/prototypecompat.js → specs/obsolete-tests/unit/prototypecompat.js
diff --git a/test/unit/scope.js → specs/obsolete-tests/unit/scope.js b/test/unit/scope.js → specs/obsolete-tests/unit/scope.js
diff --git a/test/unit/timer.js → specs/obsolete-tests/unit/timer.js b/test/unit/timer.js → specs/obsolete-tests/unit/timer.js
diff --git a/test/unit/window.js → specs/obsolete-tests/unit/window.js b/test/unit/window.js → specs/obsolete-tests/unit/window.js
diff --git a/test/vendor/jQuery/.gitignore → ...s/obsolete-tests/vendor/jQuery/.gitignore b/test/vendor/jQuery/.gitignore → ...s/obsolete-tests/vendor/jQuery/.gitignore
diff --git a/test/vendor/jQuery/README → specs/obsolete-tests/vendor/jQuery/README b/test/vendor/jQuery/README → specs/obsolete-tests/vendor/jQuery/README
diff --git a/test/vendor/prototype-1.6.0.3.js → ...bsolete-tests/vendor/prototype-1.6.0.3.js b/test/vendor/prototype-1.6.0.3.js → ...bsolete-tests/vendor/prototype-1.6.0.3.js
diff --git a/test/specs/parser/boot.js → specs/parser/boot.js b/test/specs/parser/boot.js → specs/parser/boot.js
@@ -3,8 +3,8 @@
  * @author thatcher
  */
 
-load('test/specs/qunit.js');
-load('test/specs/env.qunit.js');
+load('specs/qunit.js');
+load('specs/env.qunit.js');
 QUnit.init();
 
 load('dist/platform/core.js');
@@ -15,6 +15,6 @@ load('dist/event.js');
 load('dist/html.js');
 load('dist/timer.js');
 load('dist/parser.js');
-load('test/specs/parser/spec.js');
+load('specs/parser/spec.js');
 start();
 Envjs.wait();
diff --git a/test/specs/parser/index.html → specs/parser/index.html b/test/specs/parser/index.html → specs/parser/index.html
@@ -17,7 +17,7 @@
     </head>
     <body id="body">
         <h1 id="qunit-header">
-            <img src="../../fixtures/images/icon-green.png"/>
+            <img src="../fixtures/images/icon-green.png"/>
             <span>Envjs Parser Spec</span>
         </h1>
         <h2  id="qunit-userAgent"></h2>

diff --git a/test/specs/parser/spec.js → specs/parser/spec.js b/test/specs/parser/spec.js → specs/parser/spec.js
diff --git a/test/specs/platform/rhino.js → specs/platform/rhino.js b/test/specs/platform/rhino.js → specs/platform/rhino.js
@@ -1,5 +1,5 @@
-load('test/specs/qunit.js');
-load('test/specs/env.qunit.js');
+load('specs/qunit.js');
+load('specs/env.qunit.js');
 QUnit.init();
 
 load('dist/platform/core.js');

diff --git a/test/specs/qunit.css → specs/qunit.css b/test/specs/qunit.css → specs/qunit.css
diff --git a/test/specs/qunit.js → specs/qunit.js b/test/specs/qunit.js → specs/qunit.js
diff --git a/test/specs/timer/boot.js → specs/timer/boot.js b/test/specs/timer/boot.js → specs/timer/boot.js
@@ -3,15 +3,15 @@
  * @author thatcher
  */
 
-load('test/specs/qunit.js');
-load('test/specs/env.qunit.js');
+load('specs/qunit.js');
+load('specs/env.qunit.js');
 QUnit.init();
 
 load('dist/platform/core.js');
 load('dist/platform/rhino.js');
 load('dist/console.js');
 load('dist/timer.js');
-load('test/specs/timer/spec.js');
+load('specs/timer/spec.js');
 
 start();
 Envjs.wait();
diff --git a/test/specs/timer/index.html → specs/timer/index.html b/test/specs/timer/index.html → specs/timer/index.html
@@ -17,7 +17,7 @@
     </head>
     <body id="body">
         <h1 id="qunit-header">
-            <img src="../../fixtures/images/icon-green.png"/>
+            <img src="../fixtures/images/icon-green.png"/>
             <span>Envjs Timer Spec</span>
         </h1>
         <h2  id="qunit-userAgent"></h2>

diff --git a/test/specs/timer/spec.js → specs/timer/spec.js b/test/specs/timer/spec.js → specs/timer/spec.js
diff --git a/test/specs/window/boot.js → specs/window/boot.js b/test/specs/window/boot.js → specs/window/boot.js
@@ -13,12 +13,12 @@ load('dist/parser.js');
 load('dist/xhr.js');
 load('dist/window.js');
 
-load('test/specs/qunit.js');
-load('test/specs/env.qunit.js');
+load('specs/qunit.js');
+load('specs/env.qunit.js');
 
 load('local_settings.js');
-load('test/specs/window/spec.js');
+load('specs/window/spec.js');
 
 
-location =  'test/specs/window/index.html';
+location =  'specs/window/index.html';
 Envjs.wait();