Don't override run_in_init

vesse · May 11, 2012 · 37c5d25 · 37c5d25
1 parent 1c8e595
commit 37c5d25
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/test/browser/helpers/api.js b/test/browser/helpers/api.js
@@ -24,10 +24,15 @@ function createTest(name, config, use, test) {
     use = undefined;
   }
 
-  if (HTML5TEST && use === undefined) {
+  if (HTML5TEST) {
-    use = {};
+    if (use === undefined) {
+      use = {};
+    }
+
+    if (use.run_handler_in_init === undefined) {
+      use.run_handler_in_init = false;
+    }
     use.html5history        = true;
-    use.run_handler_in_init = false;
   }
 
   // Because of the use of setTimeout when defining onpopstate

diff --git a/test/browser/routes-harness.html b/test/browser/routes-harness.html
@@ -20,7 +20,7 @@ <h2 id="qunit-userAgent"></h2>
 </script>
 <script type="text/javascript" src="helpers/jquery.js"></script>
 <script type="text/javascript" src="helpers/qunit.js"></script>
-<script type="text/javascript" src="../../build/director-1.0.9-1.js"></script>
+<script type="text/javascript" src="../../build/director-1.0.10.js"></script>
 <script type="text/javascript" src="helpers/api.js"></script>
 <script type="text/javascript" src="routes-test.js"></script>
 </body>