Merge pull request #37 from nfl/feature/issue/29

Feature/issue/29: Move mockGPT.js out of distribution

Author: potench

src/Bling.js

@@ -357,8 +357,9 @@ class Bling extends Component {
         Bling._adManager.updateCorrelator();
     }
 
-    static createTestManager() {
-        Bling._adManager = createManager({test: true});
+    static set testManager(testManager) {
+        invariant(testManager, "Pass in createManagerTest to mock GPT");
+        Bling._adManager = testManager;
     }
 
     state = {

src/createManager.js

@@ -1,9 +1,9 @@
 import EventEmitter from "eventemitter3";
 import debounce from "debounce";
+import invariant from "fbjs/lib/invariant";
 import {canUseDOM} from "fbjs/lib/ExecutionEnvironment";
 import Events from "./Events";
 import isInViewport from "./utils/isInViewport";
-import {GPTMock} from "./utils/mockGPT";
 
 // based on https://developers.google.com/doubleclick-gpt/reference?hl=en
 export const pubadsAPI = [
@@ -44,7 +44,7 @@ export class AdManager extends EventEmitter {
         super(config);
 
         if (config.test) {
-            this.testMode = config.test;
+            this.testMode = config;
         }
     }
 
@@ -84,9 +84,17 @@ export class AdManager extends EventEmitter {
         if (process.env.NODE_ENV === "production") {
             return;
         }
-        this._googletag = new GPTMock(config);
+        const {test, GPTMock} = config;
         this._isLoaded = true;
-        this._testMode = !!config;
+        this._testMode = !!test;
+
+        if (test) {
+            invariant(
+                test && GPTMock,
+                "Must provide GPTMock to enable testMode. config{GPTMock}"
+            );
+            this._googletag = new GPTMock(config);
+        }
     }
 
     _processPubadsQueue() {
@@ -443,7 +451,7 @@ export class AdManager extends EventEmitter {
                     reject(new Error("window.googletag is not available"));
                 }
             };
-            if (window.googletag && googletag.apiReady) {
+            if (window.googletag && window.googletag.apiReady) {
                 onLoad();
             } else {
                 const script = document.createElement("script");

src/utils/createManagerTest.js

@@ -0,0 +1,10 @@
+import {createManager} from "../createManager.js";
+import {GPTMock} from "./mockGPT";
+
+export function createManagerTest(config) {
+    return createManager({
+        ...config,
+        test: true,
+        GPTMock
+    });
+}

test/Bling.spec.js

@@ -1,19 +1,20 @@
 /* eslint-disable react/no-multi-comp */
 import React, {Component} from "react";
 import PropTypes from "prop-types";
-import ReactTestUtils from "react-addons-test-utils";
+import ReactTestUtils from "react-dom/test-utils";
 import Bling from "../src/Bling";
 import Events from "../src/Events";
 import {pubadsAPI, APIToCallBeforeServiceEnabled} from "../src/createManager";
 import {gptVersion, pubadsVersion} from "../src/utils/apiList";
+import {createManagerTest} from "../src/utils/createManagerTest";
 
 describe("Bling", () => {
     let googletag;
     const stubs = [];
 
     beforeEach(() => {
         Bling.configure({renderWhenViewable: false});
-        Bling.createTestManager();
+        Bling.testManager = createManagerTest();
         googletag = Bling._adManager.googletag;
     });
 

test/createManager.spec.js

@@ -1,13 +1,14 @@
 import {createManager, AdManager, pubadsAPI, APIToCallBeforeServiceEnabled} from "../src/createManager";
 import Events from "../src/Events";
 import {gptVersion} from "../src/utils/apiList";
+import {createManagerTest} from "../src/utils/createManagerTest";
 
 describe("createManager", () => {
     let googletag;
     let adManager;
 
     beforeEach(() => {
-        adManager = createManager({test: true});
+        adManager = createManagerTest();
         googletag = adManager.googletag;
     });