Merge pull request #3 from PolymerElements/dont-mix-mocha-interfaces

Only use interface-approved teardown.

Author: cdata

bower.json

@@ -1,12 +1,12 @@
 {
   "name": "test-fixture",
-  "version": "0.0.1",
+  "version": "0.8.4",
   "description": "A simple element to fixture DOM for tests.",
   "dependencies": {
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.6.0"
   },
   "devDependencies": {
-    "web-component-tester": "~2.2.6",
+    "web-component-tester": "*",
     "polymer": "polymer/polymer#v0.8.0-rc.7"
   }
 }

test-fixture-mocha.js

@@ -11,17 +11,18 @@
 (function (Mocha) {
   function extendInterfaceWithFixture (interfaceName) {
     var originalInterface = Mocha.interfaces[interfaceName];
+    var teardownProperty = interfaceName === 'bdd' ? 'afterEach' : 'teardown';
 
     Mocha.interfaces[interfaceName] = function (suite) {
       originalInterface.apply(this, arguments);
 
       suite.on('pre-require', function (context, file, mocha) {
-        if (!(context.afterEach || context.teardown)) {
+        if (!(context[teardownProperty])) {
           return;
         }
 
         context.fixture = function (fixtureId, model) {
-          (context.afterEach || context.teardown)(function () {
+          context[teardownProperty](function () {
             document
               .getElementById(fixtureId)
               .restore();