Remove global from window helpers

src/helper/window.js

@@ -1,23 +1,25 @@
 var objectHelper = require('./object');
 
 function redirect(url) {
-  global.window.location = url;
+  getWindow().location = url;
 }
 
 function getDocument() {
-  return global.window.document;
+  return getWindow().document;
 }
 
 function getWindow() {
-  return global.window;
+  return window;
 }
 
 function getOrigin() {
-  var location = global.window.location;
+  var location = getWindow().location;
   var origin = location.origin;
+
   if (!origin) {
     origin = objectHelper.getOriginFromUrl(location.href);
   }
+
   return origin;
 }
 

test/helper/popup-handler.test.js

@@ -2,7 +2,6 @@ var expect = require('expect.js');
 var stub = require('sinon').stub;
 var WinChan = require('winchan');
 
-var qs = require('qs');
 var PopupHandler = require('../../src/helper/popup-handler');
 
 describe('helpers popupHandler', function() {
@@ -155,7 +154,7 @@ describe('helpers popupHandler', function() {
       popup.kill();
     });
 
-    it('should open the window once', function(done) {
+    it('should open the window once and return the same instance', function(done) {
       var counter = 0;
       global.window.open = function(url, name, windowFeatures) {
         counter++;
@@ -172,9 +171,10 @@ describe('helpers popupHandler', function() {
       };
 
       var handler = new PopupHandler();
-
-      var popup = handler.preload({});
       var popup = handler.preload({});
+      var popup2 = handler.preload({});
+
+      expect(popup).to.be(popup2);
 
       popup.kill();
     });

test/helper/window.test.js

@@ -8,6 +8,10 @@ describe('helpers window', function() {
     global.window.document = { body: {} };
   });
 
+  afterEach(function() {
+    delete global.window;
+  });
+
   it('should redirect', function() {
     windowHelper.redirect('http://example.com');
     expect(global.window.location).to.be('http://example.com');
@@ -22,11 +26,13 @@ describe('helpers window', function() {
     var _window = windowHelper.getWindow();
     expect(_window).to.eql({ document: { body: {} }, location: '' });
   });
+
   describe('getOrigin', function() {
     it('should use window.location.origin when available', function() {
       global.window = { location: { origin: 'origin' } };
       expect(windowHelper.getOrigin()).to.be('origin');
     });
+
     it('should build current origin when location.origin is not available', function() {
       global.window = { location: { href: 'http://hostname:30/foobar' } };
       expect(windowHelper.getOrigin()).to.be('http://hostname:30');

test/setup.js

@@ -1,11 +1,3 @@
 before(function() {
-  function atob(str) {
-    return new Buffer(str, 'base64').toString('binary');
-  }
-  function btoa(str) {
-    return Buffer.from(str, 'binary').toString('base64');
-  }
-  var windowOrGlobal = typeof window !== 'undefined' ? window : global;
-  windowOrGlobal.atob = atob;
-  windowOrGlobal.btoa = btoa;
+  // provide your initial setup here
 });

webpack.config.js

@@ -1,5 +1,4 @@
 var fs = require('fs');
-var webpack = require('webpack');
 var CustomVarLibraryNamePlugin = require('webpack-custom-var-library-name-plugin');
 
 var path = require('path');
@@ -57,6 +56,9 @@ module.exports = {
   stylus: {
     preferPathResolver: 'webpack'
   },
+  node: {
+    global: false
+  },
   plugins: [
     new CustomVarLibraryNamePlugin({
       name: nameOverrides

webpack.prod.config.js

@@ -57,6 +57,9 @@ module.exports = {
     modules: true,
     reasons: true
   },
+  node: {
+    global: false
+  },
   plugins: [
     new CustomVarLibraryNamePlugin({
       name: nameOverrides