From 8d14814118cd7b4dd8043b27ebd3a7e209903893 Mon Sep 17 00:00:00 2001 From: Christopher Hiller Date: Sun, 18 Sep 2016 22:25:13 -0700 Subject: [PATCH] rename more fixtures; closes #2383 --- karma.conf.js | 8 +++++--- test/browser-fixtures/{bdd.js => bdd.fixture.js} | 0 test/browser-fixtures/{exports.js => exports.fixture.js} | 0 test/browser-fixtures/{qunit.js => qunit.fixture.js} | 0 test/browser-fixtures/{tdd.js => tdd.fixture.js} | 0 5 files changed, 5 insertions(+), 3 deletions(-) rename test/browser-fixtures/{bdd.js => bdd.fixture.js} (100%) rename test/browser-fixtures/{exports.js => exports.fixture.js} (100%) rename test/browser-fixtures/{qunit.js => qunit.fixture.js} (100%) rename test/browser-fixtures/{tdd.js => tdd.fixture.js} (100%) diff --git a/karma.conf.js b/karma.conf.js index 125aaf4f08..266fe72b7a 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -14,8 +14,10 @@ module.exports = function(config) { 'mocha' ], files: [ - 'test/browser-fixtures/bdd.js', - 'test/acceptance/*.js' + // we use the BDD interface for all of the tests that + // aren't interface-specific. + 'test/browser-fixtures/bdd.fixture.js', + 'test/acceptance/*.spec.js' ], exclude: [ 'test/acceptance/http.spec.js', @@ -108,7 +110,7 @@ module.exports = function(config) { cfg.sauceLabs.testName = 'Interface "' + ui + '" integration tests'; } cfg.files = [ - 'test/browser-fixtures/' + ui + '.js', + 'test/browser-fixtures/' + ui + '.fixture.js', 'test/acceptance/interfaces/' + ui + '.spec.js' ]; } else if (cfg.sauceLabs) { diff --git a/test/browser-fixtures/bdd.js b/test/browser-fixtures/bdd.fixture.js similarity index 100% rename from test/browser-fixtures/bdd.js rename to test/browser-fixtures/bdd.fixture.js diff --git a/test/browser-fixtures/exports.js b/test/browser-fixtures/exports.fixture.js similarity index 100% rename from test/browser-fixtures/exports.js rename to test/browser-fixtures/exports.fixture.js diff --git a/test/browser-fixtures/qunit.js b/test/browser-fixtures/qunit.fixture.js similarity index 100% rename from test/browser-fixtures/qunit.js rename to test/browser-fixtures/qunit.fixture.js diff --git a/test/browser-fixtures/tdd.js b/test/browser-fixtures/tdd.fixture.js similarity index 100% rename from test/browser-fixtures/tdd.js rename to test/browser-fixtures/tdd.fixture.js