cleaning up the test/private-browsing/helper

mozilla · Feb 28, 2013 · 51c55f3 · 51c55f3
1 parent 8579148
commit 51c55f3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 50 deletions.
diff --git a/test/private-browsing/global.js b/test/private-browsing/global.js
@@ -3,12 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 'use strict';
 
-let { Cc, Ci } = require("chrome");
 const timer = require("sdk/timers");
-const { PBLoader, deactivate } = require("./helper");
+const { LoaderWithHookedConsole, deactivate, pb, pbUtils } = require("./helper");
 const tabs = require("sdk/tabs");
-const pbUtils = require('sdk/private-browsing/utils');
-const pb = require('sdk/private-browsing');
 
 exports["test activate private mode via handler"] = function(test) {
   test.waitUntilDone();
@@ -178,7 +175,7 @@ exports.testAutomaticUnload = function(test) {
   test.waitUntilDone();
 
   // Create another private browsing instance and unload it
-  let { loader, errors } = PBLoader();
+  let { loader, errors } = LoaderWithHookedConsole(module);
   let pb2 = loader.require("sdk/private-browsing");
   let called = false;
   pb2.on("start", function onStart() {
@@ -208,7 +205,7 @@ exports.testUnloadWhileActive = function(test) {
   test.waitUntilDone();
 
   let called = false;
-  let { loader, errors } = PBLoader();
+  let { loader, errors } = LoaderWithHookedConsole(module);
   let pb2 = loader.require("sdk/private-browsing");
   let ul = loader.require("sdk/system/unload");
 

diff --git a/test/private-browsing/helper.js b/test/private-browsing/helper.js
@@ -3,43 +3,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 'use strict';
 
-let { Cc, Ci } = require('chrome');
-const unload = require("sdk/system/unload");
 const { Loader } = require('sdk/test/loader');
-const { windows: windowsIterator } = require("sdk/window/utils");
-const windows = require("windows").browserWindows;
-const { merge } = require("sdk/util/object");
-const pb = require('sdk/private-browsing');
-const pbUtils = require('sdk/private-browsing/utils');
-const { getOwnerWindow } = require('sdk/private-browsing/window/utils');
 
-// need authority..
-require('window/utils');
-require('windows');
-require('sdk/deprecated/window-utils');
-require('sdk/private-browsing/window/utils');
-require('sdk/self');
+const { loader } = LoaderWithHookedConsole(module);
 
-function PBLoader(options) {
-  options = options || {};
-  let jpOptions = require("@loader/options");
-  let packaging = {
-    metadata: {
-      permissions: {}
-    }
-  };
-
-  shallowClone(jpOptions, packaging);
-  shallowClone(options, packaging);
-
-  let jpMetadata = jpOptions.metadata || {};
-  let metadata = options.metadata || {};
-  shallowClone(jpMetadata, packaging.metadata);
-  shallowClone(metadata, packaging.metadata);
-
-  shallowClone(jpMetadata.permissions || {}, packaging.metadata.permissions);
-  shallowClone(metadata.permissions || {}, packaging.metadata.permissions);
+const pb = loader.require('sdk/private-browsing');
+const pbUtils = loader.require('sdk/private-browsing/utils');
 
+function LoaderWithHookedConsole(module) {
   let globals = {};
   let errors = [];
 
@@ -54,21 +25,14 @@ function PBLoader(options) {
     }
   });
 
-  let loader = Loader(module, globals, packaging);
+  let loader = Loader(module, globals);
 
   return {
     loader: loader,
     errors: errors
   }
 }
 
-function shallowClone(source, target) {
-  for (let prop in source) {
-    if (!(prop in target))
-      target[prop] = source[prop];
-  }
-}
-
 function deactivate(callback) {
   if (pbUtils.isGlobalPBSupported) {
     if (callback)
@@ -80,5 +44,4 @@ exports.deactivate = deactivate;
 
 exports.pb = pb;
 exports.pbUtils = pbUtils;
-exports.getOwnerWindow = getOwnerWindow;
-exports.PBLoader = PBLoader;
+exports.LoaderWithHookedConsole = LoaderWithHookedConsole;
diff --git a/test/test-private-browsing.js b/test/test-private-browsing.js
@@ -15,6 +15,7 @@ const { getOwnerWindow } = require('sdk/private-browsing/window/utils');
 const { LoaderWithHookedConsole } = require("sdk/test/loader");
 const { isWindowPrivate, getMode, isGlobalPBSupported,
         isWindowPBSupported, isTabPBSupported } = require('sdk/private-browsing/utils');
+const { pb } = require('./private-browsing/helper');
 
 // is global pb is enabled?
 if (isGlobalPBSupported) {
@@ -65,7 +66,6 @@ exports.testWindowDefaults = function(test) {
 
 // tests for the case where private browsing doesn't exist
 exports.testIsActiveDefault = function(test) {
-  let pb = require('sdk/private-browsing');
   test.assertEqual(pb.isActive, false,
                    'pb.isActive returns false when private browsing isn\'t supported');
 };