test(client): Fixes for ie7

karma-runner · Feb 12, 2016 · 72f845f · 72f845f
1 parent 0f64446
commit 72f845f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/test/client/karma.spec.js b/test/client/karma.spec.js
@@ -339,9 +339,11 @@ describe('Karma', function () {
 
       k.complete()
 
-      clock.tick(20)
-
-      assert.notEqual(iframe.src, CURRENT_URL)
+      // clock.tick() does not work in IE 7
+      setTimeout(function () {
+        clock.tick(1)
+        assert.notEqual(iframe.src, CURRENT_URL)
+      }, 10)
     })
 
     it('should not clear context window upon complete when clearContext config is false', function () {

diff --git a/test/client/stringify.spec.js b/test/client/stringify.spec.js
@@ -54,10 +54,14 @@ describe('stringify', function () {
     assert(stringify(obj).indexOf("{a: 'a'}") > -1)
 
     obj = {constructor: null}
-    assert(stringify(obj).indexOf('{constructor: null}') > -1)
+
+    // IE 7 serializes this to Object{}
+    var s = stringify(obj)
+    assert(s.indexOf('{constructor: null}') > -1 || s.indexOf('Object{}') > -1)
 
     obj = Object.create(null)
     obj.a = 'a'
+
     assert(stringify(obj).indexOf("{a: 'a'}") > -1)
   })