Merge pull request #380 from Polymer/fixture-reversion

reverted boolean blocking multiple calls to fixture teardown
Polymer · Sep 2, 2016 · 62201e0 · 62201e0
2 parents 50d177d + 680e5f0
commit 62201e0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 21 deletions.
diff --git a/browser.js b/browser.js
diff --git a/browser.js.map b/browser.js.map
diff --git a/browser/mocha/fixture.js b/browser/mocha/fixture.js
@@ -1,21 +1,16 @@
 import { extendInterfaces } from './extend';
 
-var fixtureTeardownAttached = false;
-
 extendInterfaces('fixture', function(context, teardown) {
 
   // Return context.fixture if it is already a thing, for backwards
   // compatibility with `test-fixture-mocha.js`:
   return context.fixture || function fixture(fixtureId, model) {
 
-    if (!fixtureTeardownAttached) {
-      // Automatically register a teardown callback that will restore the
-      // test-fixture:
-      teardown(function() {
-        fixtureTeardownAttached = true;
-        document.getElementById(fixtureId).restore();
-      });
-    }
+    // Automatically register a teardown callback that will restore the
+    // test-fixture:
+    teardown(function() {
+      document.getElementById(fixtureId).restore();
+    });
 
     // Find the test-fixture with the provided ID and create it, returning
     // the results: