CHANGED Browser.default.<name> = <value> deprecated, use Browser.<nam…

…e> = <value> instead

CHANGELOG.md

@@ -25,6 +25,8 @@ CHANGED Browser.debug -> browser.debug (per instance)
 
 CHANGED browser.referer -> browser.referrer
 
+CHANGED Browser.default.<name> = <value> deprecated, use Browser.<name> = <value> instead
+
 CHANGED timeout event -> setTimeout, interval -> setInterval
 
 CHANGED removed onalert/onconfirm/onprompt, use browser.on('alert', fn) etc

README.md

@@ -201,7 +201,7 @@ shortcut for making these three changes:
   to 127.0.0.1 (see [DNS Masking](#dnsmasking))
 - `Browser.ports.map(hostname, port)` will redirect any HTTP request to hostname
   from port 80 to the designated port (see [Port Mapping](#portmapping))
-- `Browser.default.site = hostname` will add the hostname to any relative URL
+- `Browser.site = hostname` will add the hostname to any relative URL
   (e.g. when using `browser.visit`)
 
 
@@ -1046,7 +1046,7 @@ example:
 
 ```
 Browser.dns.localhost('*.example.com');
-Browser.default.site = 'http://example.com:3000';
+Browser.site = 'http://example.com:3000';
 
 browser = new Browser();
 browser.visit('/here', function(error, browser) {
@@ -1116,7 +1116,7 @@ To see what your code is doing, you can use `console.log` and friends from both
 client-side scripts and your test code.
 
 If you want to disable console output from scripts, set `browser.silent = true`
-or once for all browser instances with `Browser.default.silent = true`.
+or once for all browser instances with `Browser.silent = true`.
 
 For more details about what Zombie is doing (windows opened, requests made,
 event loop, etc), run with the environment variable `DEBUG=zombie`. Alternatively,

src/index.js

@@ -5,6 +5,7 @@ const Tabs              = require('./tabs');
 const Console           = require('./console');
 const Cookies           = require('./cookies');
 const debug             = require('debug');
+const { deprecate }     = require('util');
 const DNSMask           = require('./dns_mask');
 const DOM               = require('./dom');
 const { EventEmitter }  = require('events');
@@ -181,12 +182,9 @@ class Browser extends EventEmitter {
     });
 
     // Sets the browser options.
-    for (let name of BROWSER_OPTIONS) {
-      if (options && options.hasOwnProperty(name))
-        this[name] = options[name];
-      else if (Browser.default.hasOwnProperty(name))
-        this[name] = Browser.default[name];
-    }
+    options = options || {};
+    for (let name of BROWSER_OPTIONS)
+      this[name] = options.hasOwnProperty(name) ? options[name] : Browser[name];
 
     // Last, run all extensions in order.
     for (let extension of Browser._extensions)
@@ -1276,12 +1274,12 @@ class Browser extends EventEmitter {
   //
   // This is equivalent to DNS masking the hostname as 127.0.0.1 (see
   // Browser.dns), mapping port 80 to the specified port (see Browser.ports) and
-  // setting Browser.default.site to the hostname.
+  // setting Browser.site to the hostname.
   static localhost(hostname, port) {
     this.dns.localhost(hostname);
     this.ports.map(hostname, port);
-    if (!this.default.site)
-      this.default.site = hostname.replace(/^\*\./, '');
+    if (!this.site)
+      this.site = hostname.replace(/^\*\./, '');
   }
 
   // Register a browser extension.
@@ -1302,53 +1300,60 @@ Object.assign(Browser, {
   Resources,
   VERSION,
 
-  // These defaults are used in any new browser instance.
-  default: {
+  // -- These defaults are used in any new browser instance --
 
-    // Which features are enabled.
-    features: DEFAULT_FEATURES,
+  // Which features are enabled.
+  features: DEFAULT_FEATURES,
 
-    // Tells the browser how many redirects to follow before aborting a request. Defaults to 5
-    maxRedirects: 5,
+  // Tells the browser how many redirects to follow before aborting a request. Defaults to 5
+  maxRedirects: 5,
 
-    // Proxy URL.
-    //
-    // Example
-    //   Browser.default.proxy = 'http://myproxy:8080'
-    proxy: null,
+  // Proxy URL.
+  //
+  // Example
+  //   Browser.proxy = 'http://myproxy:8080'
+  proxy: null,
 
-    // If true, supress `console.log` output from scripts (ignored when DEBUG=zombie)
-    silent: false,
+  // If true, supress `console.log` output from scripts (ignored when DEBUG=zombie)
+  silent: false,
 
-    // You can use visit with a path, and it will make a request relative to this host/URL.
-    site: undefined,
+  // You can use visit with a path, and it will make a request relative to this host/URL.
+  site: undefined,
 
-    // Check SSL certificates against CA.  False by default since you're likely
-    // testing with a self-signed certificate.
-    strictSSL: false,
+  // Check SSL certificates against CA.  False by default since you're likely
+  // testing with a self-signed certificate.
+  strictSSL: false,
 
-    // Sets the outgoing IP address in case there is more than on available.
-    // Defaults to 0.0.0.0 which should select default interface
-    localAddress: '0.0.0.0',
+  // Sets the outgoing IP address in case there is more than on available.
+  // Defaults to 0.0.0.0 which should select default interface
+  localAddress: '0.0.0.0',
 
-    // User agent string sent to server.
-    userAgent: `Mozilla/5.0 Chrome/10.0.613.0 Safari/534.15 Zombie.js/${VERSION}`,
+  // User agent string sent to server.
+  userAgent: `Mozilla/5.0 Chrome/10.0.613.0 Safari/534.15 Zombie.js/${VERSION}`,
 
-    // Navigator language code
-    language: 'en-US',
+  // Navigator language code
+  language: 'en-US',
 
-    // Default time to wait (visit, wait, etc).
-    waitDuration: '5s',
+  // Default time to wait (visit, wait, etc).
+  waitDuration: '5s',
 
-    // Indicates whether or not to validate and execute JavaScript, default true.
-    runScripts: true
+  // Indicates whether or not to validate and execute JavaScript, default true.
+  runScripts: true,
+
+  get default() {
+    return Browser._getDefaults(this);
   },
 
+  // -- Internal properties --
+
   // Debug instance.  Create new instance when enabling debugging with Zombie.debug
   _debug: debug('zombie'),
 
   // Browser extensions;
-  _extensions: []
+  _extensions: [],
+
+  _getDefaults: deprecate(browser => browser,
+                          'Browser.default.<name> = <value> deprecated, please use Browser.<name> = <value> instead')
 
 });
 

test/angular_compat_test.js

@@ -1,5 +1,5 @@
-const Browser     = require('../src');
-const { brains }  = require('./helpers');
+const brains  = require('./helpers/brains');
+const Browser = require('../src');
 
 
 describe.skip('angularjs', function() {

test/assert_test.js

@@ -1,6 +1,5 @@
-const assert      = require('assert');
-const Browser     = require('../src');
-const { brains }  = require('./helpers');
+const brains  = require('./helpers/brains');
+const Browser = require('../src');
 
 
 describe('Browser assert', function() {

test/authentication_test.js

@@ -1,6 +1,5 @@
-const assert      = require('assert');
-const Browser     = require('../src');
-const { brains }  = require('./helpers');
+const brains  = require('./helpers/brains');
+const Browser = require('../src');
 
 
 describe('Authentication', function() {

test/browser_events_test.js

@@ -1,6 +1,6 @@
-const assert      = require('assert');
-const Browser     = require('../src');
-const { brains }  = require('./helpers');
+const assert  = require('assert');
+const brains  = require('./helpers/brains');
+const Browser = require('../src');
 
 
 describe('Browser events', function() {
@@ -16,6 +16,10 @@ describe('Browser events', function() {
   });
 
   describe('sending output to console', function() {
+    before(function() {
+      browser.silent = true;
+    });
+
     before(function() {
       browser.on('console', function(level, message) {
         events.console.push({ level: level, message: message });
@@ -33,6 +37,10 @@ describe('Browser events', function() {
       assert.deepEqual(events.console[0].message, 'Logging message');
       assert.deepEqual(events.console[1].message, 'Some [Error: error]');
     });
+
+    after(function() {
+      browser.silent = false;
+    });
   });
 
 

test/browser_object_test.js

@@ -1,7 +1,7 @@
-const assert      = require('assert');
-const Browser     = require('../src');
-const { brains }  = require('./helpers');
-const JSDOM       = require('jsdom');
+const assert  = require('assert');
+const brains  = require('./helpers/brains');
+const Browser = require('../src');
+const JSDOM   = require('jsdom');
 
 
 describe('Browser', function() {
@@ -292,8 +292,8 @@ describe('Browser', function() {
       let originalFeatures;
 
       before(function() {
-        originalFeatures = Browser.default.features;
-        Browser.default.features = 'no-scripts';
+        originalFeatures = Browser.features;
+        Browser.features = 'no-scripts';
         newBrowser = Browser.create();
         return newBrowser.visit('/browser/scripted');
       });
@@ -304,7 +304,7 @@ describe('Browser', function() {
 
       after(function() {
         newBrowser.destroy();
-        Browser.default.features = originalFeatures;
+        Browser.features = originalFeatures;
       });
     });
 

test/cookies_test.js

@@ -1,6 +1,6 @@
-const assert      = require('assert');
-const Browser     = require('../src');
-const { brains }  = require('./helpers');
+const assert  = require('assert');
+const brains  = require('./helpers/brains');
+const Browser = require('../src');
 
 
 // Parse string with cookies in it (like document.cookies) and return object

test/css_test.js

@@ -1,5 +1,5 @@
-const Browser     = require('../src');
-const { brains }  = require('./helpers');
+const brains  = require('./helpers/brains');
+const Browser = require('../src');
 
 
 describe('CSS', function() {

test/document_test.js

@@ -1,6 +1,7 @@
-const assert      = require('assert');
-const Browser     = require('../src');
-const { brains }  = require('./helpers');
+const assert  = require('assert');
+const brains  = require('./helpers/brains');
+const Browser = require('../src');
+
 
 describe('Document', function() {
   const browser = new Browser();

test/event_loop_test.js

@@ -1,6 +1,6 @@
-const assert      = require('assert');
-const Browser     = require('../src');
-const { brains }  = require('./helpers');
+const assert  = require('assert');
+const brains  = require('./helpers/brains');
+const Browser = require('../src');
 
 
 describe('EventLoop', function() {

test/event_source_test.js

@@ -1,6 +1,6 @@
-const assert      = require('assert');
-const Browser     = require('../src');
-const { brains }  = require('./helpers');
+const assert  = require('assert');
+const brains  = require('./helpers/brains');
+const Browser = require('../src');
 
 
 describe('EventSource', function() {

test/forms_test.js

@@ -1,8 +1,8 @@
-const assert      = require('assert');
-const Browser     = require('../src');
-const { brains }  = require('./helpers');
-const File        = require('fs')
-const Crypto      = require('crypto');
+const assert  = require('assert');
+const brains  = require('./helpers/brains');
+const Browser = require('../src');
+const File    = require('fs')
+const Crypto  = require('crypto');
 
 
 describe('Forms', function() {
@@ -1100,7 +1100,6 @@ describe('Forms', function() {
   // File upload
   describe('file upload', function() {
     before(function() {
-    });
       brains.static('/forms/upload', `
         <html>
           <body>
@@ -1130,6 +1129,7 @@ describe('Forms', function() {
         } else
           res.send('<html><body>nothing</body></html>');
       });
+    });
 
 
     describe('text', function() {

test/google_map_test.js

@@ -1,6 +1,6 @@
-const assert      = require('assert');
-const Browser     = require('../src');
-const { brains }  = require('./helpers');
+const assert  = require('assert');
+const brains  = require('./helpers/brains');
+const Browser = require('../src');
 
 
 describe('Google map', function() {

test/helpers/first.js

@@ -1,12 +1,25 @@
-const Bluebird  = require('bluebird');
+// Enable ES6/7 before loading the Browser
 const babel     = require('babel/register');
-
-
 babel({
   experimental: true,
   loose:        'all'
 });
 
+
+const Bluebird  = require('bluebird');
+const Browser   = require('../../src');
+const Replay    = require('replay');
+
+
+// Tests visit example.com, server is localhost port 3003
+Browser.localhost('*.example.com', 3003);
+Browser.default.site = 'example.com';
+
+// Redirect all HTTP requests to localhost
+Replay.fixtures = __dirname + '/../replay';
+Replay.networkAccess = true;
+Replay.localhost('*.example.com');
+
 // Long stack traces when running this test suite
 Bluebird.longStackTraces();