exposed DOM and HTML related classes directly to global scope. update…

…d rhino release
thatcher · May 27, 2009 · 0e7b5d3 · 0e7b5d3
1 parent 87c8d20
commit 0e7b5d3
Show file tree

Hide file tree

Showing 65 changed files with 459 additions and 2,110 deletions.
diff --git a/bin/prototype-1.6.0.3-test.js b/bin/prototype-1.6.0.3-test.js
@@ -1,33 +1,12 @@
 //debugger;
-load("build/runtest/env.js");
+load("env.js");
 
 (function($env){
 
     $env("test/index.html", {
         //let it load the script from the html
         scriptTypes: {
             "text/javascript"   :true
-        },
-        afterload:{
-            'qunit/testrunner.js': function(){
-                //hook into qunit.log
-                var count = 0;
-                QUnit.log = function(result, message){
-                    $env.log('(' + (count++) + ')[' + 
-                        ((!!result) ? 'PASS' : 'FAIL') + '] ' + message);
-                };
-                //hook into qunit.done
-                QUnit.done = function(pass, fail){
-                    $env.warn('Writing Results to File');
-                    jQuery('script').each(function(){
-                        this.type = 'text/envjs';
-                    });
-                    $env.writeToFile(
-                        document.documentElement.xml, 
-                        $env.location('jqenv.html')
-                    );
-                };
-            }
         }
     });
 

diff --git a/bin/test-prototype.sh b/bin/test-prototype.sh
@@ -24,8 +24,9 @@ ant concat
 
 if [ ! -d "$PROTOTYPE_DIR" ]; then
   git clone git://github.com/sstephenson/prototype.git $PROTOTYPE_DIR
+  # - prepares tests - #
   cd $PROTOTYPE_DIR
-  rake test #prepares tests
+  rake test 
   cd -
 fi
 
@@ -34,15 +35,14 @@ cp rhino/js.jar $PROTOTYPE_DIR/test/js.jar
 cp bin/prototype-$VERSION-test.js $PROTOTYPE_DIR/test/test.js
 
 cd $PROTOTYPE_DIR
-git submodule init
-git submodule update
-
-
-#if [ $DEBUG -eq 1 ]; then
-#    echo 'running with rhino debugger'
-#    java -cp js.jar org.mozilla.javascript.tools.debugger.Main test.js;
-#else
-#    echo 'running with rhino'
-#    java -jar js.jar -w -debug test.js;
-#fi
+git submodule init #allow prototype to discover test framework dependencies
+git submodule update #load the dicovered dependencies
+
+if [ $DEBUG -eq 1 ]; then
+    echo 'running with rhino debugger'
+    java -cp js.jar org.mozilla.javascript.tools.debugger.Main test.js;
+else
+    echo 'running with rhino'
+    java -jar js.jar -w -debug test.js;
+fi
 
diff --git a/build.xml b/build.xml
@@ -3,7 +3,7 @@
     <description>Builds, tests, and runs the project Env.</description>
     <property name="BUILD_MAJOR"    value="0" />
     <property name="BUILD_MINOR"    value="9" />
-    <property name="BUILD_ID"       value="5" />
+    <property name="BUILD_ID"       value="6" />
 
     <property name="SRC_DIR"        
             location="src"