Merge pull request #1784 from zombie/1033838-fix-test-tab

bug 1033838 - fix test-tab.js and eable it in e10s test addon, r=@Mossop
mozilla · Dec 31, 2014 · 6cf2624 · 6cf2624
2 parents c50b5ab + 84120f0
commit 6cf2624
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/test/addons/e10s-tabs/lib/main.js b/test/addons/e10s-tabs/lib/main.js
@@ -10,7 +10,7 @@ const SKIPPING_TESTS = {
   "test skip": (assert) => assert.pass("nothing to test here")
 };
 
-// merge(module.exports, require('./test-tab'));
+merge(module.exports, require('./test-tab'));
 merge(module.exports, require('./test-tab-events'));
 merge(module.exports, require('./test-tab-observer'));
 merge(module.exports, require('./test-tab-utils'));

diff --git a/test/addons/e10s-tabs/lib/test-tab.js b/test/addons/e10s-tabs/lib/test-tab.js
@@ -176,8 +176,8 @@ exports["test tab.readyState"] = (assert, done) => {
   tabs.open({
     url: "data:text/html;charset=utf-8,test_readyState",
     onOpen: (tab) => {
-      assert.equal(tab.readyState, "uninitialized",
-        "tab is 'uninitialized' when opened");
+      assert.notEqual(["unitialized", "loading"].indexOf(tab.readyState), -1,
+        "tab is either uninitialized or loading when onOpen");
     },
     onReady: (tab) => {
       assert.notEqual(["interactive", "complete"].indexOf(tab.readyState), -1,

diff --git a/test/test-tab.js b/test/test-tab.js
@@ -175,8 +175,8 @@ exports["test tab.readyState"] = (assert, done) => {
   tabs.open({
     url: "data:text/html;charset=utf-8,test_readyState",
     onOpen: (tab) => {
-      assert.equal(tab.readyState, "uninitialized",
-        "tab is 'uninitialized' when opened");
+      assert.notEqual(["unitialized", "loading"].indexOf(tab.readyState), -1,
+        "tab is either uninitialized or loading when onOpen");
     },
     onReady: (tab) => {
       assert.notEqual(["interactive", "complete"].indexOf(tab.readyState), -1,