From 30b7f079b3f2149151ef37614efe67211f4538d2 Mon Sep 17 00:00:00 2001
From: Brendan Baldwin <brendan@usergenic.com>
Date: Mon, 10 Sep 2018 16:25:11 -0700
Subject: [PATCH] Revert "Retry browser navigation in WCT if the browser
 doesn't connect. (#680)"

This reverts commit 44f48fb59b3cdd2b8fd74eef0c1368d82bd852db.
---
 .../runner/browserrunner.ts                   | 69 +++----------------
 .../integration/compilation/golden.json       | 10 ++-
 .../integration/components_dir/golden.json    | 12 ++--
 .../fail-until-third-load.js                  | 31 ---------
 .../connects-on-third-load/golden.json        | 13 ----
 .../connects-on-third-load/test/index.html    | 12 ----
 .../connects-on-third-load/wct.conf.json      | 16 -----
 .../custom-components_dir/golden.json         | 12 ++--
 .../golden.json                               | 30 ++++----
 .../define-webserver-hook/golden.json         | 10 ++-
 .../fixtures/integration/failing/golden.json  | 10 ++-
 .../fixtures/integration/missing/golden.json  | 12 ++--
 .../integration/mixed-suites/golden.json      | 10 ++-
 .../multiple-component_dirs/golden.json       | 30 ++++----
 .../integration/multiple-replace/golden.json  | 12 ++--
 .../fixtures/integration/nested/golden.json   | 10 ++-
 .../integration/never-loads/block-loading.js  | 29 --------
 .../integration/never-loads/golden.json       |  5 --
 .../integration/never-loads/test/index.html   | 12 ----
 .../integration/never-loads/wct.conf.json     | 16 -----
 .../fixtures/integration/no-tests/golden.json | 12 ++--
 .../integration/query-string/golden.json      | 12 ++--
 .../test/integration/browser.ts               | 46 +++++++------
 23 files changed, 107 insertions(+), 324 deletions(-)
 delete mode 100644 packages/web-component-tester/test/fixtures/integration/connects-on-third-load/fail-until-third-load.js
 delete mode 100644 packages/web-component-tester/test/fixtures/integration/connects-on-third-load/golden.json
 delete mode 100644 packages/web-component-tester/test/fixtures/integration/connects-on-third-load/test/index.html
 delete mode 100644 packages/web-component-tester/test/fixtures/integration/connects-on-third-load/wct.conf.json
 delete mode 100644 packages/web-component-tester/test/fixtures/integration/never-loads/block-loading.js
 delete mode 100644 packages/web-component-tester/test/fixtures/integration/never-loads/golden.json
 delete mode 100644 packages/web-component-tester/test/fixtures/integration/never-loads/test/index.html
 delete mode 100644 packages/web-component-tester/test/fixtures/integration/never-loads/wct.conf.json

diff --git a/packages/web-component-tester/runner/browserrunner.ts b/packages/web-component-tester/runner/browserrunner.ts
index 89a4930ff..73044fe48 100644
--- a/packages/web-component-tester/runner/browserrunner.ts
+++ b/packages/web-component-tester/runner/browserrunner.ts
@@ -33,17 +33,6 @@ export interface BrowserDef extends wd.Capabilities {
   variant?: string;
 }
 
-/**
- * Returns a promise that resolves after a given duration to an optional
- * result.
- *
- * @param duration The time, in milliseconds, after which the promise should
- *     resolve.
- * @param result The result to resolve the promise to.
- */
-const timeout = (duration: number, result?: any) =>
-    new Promise(resolve => setTimeout(() => resolve(result), duration));
-
 // Browser abstraction, responsible for spinning up a browser instance via wd.js
 // and executing runner.html test files passed in options.files
 export class BrowserRunner {
@@ -65,11 +54,6 @@ export class BrowserRunner {
   private _resolve: () => void;
   private _reject: (err: any) => void;
 
-  private _navigationAttemptCount: number;
-  private _navigationAttemptTimeout: number;
-  private _navigationSucceeded: Promise<void>;
-  private _resolveNavigationSucceeded: Function;
-
   /**
    * @param emitter The emitter to send updates about test progress to.
    * @param def A BrowserDef describing and defining the browser to be run.
@@ -92,13 +76,6 @@ export class BrowserRunner {
     this.emitter = emitter;
     this.url = url;
 
-    this._navigationAttemptCount = 3;
-    this._navigationAttemptTimeout = Math.min(this.timeout / 2, 10000);
-    this._navigationSucceeded = new Promise((resolve) => {
-      this._resolveNavigationSucceeded = resolve;
-    });
-
-
     this.stats = {status: 'initializing'};
 
     this.donePromise = new Promise<void>((resolve, reject) => {
@@ -196,53 +173,23 @@ export class BrowserRunner {
     } else {
       this.sessionId = sessionId;
       this.startTest();
+      this.extendTimeout();
     }
   }
 
-  async startTest() {
+  startTest() {
     const paramDelim = (this.url.indexOf('?') === -1 ? '?' : '&');
     const extra = `${paramDelim}cli_browser_id=${this.def.id}`;
-    await this._attemptNavigation(
-        this.url + extra,
-        this._navigationAttemptCount,
-        this._navigationAttemptTimeout);
-    this.extendTimeout();
-  }
-
-  /**
-   * Asks the connected browser to navigate to the given URL, retrying until
-   * `this.onEvent` receives any event from the browser.
-   *
-   * @param url The URL to navigate to.
-   * @param attemptCount The number of attempts to make.
-   * @param timeoutDuration The time to wait before considering an attempt as
-   *     having failed, in milliseconds.
-   */
-  private async _attemptNavigation(
-      url: string, attemptCount: number, timeoutDuration: number) {
-    for (let remaining = attemptCount; remaining > 0; remaining--) {
-      this.browser.get(url, (error) => {
-        if (error) {
-          this.done(error.data || error);
-        } else {
-          this.extendTimeout();
-        }
-      });
-
-      const timeoutToken = Symbol('timeoutToken');
-      const raceResult = await Promise.race(
-          [this._navigationSucceeded, timeout(timeoutDuration, timeoutToken)]);
-      if (raceResult !== timeoutToken) {
-        return;
+    this.browser.get(this.url + extra, (error) => {
+      if (error) {
+        this.done(error.data || error);
+      } else {
+        this.extendTimeout();
       }
-    }
-
-    this.done(new Error(`The browser failed to navigate to "${url}".`));
+    });
   }
 
   onEvent(event: string, data: any) {
-    this._resolveNavigationSucceeded();
-
     this.extendTimeout();
     if (event === 'browser-start') {
       // Always assign, to handle re-runs (no browser-init).
diff --git a/packages/web-component-tester/test/fixtures/integration/compilation/golden.json b/packages/web-component-tester/test/fixtures/integration/compilation/golden.json
index 96d22bcaa..7d3a4f8ed 100644
--- a/packages/web-component-tester/test/fixtures/integration/compilation/golden.json
+++ b/packages/web-component-tester/test/fixtures/integration/compilation/golden.json
@@ -1,10 +1,8 @@
 {
-  "stats": {
-    "passing": 1,
-    "pending": 0,
-    "failing": 0,
-    "status": "complete"
-  },
+  "passing": 1,
+  "pending": 0,
+  "failing": 0,
+  "status": "complete",
   "tests": {
     "test/": {
       "ES6 works": {
diff --git a/packages/web-component-tester/test/fixtures/integration/components_dir/golden.json b/packages/web-component-tester/test/fixtures/integration/components_dir/golden.json
index 0dab2216b..a617ba022 100644
--- a/packages/web-component-tester/test/fixtures/integration/components_dir/golden.json
+++ b/packages/web-component-tester/test/fixtures/integration/components_dir/golden.json
@@ -1,13 +1,11 @@
 {
-  "stats": {
-    "passing": 1,
-    "pending": 0,
-    "failing": 0,
-    "status": "complete"
-  },
+  "passing": 1,
+  "pending": 0,
+  "failing": 0,
+  "status": "complete",
   "tests": {
     "test/": {
       "inline passing test": {"state": "passing"}
     }
   }
-}
+}
\ No newline at end of file
diff --git a/packages/web-component-tester/test/fixtures/integration/connects-on-third-load/fail-until-third-load.js b/packages/web-component-tester/test/fixtures/integration/connects-on-third-load/fail-until-third-load.js
deleted file mode 100644
index 288a1e296..000000000
--- a/packages/web-component-tester/test/fixtures/integration/connects-on-third-load/fail-until-third-load.js
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  // This script should only run in the context of the test runner's top level
-  // page, which is the page that WCT will attempt to reload if it doesn't
-  // contact WCT's server.
-  if (location.pathname === '/components/connects-on-third-load/generated-index.html') {
-    // Use `localStorage` to track how many times this page has been loaded.
-    const key = 'loadCount';
-    // Note that (1) if a key is not set in `localStorage`, then `getItem`
-    // returns null and (2) that `Number(null) === 0`.
-    const previousLoadCount = Number(localStorage.getItem(key));
-    if (previousLoadCount < 2) {
-      localStorage.setItem(key, previousLoadCount + 1);
-      // Open a comment to prevent all other scripts from loading, including
-      // the one which connects to WCT.
-      document.write('<!--');
-
-      document.addEventListener('readystatechange', function listener() {
-        if (document.readyState === 'loading') return;
-        document.removeEventListener('readystatechange', listener);
-        const message =
-            'All other content on this page was disabled to simulate failing ' +
-            `to load. This is load attempt #${previousLoadCount + 1}. This ` +
-            'page should load successfully on attempt #3. WCT should ' +
-            'automatically reload the page in a few seconds.';
-        document.body.appendChild(new Text(message));
-      });
-    } else {
-      localStorage.removeItem(key);
-    }
-  }
-}
diff --git a/packages/web-component-tester/test/fixtures/integration/connects-on-third-load/golden.json b/packages/web-component-tester/test/fixtures/integration/connects-on-third-load/golden.json
deleted file mode 100644
index 612e35573..000000000
--- a/packages/web-component-tester/test/fixtures/integration/connects-on-third-load/golden.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "stats": {
-    "passing": 1,
-    "pending": 0,
-    "failing": 0,
-    "status": "complete"
-  },
-  "tests": {
-    "test/": {
-      "This test does nothing!": {"state": "passing"}
-    }
-  }
-}
diff --git a/packages/web-component-tester/test/fixtures/integration/connects-on-third-load/test/index.html b/packages/web-component-tester/test/fixtures/integration/connects-on-third-load/test/index.html
deleted file mode 100644
index 8f45f7b25..000000000
--- a/packages/web-component-tester/test/fixtures/integration/connects-on-third-load/test/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <script src="/components/web-component-tester/browser.js"></script>
-</head>
-<body>
-  <script>
-    test('This test does nothing!', () => {});
-  </script>
-</body>
-</html>
diff --git a/packages/web-component-tester/test/fixtures/integration/connects-on-third-load/wct.conf.json b/packages/web-component-tester/test/fixtures/integration/connects-on-third-load/wct.conf.json
deleted file mode 100644
index 79810fd11..000000000
--- a/packages/web-component-tester/test/fixtures/integration/connects-on-third-load/wct.conf.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "clientOptions": {
-    "environmentScripts": [
-      "connects-on-third-load/fail-until-third-load.js",
-      "stacky/browser.js",
-      "async/lib/async.js",
-      "lodash/index.js",
-      "mocha/mocha.js",
-      "chai/chai.js",
-      "@polymer/sinonjs/sinon.js",
-      "sinon-chai/lib/sinon-chai.js",
-      "accessibility-developer-tools/dist/js/axs_testing.js",
-      "@polymer/test-fixture/test-fixture.js"
-    ]
-  }
-}
diff --git a/packages/web-component-tester/test/fixtures/integration/custom-components_dir/golden.json b/packages/web-component-tester/test/fixtures/integration/custom-components_dir/golden.json
index 0dab2216b..a617ba022 100644
--- a/packages/web-component-tester/test/fixtures/integration/custom-components_dir/golden.json
+++ b/packages/web-component-tester/test/fixtures/integration/custom-components_dir/golden.json
@@ -1,13 +1,11 @@
 {
-  "stats": {
-    "passing": 1,
-    "pending": 0,
-    "failing": 0,
-    "status": "complete"
-  },
+  "passing": 1,
+  "pending": 0,
+  "failing": 0,
+  "status": "complete",
   "tests": {
     "test/": {
       "inline passing test": {"state": "passing"}
     }
   }
-}
+}
\ No newline at end of file
diff --git a/packages/web-component-tester/test/fixtures/integration/custom-multiple-component_dirs/golden.json b/packages/web-component-tester/test/fixtures/integration/custom-multiple-component_dirs/golden.json
index ee1a6a0aa..fa22b29af 100644
--- a/packages/web-component-tester/test/fixtures/integration/custom-multiple-component_dirs/golden.json
+++ b/packages/web-component-tester/test/fixtures/integration/custom-multiple-component_dirs/golden.json
@@ -1,12 +1,10 @@
 {
   "variants": {
     "": {
-      "stats": {
-        "passing": 1,
-        "pending": 0,
-        "failing": 0,
-        "status": "complete"
-      },
+      "passing": 1,
+      "pending": 0,
+      "failing": 0,
+      "status": "complete",
       "tests": {
         "test/": {
           "only works with mainline components": {"state": "passing"}
@@ -14,12 +12,10 @@
       }
     },
     "foo": {
-      "stats": {
-        "passing": 0,
-        "pending": 0,
-        "failing": 1,
-        "status": "complete"
-      },
+      "passing": 0,
+      "pending": 0,
+      "failing": 1,
+      "status": "complete",
       "tests": {
         "test/": {
           "only works with mainline components": {"state": "failing"}
@@ -35,12 +31,10 @@
       }
     },
     "bar": {
-      "stats": {
-        "passing": 0,
-        "pending": 0,
-        "failing": 1,
-        "status": "complete"
-      },
+      "passing": 0,
+      "pending": 0,
+      "failing": 1,
+      "status": "complete",
       "tests": {
         "test/": {
           "only works with mainline components": {"state": "failing"}
diff --git a/packages/web-component-tester/test/fixtures/integration/define-webserver-hook/golden.json b/packages/web-component-tester/test/fixtures/integration/define-webserver-hook/golden.json
index 68eb4b1eb..c66e154d5 100644
--- a/packages/web-component-tester/test/fixtures/integration/define-webserver-hook/golden.json
+++ b/packages/web-component-tester/test/fixtures/integration/define-webserver-hook/golden.json
@@ -1,10 +1,8 @@
 {
-  "stats": {
-    "passing": 2,
-    "pending": 0,
-    "failing": 0,
-    "status": "complete"
-  },
+  "passing": 2,
+  "pending": 0,
+  "failing": 0,
+  "status": "complete",
   "tests": {
     "test/tests.html": {
       "suite": {
diff --git a/packages/web-component-tester/test/fixtures/integration/failing/golden.json b/packages/web-component-tester/test/fixtures/integration/failing/golden.json
index 968a36fb1..c4ffec8d4 100644
--- a/packages/web-component-tester/test/fixtures/integration/failing/golden.json
+++ b/packages/web-component-tester/test/fixtures/integration/failing/golden.json
@@ -1,10 +1,8 @@
 {
-  "stats": {
-    "passing": 3,
-    "pending": 0,
-    "failing": 3,
-    "status": "complete"
-  },
+  "passing": 3,
+  "pending": 0,
+  "failing": 3,
+  "status": "complete",
   "tests": {
     "test/": {
       "failing test": {
diff --git a/packages/web-component-tester/test/fixtures/integration/missing/golden.json b/packages/web-component-tester/test/fixtures/integration/missing/golden.json
index f0417c869..0abe01bb1 100644
--- a/packages/web-component-tester/test/fixtures/integration/missing/golden.json
+++ b/packages/web-component-tester/test/fixtures/integration/missing/golden.json
@@ -1,8 +1,6 @@
 {
-  "stats": {
-    "passing": 0,
-    "pending": 0,
-    "failing": 0,
-    "status": "error"
-  }
-}
+  "passing": 0,
+  "pending": 0,
+  "failing": 0,
+  "status": "error"
+}
\ No newline at end of file
diff --git a/packages/web-component-tester/test/fixtures/integration/mixed-suites/golden.json b/packages/web-component-tester/test/fixtures/integration/mixed-suites/golden.json
index c65cf261a..70fa844b1 100644
--- a/packages/web-component-tester/test/fixtures/integration/mixed-suites/golden.json
+++ b/packages/web-component-tester/test/fixtures/integration/mixed-suites/golden.json
@@ -1,10 +1,8 @@
 {
-  "stats": {
-    "passing": 10,
-    "pending": 0,
-    "failing": 0,
-    "status": "complete"
-  },
+  "passing": 10,
+  "pending": 0,
+  "failing": 0,
+  "status": "complete",
   "tests": {
     "test/": {
       "inline suite": {
diff --git a/packages/web-component-tester/test/fixtures/integration/multiple-component_dirs/golden.json b/packages/web-component-tester/test/fixtures/integration/multiple-component_dirs/golden.json
index 7e8570e7a..b89b2c9ed 100644
--- a/packages/web-component-tester/test/fixtures/integration/multiple-component_dirs/golden.json
+++ b/packages/web-component-tester/test/fixtures/integration/multiple-component_dirs/golden.json
@@ -1,12 +1,10 @@
 {
   "variants": {
     "": {
-      "stats": {
-        "passing": 1,
-        "pending": 0,
-        "failing": 0,
-        "status": "complete"
-      },
+      "passing": 1,
+      "pending": 0,
+      "failing": 0,
+      "status": "complete",
       "tests": {
         "test/": {
           "only works with mainline components": {
@@ -16,12 +14,10 @@
       }
     },
     "foo": {
-      "stats": {
-        "passing": 0,
-        "pending": 0,
-        "failing": 1,
-        "status": "complete"
-      },
+      "passing": 0,
+      "pending": 0,
+      "failing": 1,
+      "status": "complete",
       "tests": {
         "test/": {
           "only works with mainline components": {
@@ -39,12 +35,10 @@
       }
     },
     "bar": {
-      "stats": {
-        "passing": 0,
-        "pending": 0,
-        "failing": 1,
-        "status": "complete"
-      },
+      "passing": 0,
+      "pending": 0,
+      "failing": 1,
+      "status": "complete",
       "tests": {
         "test/": {
           "only works with mainline components": {
diff --git a/packages/web-component-tester/test/fixtures/integration/multiple-replace/golden.json b/packages/web-component-tester/test/fixtures/integration/multiple-replace/golden.json
index 9812192cd..9bae60b79 100644
--- a/packages/web-component-tester/test/fixtures/integration/multiple-replace/golden.json
+++ b/packages/web-component-tester/test/fixtures/integration/multiple-replace/golden.json
@@ -1,10 +1,8 @@
 {
-  "stats": {
-    "passing": 10,
-    "pending": 0,
-    "failing": 0,
-    "status": "complete"
-  },
+  "passing": 10,
+  "pending": 0,
+  "failing": 0,
+  "status": "complete",
   "tests": {
     "test/tests.html": {
       "testing projected element replacement": {
@@ -24,4 +22,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/packages/web-component-tester/test/fixtures/integration/nested/golden.json b/packages/web-component-tester/test/fixtures/integration/nested/golden.json
index 6fbf3585b..651ec3779 100644
--- a/packages/web-component-tester/test/fixtures/integration/nested/golden.json
+++ b/packages/web-component-tester/test/fixtures/integration/nested/golden.json
@@ -1,10 +1,8 @@
 {
-  "stats": {
-    "passing": 4,
-    "pending": 0,
-    "failing": 0,
-    "status": "complete"
-  },
+  "passing": 4,
+  "pending": 0,
+  "failing": 0,
+  "status": "complete",
   "tests": {
     "test/": {"js test": {"state": "passing"}},
     "test/one/tests.html": {"test": {"state": "passing"}},
diff --git a/packages/web-component-tester/test/fixtures/integration/never-loads/block-loading.js b/packages/web-component-tester/test/fixtures/integration/never-loads/block-loading.js
deleted file mode 100644
index b58a83a1f..000000000
--- a/packages/web-component-tester/test/fixtures/integration/never-loads/block-loading.js
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  // This script should only run in the context of the test runner's top level
-  // page, which is the page that WCT will attempt to reload if it doesn't
-  // contact WCT's server.
-  if (location.pathname === '/components/never-loads/generated-index.html') {
-    // Use `localStorage` to track how many times this page has been loaded.
-    const key = 'loadCount';
-    // Note that (1) if a key is not set in `localStorage`, then `getItem`
-    // returns null and (2) that `Number(null) === 0`.
-    const previousLoadCount = Number(localStorage.getItem(key));
-    localStorage.setItem(key, previousLoadCount + 1);
-    // Open a comment to prevent all other scripts from loading, including
-    // the one which connects to WCT.
-    document.write('<!--');
-
-    document.addEventListener('readystatechange', function listener() {
-      if (document.readyState === 'loading') return;
-      document.removeEventListener('readystatechange', listener);
-      const message =
-          'All other content on this page was disabled to simulate failing ' +
-          `to load. This is load attempt #${previousLoadCount + 1}. This ` +
-          'page should never load successfully. ' +
-          (previousLoadCount >= 2 ?
-            'WCT should abort the test in a few seconds.' :
-            'WCT should automatically reload the page in a few seconds.');
-      document.body.appendChild(new Text(message));
-    });
-  }
-}
diff --git a/packages/web-component-tester/test/fixtures/integration/never-loads/golden.json b/packages/web-component-tester/test/fixtures/integration/never-loads/golden.json
deleted file mode 100644
index 767ca5581..000000000
--- a/packages/web-component-tester/test/fixtures/integration/never-loads/golden.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "stats": {
-    "status": "error"
-  }
-}
diff --git a/packages/web-component-tester/test/fixtures/integration/never-loads/test/index.html b/packages/web-component-tester/test/fixtures/integration/never-loads/test/index.html
deleted file mode 100644
index 8f45f7b25..000000000
--- a/packages/web-component-tester/test/fixtures/integration/never-loads/test/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <script src="/components/web-component-tester/browser.js"></script>
-</head>
-<body>
-  <script>
-    test('This test does nothing!', () => {});
-  </script>
-</body>
-</html>
diff --git a/packages/web-component-tester/test/fixtures/integration/never-loads/wct.conf.json b/packages/web-component-tester/test/fixtures/integration/never-loads/wct.conf.json
deleted file mode 100644
index 6161b20f0..000000000
--- a/packages/web-component-tester/test/fixtures/integration/never-loads/wct.conf.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "clientOptions": {
-    "environmentScripts": [
-      "never-loads/block-loading.js",
-      "stacky/browser.js",
-      "async/lib/async.js",
-      "lodash/index.js",
-      "mocha/mocha.js",
-      "chai/chai.js",
-      "@polymer/sinonjs/sinon.js",
-      "sinon-chai/lib/sinon-chai.js",
-      "accessibility-developer-tools/dist/js/axs_testing.js",
-      "@polymer/test-fixture/test-fixture.js"
-    ]
-  }
-}
diff --git a/packages/web-component-tester/test/fixtures/integration/no-tests/golden.json b/packages/web-component-tester/test/fixtures/integration/no-tests/golden.json
index 5a14bbc7a..70a4d5ed3 100644
--- a/packages/web-component-tester/test/fixtures/integration/no-tests/golden.json
+++ b/packages/web-component-tester/test/fixtures/integration/no-tests/golden.json
@@ -1,8 +1,6 @@
 {
-  "stats": {
-    "passing": 0,
-    "pending": 0,
-    "failing": 0,
-    "status": "complete"
-  }
-}
+  "passing": 0,
+  "pending": 0,
+  "failing": 0,
+  "status": "complete"
+}
\ No newline at end of file
diff --git a/packages/web-component-tester/test/fixtures/integration/query-string/golden.json b/packages/web-component-tester/test/fixtures/integration/query-string/golden.json
index 8c6c1b48a..4d54e9212 100644
--- a/packages/web-component-tester/test/fixtures/integration/query-string/golden.json
+++ b/packages/web-component-tester/test/fixtures/integration/query-string/golden.json
@@ -1,10 +1,8 @@
 {
-  "stats": {
-    "passing": 3,
-    "pending": 0,
-    "failing": 0,
-    "status": "complete"
-  },
+  "passing": 3,
+  "pending": 0,
+  "failing": 0,
+  "status": "complete",
   "tests": {
     "test/tests.html": {
       "preserves query strings": {
@@ -20,4 +18,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/packages/web-component-tester/test/integration/browser.ts b/packages/web-component-tester/test/integration/browser.ts
index 97bf6c682..2f83f6aa4 100644
--- a/packages/web-component-tester/test/integration/browser.ts
+++ b/packages/web-component-tester/test/integration/browser.ts
@@ -77,15 +77,12 @@ interface VariantsGolden {
   variants: {[variantName: string]: VariantResultGolden};
 }
 
-interface VariantResultGoldenStats {
-  passing?: number;
-  pending?: number;
-  failing?: number;
-  status: string;
-}
 
 interface VariantResultGolden {
-  stats: VariantResultGoldenStats;
+  passing: number;
+  pending: number;
+  failing: number;
+  status: string;
   tests: TestNode;
   errors: TestErrorExpectation;
 }
@@ -356,7 +353,13 @@ function assertFailed(context: VariantResults, expectedError: string) {
 }
 
 /** Asserts that all browsers match the given stats. */
-function assertStats(context: VariantResults, expected: Stats) {
+function assertStats(
+    context: VariantResults,
+    passing: number,
+    pending: number,
+    failing: number,
+    status: 'complete') {
+  const expected: Stats = {passing, pending, failing, status};
   expect(context.stats).to.deep.equal(repeatBrowsers(context, expected));
 }
 
@@ -414,24 +417,25 @@ function assertVariantResultsConformToGolden(
   // const variantResults = testResults.getVariantResults('');
   it('records the correct result stats', function() {
     try {
-      assertStats(variantResults, golden.stats);
+      assertStats(
+          variantResults,
+          golden.passing,
+          golden.pending,
+          golden.failing,
+          <any>golden.status);
     } catch (_) {
       // mocha reports twice the failures because reasons
       // https://github.com/mochajs/mocha/issues/2083
-      const modifiedStats = Object.assign({}, golden.stats);
-      if (typeof modifiedStats.failing === 'number') {
-        modifiedStats.failing *= 2;
-      }
-      assertStats(variantResults, modifiedStats);
+      assertStats(
+          variantResults,
+          golden.passing,
+          golden.pending,
+          golden.failing * 2,
+          <any>golden.status);
     }
   });
 
-  const goldenStats = golden.stats;
-  const goldenStatsTestSum =
-      (goldenStats.passing !== undefined ? goldenStats.passing : 0) +
-      (goldenStats.pending !== undefined ? goldenStats.pending : 0) +
-      (goldenStats.failing !== undefined ? goldenStats.failing : 0);
-  if (goldenStatsTestSum === 0 && !golden.tests) {
+  if (golden.passing + golden.pending + golden.failing === 0 && !golden.tests) {
     return;
   }
 
@@ -439,7 +443,7 @@ function assertVariantResultsConformToGolden(
     assertTests(variantResults, golden.tests);
   });
 
-  if (golden.errors || (goldenStats.failing && goldenStats.failing > 0)) {
+  if (golden.errors || golden.failing > 0) {
     it('emits well formed errors', function() {
       assertTestErrors(variantResults, golden.errors);
     });