diff --git a/README b/README index 115bfd64..20c98701 100644 --- 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 index 9be4bc4e..03fe69af 100644 --- a/build.xml +++ b/build.xml @@ -36,7 +36,7 @@ location="${PREFIX}/docs" description="Folder for docs target" />

- + Envjs Console Spec

diff --git a/test/specs/console/spec.js b/specs/console/spec.js similarity index 100% rename from test/specs/console/spec.js rename to specs/console/spec.js diff --git a/test/specs/css/boot.js b/specs/css/boot.js similarity index 70% rename from test/specs/css/boot.js rename to specs/css/boot.js index 42fa65b2..b12a2342 100644 --- a/test/specs/css/boot.js +++ b/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 b/specs/css/index.html similarity index 95% rename from test/specs/css/index.html rename to specs/css/index.html index 439aacdc..3a3bff4d 100644 --- a/test/specs/css/index.html +++ b/specs/css/index.html @@ -17,7 +17,7 @@

- + Envjs CSS Spec

diff --git a/test/specs/css/spec.js b/specs/css/spec.js similarity index 100% rename from test/specs/css/spec.js rename to specs/css/spec.js diff --git a/test/specs/dom/boot.js b/specs/dom/boot.js similarity index 63% rename from test/specs/dom/boot.js rename to specs/dom/boot.js index 15f81f4d..130f4d3c 100644 --- a/test/specs/dom/boot.js +++ b/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 b/specs/dom/index.html similarity index 95% rename from test/specs/dom/index.html rename to specs/dom/index.html index 6348a06c..c13cafb4 100644 --- a/test/specs/dom/index.html +++ b/specs/dom/index.html @@ -17,7 +17,7 @@

- + Envjs DOM Spec

diff --git a/test/specs/dom/spec.js b/specs/dom/spec.js similarity index 100% rename from test/specs/dom/spec.js rename to specs/dom/spec.js diff --git a/test/specs/env.qunit.js b/specs/env.qunit.js similarity index 100% rename from test/specs/env.qunit.js rename to specs/env.qunit.js diff --git a/test/specs/event/boot.js b/specs/event/boot.js similarity index 66% rename from test/specs/event/boot.js rename to specs/event/boot.js index 60d3e209..c2d2d310 100644 --- a/test/specs/event/boot.js +++ b/specs/event/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'); @@ -12,6 +12,6 @@ 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 b/specs/event/index.html similarity index 95% rename from test/specs/event/index.html rename to specs/event/index.html index ff871662..9ce7e6f0 100644 --- a/test/specs/event/index.html +++ b/specs/event/index.html @@ -17,7 +17,7 @@

- + Envjs Event Spec

diff --git a/test/specs/event/spec.js b/specs/event/spec.js similarity index 100% rename from test/specs/event/spec.js rename to specs/event/spec.js diff --git a/test/fixtures/images/icon-blue.png b/specs/fixtures/images/icon-blue.png similarity index 100% rename from test/fixtures/images/icon-blue.png rename to specs/fixtures/images/icon-blue.png diff --git a/test/fixtures/images/icon-green.png b/specs/fixtures/images/icon-green.png similarity index 100% rename from test/fixtures/images/icon-green.png rename to specs/fixtures/images/icon-green.png diff --git a/test/fixtures/simple.txt b/specs/fixtures/simple.txt similarity index 100% rename from test/fixtures/simple.txt rename to specs/fixtures/simple.txt diff --git a/test/specs/frame/proxy.html b/specs/frame/proxy.html similarity index 95% rename from test/specs/frame/proxy.html rename to specs/frame/proxy.html index 19470bf5..6db6eb30 100644 --- a/test/specs/frame/proxy.html +++ b/specs/frame/proxy.html @@ -17,7 +17,7 @@

- + Envjs Proxy Spec

diff --git a/test/specs/frame/proxy.js b/specs/frame/proxy.js similarity index 100% rename from test/specs/frame/proxy.js rename to specs/frame/proxy.js diff --git a/test/specs/html/boot.js b/specs/html/boot.js similarity index 68% rename from test/specs/html/boot.js rename to specs/html/boot.js index 23e1beab..9604bd21 100644 --- a/test/specs/html/boot.js +++ b/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 b/specs/html/index.html similarity index 95% rename from test/specs/html/index.html rename to specs/html/index.html index 074592c4..b167b72c 100644 --- a/test/specs/html/index.html +++ b/specs/html/index.html @@ -16,7 +16,7 @@

- + Envjs HTML Spec

diff --git a/test/specs/html/spec.js b/specs/html/spec.js similarity index 100% rename from test/specs/html/spec.js rename to specs/html/spec.js diff --git a/test/call-load-test.js b/specs/obsolete-tests/call-load-test.js similarity index 100% rename from test/call-load-test.js rename to specs/obsolete-tests/call-load-test.js diff --git a/test/debug.js b/specs/obsolete-tests/debug.js similarity index 100% rename from test/debug.js rename to specs/obsolete-tests/debug.js diff --git a/test/firebug/.svn/all-wcprops b/specs/obsolete-tests/firebug/.svn/all-wcprops similarity index 100% rename from test/firebug/.svn/all-wcprops rename to specs/obsolete-tests/firebug/.svn/all-wcprops diff --git a/test/firebug/.svn/entries b/specs/obsolete-tests/firebug/.svn/entries similarity index 100% rename from test/firebug/.svn/entries rename to specs/obsolete-tests/firebug/.svn/entries diff --git a/test/firebug/.svn/format b/specs/obsolete-tests/firebug/.svn/format similarity index 100% rename from test/firebug/.svn/format rename to specs/obsolete-tests/firebug/.svn/format diff --git a/test/firebug/.svn/prop-base/errorIcon.png.svn-base b/specs/obsolete-tests/firebug/.svn/prop-base/errorIcon.png.svn-base similarity index 100% rename from test/firebug/.svn/prop-base/errorIcon.png.svn-base rename to specs/obsolete-tests/firebug/.svn/prop-base/errorIcon.png.svn-base diff --git a/test/firebug/.svn/prop-base/infoIcon.png.svn-base b/specs/obsolete-tests/firebug/.svn/prop-base/infoIcon.png.svn-base similarity index 100% rename from test/firebug/.svn/prop-base/infoIcon.png.svn-base rename to specs/obsolete-tests/firebug/.svn/prop-base/infoIcon.png.svn-base diff --git a/test/firebug/.svn/prop-base/warningIcon.png.svn-base b/specs/obsolete-tests/firebug/.svn/prop-base/warningIcon.png.svn-base similarity index 100% rename from test/firebug/.svn/prop-base/warningIcon.png.svn-base rename to specs/obsolete-tests/firebug/.svn/prop-base/warningIcon.png.svn-base diff --git a/test/firebug/.svn/text-base/errorIcon.png.svn-base b/specs/obsolete-tests/firebug/.svn/text-base/errorIcon.png.svn-base similarity index 100% rename from test/firebug/.svn/text-base/errorIcon.png.svn-base rename to specs/obsolete-tests/firebug/.svn/text-base/errorIcon.png.svn-base diff --git a/test/firebug/.svn/text-base/firebug.css.svn-base b/specs/obsolete-tests/firebug/.svn/text-base/firebug.css.svn-base similarity index 100% rename from test/firebug/.svn/text-base/firebug.css.svn-base rename to specs/obsolete-tests/firebug/.svn/text-base/firebug.css.svn-base diff --git a/test/firebug/.svn/text-base/firebug.html.svn-base b/specs/obsolete-tests/firebug/.svn/text-base/firebug.html.svn-base similarity index 100% rename from test/firebug/.svn/text-base/firebug.html.svn-base rename to specs/obsolete-tests/firebug/.svn/text-base/firebug.html.svn-base diff --git a/test/firebug/.svn/text-base/firebug.js.svn-base b/specs/obsolete-tests/firebug/.svn/text-base/firebug.js.svn-base similarity index 100% rename from test/firebug/.svn/text-base/firebug.js.svn-base rename to specs/obsolete-tests/firebug/.svn/text-base/firebug.js.svn-base diff --git a/test/firebug/.svn/text-base/firebugx.js.svn-base b/specs/obsolete-tests/firebug/.svn/text-base/firebugx.js.svn-base similarity index 100% rename from test/firebug/.svn/text-base/firebugx.js.svn-base rename to specs/obsolete-tests/firebug/.svn/text-base/firebugx.js.svn-base diff --git a/test/firebug/.svn/text-base/infoIcon.png.svn-base b/specs/obsolete-tests/firebug/.svn/text-base/infoIcon.png.svn-base similarity index 100% rename from test/firebug/.svn/text-base/infoIcon.png.svn-base rename to specs/obsolete-tests/firebug/.svn/text-base/infoIcon.png.svn-base diff --git a/test/firebug/.svn/text-base/warningIcon.png.svn-base b/specs/obsolete-tests/firebug/.svn/text-base/warningIcon.png.svn-base similarity index 100% rename from test/firebug/.svn/text-base/warningIcon.png.svn-base rename to specs/obsolete-tests/firebug/.svn/text-base/warningIcon.png.svn-base diff --git a/test/firebug/errorIcon.png b/specs/obsolete-tests/firebug/errorIcon.png similarity index 100% rename from test/firebug/errorIcon.png rename to specs/obsolete-tests/firebug/errorIcon.png diff --git a/test/firebug/firebug.css b/specs/obsolete-tests/firebug/firebug.css similarity index 100% rename from test/firebug/firebug.css rename to specs/obsolete-tests/firebug/firebug.css diff --git a/test/firebug/firebug.html b/specs/obsolete-tests/firebug/firebug.html similarity index 100% rename from test/firebug/firebug.html rename to specs/obsolete-tests/firebug/firebug.html diff --git a/test/firebug/firebug.js b/specs/obsolete-tests/firebug/firebug.js similarity index 100% rename from test/firebug/firebug.js rename to specs/obsolete-tests/firebug/firebug.js diff --git a/test/firebug/firebugx.js b/specs/obsolete-tests/firebug/firebugx.js similarity index 100% rename from test/firebug/firebugx.js rename to specs/obsolete-tests/firebug/firebugx.js diff --git a/test/firebug/infoIcon.png b/specs/obsolete-tests/firebug/infoIcon.png similarity index 100% rename from test/firebug/infoIcon.png rename to specs/obsolete-tests/firebug/infoIcon.png diff --git a/test/firebug/warningIcon.png b/specs/obsolete-tests/firebug/warningIcon.png similarity index 100% rename from test/firebug/warningIcon.png rename to specs/obsolete-tests/firebug/warningIcon.png diff --git a/test/fixtures/html/events.html b/specs/obsolete-tests/fixtures/html/events.html similarity index 100% rename from test/fixtures/html/events.html rename to specs/obsolete-tests/fixtures/html/events.html diff --git a/test/fixtures/html/iframe1.html b/specs/obsolete-tests/fixtures/html/iframe1.html similarity index 100% rename from test/fixtures/html/iframe1.html rename to specs/obsolete-tests/fixtures/html/iframe1.html diff --git a/test/fixtures/html/iframe1a.html b/specs/obsolete-tests/fixtures/html/iframe1a.html similarity index 100% rename from test/fixtures/html/iframe1a.html rename to specs/obsolete-tests/fixtures/html/iframe1a.html diff --git a/test/fixtures/html/iframe2.html b/specs/obsolete-tests/fixtures/html/iframe2.html similarity index 100% rename from test/fixtures/html/iframe2.html rename to specs/obsolete-tests/fixtures/html/iframe2.html diff --git a/test/fixtures/html/iframe3.html b/specs/obsolete-tests/fixtures/html/iframe3.html similarity index 100% rename from test/fixtures/html/iframe3.html rename to specs/obsolete-tests/fixtures/html/iframe3.html diff --git a/test/fixtures/html/iframeN.html b/specs/obsolete-tests/fixtures/html/iframeN.html similarity index 100% rename from test/fixtures/html/iframeN.html rename to specs/obsolete-tests/fixtures/html/iframeN.html diff --git a/test/fixtures/html/malformed.html b/specs/obsolete-tests/fixtures/html/malformed.html similarity index 100% rename from test/fixtures/html/malformed.html rename to specs/obsolete-tests/fixtures/html/malformed.html diff --git a/test/fixtures/html/scope.html b/specs/obsolete-tests/fixtures/html/scope.html similarity index 100% rename from test/fixtures/html/scope.html rename to specs/obsolete-tests/fixtures/html/scope.html diff --git a/test/fixtures/html/trivial.html b/specs/obsolete-tests/fixtures/html/trivial.html similarity index 100% rename from test/fixtures/html/trivial.html rename to specs/obsolete-tests/fixtures/html/trivial.html diff --git a/test/fixtures/html/with_js.html b/specs/obsolete-tests/fixtures/html/with_js.html similarity index 100% rename from test/fixtures/html/with_js.html rename to specs/obsolete-tests/fixtures/html/with_js.html diff --git a/test/fixtures/js/external_script.js b/specs/obsolete-tests/fixtures/js/external_script.js similarity index 100% rename from test/fixtures/js/external_script.js rename to specs/obsolete-tests/fixtures/js/external_script.js diff --git a/test/fixtures/js/jquery.js b/specs/obsolete-tests/fixtures/js/jquery.js similarity index 100% rename from test/fixtures/js/jquery.js rename to specs/obsolete-tests/fixtures/js/jquery.js diff --git a/test/fixtures/js/script.js b/specs/obsolete-tests/fixtures/js/script.js similarity index 100% rename from test/fixtures/js/script.js rename to specs/obsolete-tests/fixtures/js/script.js diff --git a/test/fixtures/js/script_error.js b/specs/obsolete-tests/fixtures/js/script_error.js similarity index 100% rename from test/fixtures/js/script_error.js rename to specs/obsolete-tests/fixtures/js/script_error.js diff --git a/test/fixtures/simple.html b/specs/obsolete-tests/fixtures/simple.html similarity index 100% rename from test/fixtures/simple.html rename to specs/obsolete-tests/fixtures/simple.html diff --git a/test/fixtures/simple.xml b/specs/obsolete-tests/fixtures/simple.xml similarity index 100% rename from test/fixtures/simple.xml rename to specs/obsolete-tests/fixtures/simple.xml diff --git a/test/html/events.html b/specs/obsolete-tests/html/events.html similarity index 100% rename from test/html/events.html rename to specs/obsolete-tests/html/events.html diff --git a/test/html/iframe1.html b/specs/obsolete-tests/html/iframe1.html similarity index 100% rename from test/html/iframe1.html rename to specs/obsolete-tests/html/iframe1.html diff --git a/test/html/iframe1a.html b/specs/obsolete-tests/html/iframe1a.html similarity index 100% rename from test/html/iframe1a.html rename to specs/obsolete-tests/html/iframe1a.html diff --git a/test/html/iframe2.html b/specs/obsolete-tests/html/iframe2.html similarity index 100% rename from test/html/iframe2.html rename to specs/obsolete-tests/html/iframe2.html diff --git a/test/html/iframe3.html b/specs/obsolete-tests/html/iframe3.html similarity index 100% rename from test/html/iframe3.html rename to specs/obsolete-tests/html/iframe3.html diff --git a/test/html/iframeN.html b/specs/obsolete-tests/html/iframeN.html similarity index 100% rename from test/html/iframeN.html rename to specs/obsolete-tests/html/iframeN.html diff --git a/test/html/malformed.html b/specs/obsolete-tests/html/malformed.html similarity index 100% rename from test/html/malformed.html rename to specs/obsolete-tests/html/malformed.html diff --git a/test/html/scope.html b/specs/obsolete-tests/html/scope.html similarity index 100% rename from test/html/scope.html rename to specs/obsolete-tests/html/scope.html diff --git a/test/html/script.js b/specs/obsolete-tests/html/script.js similarity index 100% rename from test/html/script.js rename to specs/obsolete-tests/html/script.js diff --git a/test/html/trivial.html b/specs/obsolete-tests/html/trivial.html similarity index 100% rename from test/html/trivial.html rename to specs/obsolete-tests/html/trivial.html diff --git a/test/html/with_js.html b/specs/obsolete-tests/html/with_js.html similarity index 100% rename from test/html/with_js.html rename to specs/obsolete-tests/html/with_js.html diff --git a/test/index.html b/specs/obsolete-tests/index.html similarity index 100% rename from test/index.html rename to specs/obsolete-tests/index.html diff --git a/test/jqUnit.js b/specs/obsolete-tests/jqUnit.js similarity index 100% rename from test/jqUnit.js rename to specs/obsolete-tests/jqUnit.js diff --git a/test/primary-tests.js b/specs/obsolete-tests/primary-tests.js similarity index 100% rename from test/primary-tests.js rename to specs/obsolete-tests/primary-tests.js diff --git a/test/prototype-test.js b/specs/obsolete-tests/prototype-test.js similarity index 100% rename from test/prototype-test.js rename to specs/obsolete-tests/prototype-test.js diff --git a/test/qunit.css b/specs/obsolete-tests/qunit.css similarity index 100% rename from test/qunit.css rename to specs/obsolete-tests/qunit.css diff --git a/test/qunit.js b/specs/obsolete-tests/qunit.js similarity index 100% rename from test/qunit.js rename to specs/obsolete-tests/qunit.js diff --git a/test/qunit/qunit/qunit.css b/specs/obsolete-tests/qunit/qunit/qunit.css similarity index 100% rename from test/qunit/qunit/qunit.css rename to specs/obsolete-tests/qunit/qunit/qunit.css diff --git a/test/qunit/qunit/qunit.js b/specs/obsolete-tests/qunit/qunit/qunit.js similarity index 100% rename from test/qunit/qunit/qunit.js rename to specs/obsolete-tests/qunit/qunit/qunit.js diff --git a/test/results.html b/specs/obsolete-tests/results.html similarity index 100% rename from test/results.html rename to specs/obsolete-tests/results.html diff --git a/test/test.js b/specs/obsolete-tests/test.js similarity index 100% rename from test/test.js rename to specs/obsolete-tests/test.js diff --git a/test/unit/dom.js b/specs/obsolete-tests/unit/dom.js similarity index 100% rename from test/unit/dom.js rename to specs/obsolete-tests/unit/dom.js diff --git a/test/unit/elementmembers.js b/specs/obsolete-tests/unit/elementmembers.js similarity index 100% rename from test/unit/elementmembers.js rename to specs/obsolete-tests/unit/elementmembers.js diff --git a/test/unit/events.js b/specs/obsolete-tests/unit/events.js similarity index 100% rename from test/unit/events.js rename to specs/obsolete-tests/unit/events.js diff --git a/test/unit/fixtures/external_script.js b/specs/obsolete-tests/unit/fixtures/external_script.js similarity index 100% rename from test/unit/fixtures/external_script.js rename to specs/obsolete-tests/unit/fixtures/external_script.js diff --git a/test/unit/iframe.js b/specs/obsolete-tests/unit/iframe.js similarity index 100% rename from test/unit/iframe.js rename to specs/obsolete-tests/unit/iframe.js diff --git a/test/unit/multi-window.js b/specs/obsolete-tests/unit/multi-window.js similarity index 100% rename from test/unit/multi-window.js rename to specs/obsolete-tests/unit/multi-window.js diff --git a/test/unit/nu.validator.js b/specs/obsolete-tests/unit/nu.validator.js similarity index 100% rename from test/unit/nu.validator.js rename to specs/obsolete-tests/unit/nu.validator.js diff --git a/test/unit/onload.js b/specs/obsolete-tests/unit/onload.js similarity index 100% rename from test/unit/onload.js rename to specs/obsolete-tests/unit/onload.js diff --git a/test/unit/parser.js b/specs/obsolete-tests/unit/parser.js similarity index 100% rename from test/unit/parser.js rename to specs/obsolete-tests/unit/parser.js diff --git a/test/unit/prototypecompat.js b/specs/obsolete-tests/unit/prototypecompat.js similarity index 100% rename from test/unit/prototypecompat.js rename to specs/obsolete-tests/unit/prototypecompat.js diff --git a/test/unit/scope.js b/specs/obsolete-tests/unit/scope.js similarity index 100% rename from test/unit/scope.js rename to specs/obsolete-tests/unit/scope.js diff --git a/test/unit/timer.js b/specs/obsolete-tests/unit/timer.js similarity index 100% rename from test/unit/timer.js rename to specs/obsolete-tests/unit/timer.js diff --git a/test/unit/window.js b/specs/obsolete-tests/unit/window.js similarity index 100% rename from test/unit/window.js rename to specs/obsolete-tests/unit/window.js diff --git a/test/vendor/jQuery/.gitignore b/specs/obsolete-tests/vendor/jQuery/.gitignore similarity index 100% rename from test/vendor/jQuery/.gitignore rename to specs/obsolete-tests/vendor/jQuery/.gitignore diff --git a/test/vendor/jQuery/README b/specs/obsolete-tests/vendor/jQuery/README similarity index 100% rename from test/vendor/jQuery/README rename to specs/obsolete-tests/vendor/jQuery/README diff --git a/test/vendor/prototype-1.6.0.3.js b/specs/obsolete-tests/vendor/prototype-1.6.0.3.js similarity index 100% rename from test/vendor/prototype-1.6.0.3.js rename to specs/obsolete-tests/vendor/prototype-1.6.0.3.js diff --git a/test/specs/parser/boot.js b/specs/parser/boot.js similarity index 69% rename from test/specs/parser/boot.js rename to specs/parser/boot.js index 25a35aad..e2259808 100644 --- a/test/specs/parser/boot.js +++ b/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(); \ No newline at end of file diff --git a/test/specs/parser/index.html b/specs/parser/index.html similarity index 95% rename from test/specs/parser/index.html rename to specs/parser/index.html index d672a219..57037ca0 100644 --- a/test/specs/parser/index.html +++ b/specs/parser/index.html @@ -17,7 +17,7 @@

- + Envjs Parser Spec

diff --git a/test/specs/parser/spec.js b/specs/parser/spec.js similarity index 100% rename from test/specs/parser/spec.js rename to specs/parser/spec.js diff --git a/test/specs/platform/rhino.js b/specs/platform/rhino.js similarity index 99% rename from test/specs/platform/rhino.js rename to specs/platform/rhino.js index bf928d34..b442a25d 100644 --- a/test/specs/platform/rhino.js +++ b/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 b/specs/qunit.css similarity index 100% rename from test/specs/qunit.css rename to specs/qunit.css diff --git a/test/specs/qunit.js b/specs/qunit.js similarity index 100% rename from test/specs/qunit.js rename to specs/qunit.js diff --git a/test/specs/timer/boot.js b/specs/timer/boot.js similarity index 60% rename from test/specs/timer/boot.js rename to specs/timer/boot.js index b57ca5ff..5cd8fda1 100644 --- a/test/specs/timer/boot.js +++ b/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(); \ No newline at end of file diff --git a/test/specs/timer/index.html b/specs/timer/index.html similarity index 95% rename from test/specs/timer/index.html rename to specs/timer/index.html index 68c1c561..f0f7bfd1 100644 --- a/test/specs/timer/index.html +++ b/specs/timer/index.html @@ -17,7 +17,7 @@

- + Envjs Timer Spec

diff --git a/test/specs/timer/spec.js b/specs/timer/spec.js similarity index 100% rename from test/specs/timer/spec.js rename to specs/timer/spec.js diff --git a/test/specs/window/boot.js b/specs/window/boot.js similarity index 69% rename from test/specs/window/boot.js rename to specs/window/boot.js index 10cb3d64..77b1566c 100644 --- a/test/specs/window/boot.js +++ b/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(); diff --git a/test/specs/window/index.html b/specs/window/index.html similarity index 96% rename from test/specs/window/index.html rename to specs/window/index.html index 420f3979..14b407dd 100644 --- a/test/specs/window/index.html +++ b/specs/window/index.html @@ -25,7 +25,7 @@

- + Envjs Window Spec

diff --git a/test/specs/window/spec.js b/specs/window/spec.js similarity index 100% rename from test/specs/window/spec.js rename to specs/window/spec.js diff --git a/test/specs/xhr/boot.js b/specs/xhr/boot.js similarity index 73% rename from test/specs/xhr/boot.js rename to specs/xhr/boot.js index 9d684b61..beda685e 100644 --- a/test/specs/xhr/boot.js +++ b/specs/xhr/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'); @@ -17,6 +17,6 @@ load('dist/timer.js'); load('dist/parser.js'); load('dist/xhr.js'); load('local_settings.js'); -load('test/specs/xhr/spec.js'); +load('specs/xhr/spec.js'); start(); Envjs.wait(); \ No newline at end of file diff --git a/test/specs/xhr/index.html b/specs/xhr/index.html similarity index 89% rename from test/specs/xhr/index.html rename to specs/xhr/index.html index 2be7254c..4c172122 100644 --- a/test/specs/xhr/index.html +++ b/specs/xhr/index.html @@ -10,16 +10,16 @@ - -

- + Envjs XMLHttpRequest Spec

diff --git a/test/specs/xhr/spec.js b/specs/xhr/spec.js similarity index 76% rename from test/specs/xhr/spec.js rename to specs/xhr/spec.js index 72fa6124..5e7780f0 100644 --- a/test/specs/xhr/spec.js +++ b/specs/xhr/spec.js @@ -8,9 +8,11 @@ test('XMLHttpRequest Interfaces Available', function(){ }); -// mock the global document object if not available -var expected_path = 'test/specs/xhr/index.html'; +var expected_path_a = 'specs/xhr/index.html'; +var expected_path_b = 'specs/xhr/'; +var url = SETTINGS.AJAX_BASE +'specs/fixtures/simple.txt'; +// mock the global document object if not available try{ document; }catch(e){ @@ -18,7 +20,8 @@ try{ document = new HTMLDocument(new DOMImplementation()); console.log('mocking global document location.'); - location = new Location(Envjs.uri(expected_path, SETTINGS.AJAX_BASE), document); + location = new Location(Envjs.uri(expected_path_a, SETTINGS.AJAX_BASE), + document); document.baseURI = location.href; location.reload(); @@ -27,25 +30,32 @@ try{ test('Location', function(){ - var href = SETTINGS.AJAX_BASE+expected_path; + var href_a = SETTINGS.AJAX_BASE+expected_path_a; + var href_b = SETTINGS.AJAX_BASE+expected_path_b; ok(//this test may run in xhr or env so we allow for both paths - location.toString() === href || - location.toString() === href.replace('xhr','env'), + location.toString() === href_a || + location.toString() === href_b || + location.toString() === href_a.replace('xhr','env'), '.toString()' ); equals(location.hash, '', '.hash'); var port = (SETTINGS.LOCAL_PORT == "") ? "" : (":" + SETTINGS.LOCAL_PORT); equals(location.host, 'localhost'+port, '.host'); equals(location.hostname, 'localhost', '.hostname'); - ok(//this test may run in xhr or env so we allow for both paths - location.href === href || - location.href === href.replace('xhr','env'), + ok( + location.href === href_a || + location.href === href_b || + //this test may run in xhr or env so we allow for both paths + location.href === href.replace('xhr','env'), '.href' ); - ok(//this test may run in xhr or env so we allow for both paths - location.pathname === '/env-js/'+expected_path || - location.pathname === ('/env-js/'+expected_path).replace('xhr','env'), + ok( + location.pathname === '/env-js/'+expected_path_a || + location.pathname === '/env-js/'+expected_path_b || + //this test may run in xhr or env so we allow for both paths + location.pathname === ('/env-js/'+expected_path). + replace('xhr','env'), '.href' ); equals(location.port, SETTINGS.LOCAL_PORT, '.port'); @@ -55,11 +65,8 @@ test('Location', function(){ }); test('XMLHttpRequest sync', function(){ - var xhr, - url; + var xhr; - url = SETTINGS.AJAX_BASE +'test/fixtures/simple.txt'; - xhr = new XMLHttpRequest(); equals(xhr.readyState, 0, '.readyState'); @@ -76,10 +83,8 @@ test('XMLHttpRequest sync', function(){ test('XMLHttpRequest async', function(){ - var xhr, - url; + var xhr; - url = SETTINGS.AJAX_BASE +'test/fixtures/simple.txt'; xhr = new XMLHttpRequest(); equals(xhr.readyState, 0, '.readyState'); equals(xhr.responseText, '', '.responseText');