Merge pull request #212 from canjs/ie11-compat

fix tests for IE11
canjs · Nov 8, 2018 · e43e84b · e43e84b
2 parents 20ef6af + 8e217ed
commit e43e84b
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 11 deletions.
diff --git a/can-route.js b/can-route.js
@@ -35,7 +35,7 @@ bindingProxy.urlDataObservable.value = hashchangeObservable;
 
 function canRoute(url, defaults){
 	//!steal-remove-start
-	if(process.env.NODE_ENV !== 'production') {
+	if(typeof process !== 'undefined' && process.env.NODE_ENV !== 'production') {
 		devLog.warn('Call route.register(url,defaults) instead of calling route(url, defaults)');
 	}
 	//!steal-remove-end
@@ -158,7 +158,7 @@ canReflect.assignMap(canRoute, {
 	deparam: routeDeparam,
 	map: function(data){
 		//!steal-remove-start
-		if(process.env.NODE_ENV !== 'production') {
+		if(typeof process !== 'undefined' && process.env.NODE_ENV !== 'production') {
 			devLog.warn('Set route.data directly instead of calling route.map');
 		}
 		//!steal-remove-end
@@ -232,7 +232,7 @@ canReflect.assignMap(canRoute, {
 			// For debugging: the names that will be assigned to the updateChild and
 			// updateParent functions within can-bind
 			//!steal-remove-start
-			if (process.env.NODE_ENV !== 'production') {
+			if (typeof process !== 'undefined' && process.env.NODE_ENV !== 'production') {
 				bindingOptions.updateChildName = "can-route.updateRouteData";
 				bindingOptions.updateParentName = "can-route.updateUrl";
 			}

diff --git a/test/define-testing.html b/test/define-testing.html
@@ -7,10 +7,10 @@
 <p>This is a dummy page to use<br/> for testing route goodness</p>
 
 <!-- For the main CanJS test suite -->
-<script type="text/javascript" src="../../../node_modules/steal/steal.js" main="@empty"></script>
+<script type="text/javascript" src="../../../node_modules/steal/steal-with-promises.js" main="@empty"></script>
 
 <!-- For this repo’s test suite -->
-<script type="text/javascript" src="../node_modules/steal/steal.js" main="@empty"></script>
+<script type="text/javascript" src="../node_modules/steal/steal-with-promises.js" main="@empty"></script>
 
 <script>
   steal.done().then(function() {

diff --git a/test/route-define-test.html b/test/route-define-test.html
@@ -1,3 +1,3 @@
 <title>can-route</title>
-<script src="/node_modules/steal/steal.js" main="can-route/test/route-define-test"></script>
+<script src="/node_modules/steal/steal-with-promises.js" main="can-route/test/route-define-test"></script>
 <div id="qunit-fixture"></div>
diff --git a/test/route-define-test.js b/test/route-define-test.js
@@ -27,7 +27,8 @@ if (("onhashchange" in window)) {
 
 if (typeof steal !== 'undefined') {
 
-	QUnit.asyncTest("canRoute.map: conflicting route values, hash should win (canjs/canjs#979)", function(){
+	QUnit.test("canRoute.map: conflicting route values, hash should win (canjs/canjs#979)", function(){
+		QUnit.stop();
 		mockRoute.start();
 
 
@@ -66,7 +67,7 @@ if (typeof steal !== 'undefined') {
 			equal(appState.get("id"), "5", "hash populates the appState");
 			equal(appState.get("section"), "home", "appState keeps its properties");
 			ok(canRoute.data === appState, "canRoute.data is the same as appState");
-
+	
 			mockRoute.stop();
 			QUnit.start();
 		};

diff --git a/test/test-without-proxy.js b/test/test-without-proxy.js
@@ -0,0 +1,9 @@
+require("./param-deparam-test");
+require("./link-to-test");
+require("./url-test");
+require("./route-data-test");
+require("./route-observability-test");
+require("./route-define-test");
+require("./route-map-test");
+require("./route-register-test");
+require("./route-stop-test");
diff --git a/test/test.html b/test/test.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html>
 <title>can-route</title>
-<script src="../node_modules/steal/steal.js" main="can-route/test/test"></script>
+<script src="../node_modules/steal/steal-with-promises.js" main="can-route/test/test"></script>
 <div id="qunit-fixture"></div>
diff --git a/test/testing.html b/test/testing.html
@@ -7,10 +7,10 @@
 <p>This is a dummy page to use<br/> for testing route goodness</p>
 
 <!-- For the main CanJS test suite -->
-<script type="text/javascript" src="../../../node_modules/steal/steal.js" main="@empty"></script>
+<script type="text/javascript" src="../../../node_modules/steal/steal-with-promises.js" main="@empty"></script>
 
 <!-- For this repo’s test suite -->
-<script type="text/javascript" src="../node_modules/steal/steal.js" main="@empty"></script>
+<script type="text/javascript" src="../node_modules/steal/steal-with-promises.js" main="@empty"></script>
 
 <script>
   steal.done().then(function() {