Fix failing tests introduced by ba6e7ea

test/test-tab.js

@@ -156,19 +156,20 @@ exports["test viewFor(tab)"] = (assert, done) => {
   tabs.open({ url: "about:mozilla" });
 };
 
-exports["test modelFor(xulTab)"] = (assert, done) => {
-  tabs.once("open", tab => {
-    const view = viewFor(tab);
-    assert.ok(view, "view is returned");
-    assert.ok(isTab(view), "view is underlaying tab");
-    assert.equal(getTabId(view), tab.id, "tab has a same id");
-    assert.equal(modelFor(view), tab, "modelFor(view) is SDK tab");
 
-    tab.close();
-    done();
+exports["test modelFor(xulTab)"] = (assert, done) => {
+  tabs.open({
+    url: "about:mozilla",
+    onReady: tab => {
+      const view = viewFor(tab);
+      assert.ok(view, "view is returned");
+      assert.ok(isTab(view), "view is underlaying tab");
+      assert.equal(getTabId(view), tab.id, "tab has a same id");
+      assert.equal(modelFor(view), tab, "modelFor(view) is SDK tab");
+
+      tab.close(defer(done));
+    }
   });
-
-  tabs.open({ url: "about:mozilla" });
 };
 
 require("test").run(exports);

test/test-windows-common.js

@@ -60,6 +60,7 @@ exports.testWindowActivateMethod_simple = function(assert) {
                'Active tab is active after window.activate() call');
 };
 
+
 exports["test getView(window)"] = function(assert, done) {
   browserWindows.once("open", window => {
     const view = viewFor(window);
@@ -69,16 +70,14 @@ exports["test getView(window)"] = function(assert, done) {
     assert.equal(getWindowTitle(view), window.title,
                  "window has a right title");
 
-    window.close();
-    window.destroy();
-    assert.equal(viewFor(window), null, "window view is gone");
-    done();
+    window.close(done);
   });
 
 
   browserWindows.open({ url: "data:text/html;charset=utf-8,<title>yo</title>" });
 };
 
+
 exports["test modelFor(window)"] = function(assert, done) {
   browserWindows.once("open", window => {
     const view = viewFor(window);
@@ -87,10 +86,7 @@ exports["test modelFor(window)"] = function(assert, done) {
     assert.ok(isBrowser(view), "view is a browser window");
     assert.ok(modelFor(view) === window, "modelFor(browserWindow) is SDK window");
 
-    window.close();
-    window.destroy();
-    assert.equal(viewFor(window), null, "window view is gone");
-    done();
+    window.close(done);
   });