Cleaned up karma configuration files

This commit is contained in:
jacobawenger
2014-10-22 15:17:23 -07:00
parent 100216a854
commit 61424f2092
3 changed files with 3 additions and 33 deletions

View File

@@ -39,10 +39,7 @@ var paths = {
},
tests: {
configs: {
local: "tests/karma.conf.js",
travis: "tests/karma-travis.conf.js"
},
config: "tests/karma.conf.js",
files: [
"bower_components/firebase/firebase.js",
"tests/phantomjs-es5-shim.js",
@@ -97,10 +94,10 @@ gulp.task("scripts", function() {
/* Uses the Karma test runner to run the Jasmine tests */
gulp.task("test", function() {
var configFile = travis ? paths.tests.configs.travis : paths.tests.configs.local;
return gulp.src(paths.tests.files)
.pipe(karma({
configFile: configFile,
configFile: paths.tests.config,
browsers: travis ? ["Firefox"] : ["Chrome"],
action: "run"
}))
.on("error", function(error) {

View File

@@ -1,26 +0,0 @@
module.exports = function(config) {
config.set({
frameworks: ["jasmine"],
browsers: ["Firefox"],
autowatch: false,
singleRun: true,
preprocessors: {
"../src/*.js": "coverage"
},
reporters: ["spec", "failed", "coverage"],
coverageReporter: {
reporters: [
{
type: "lcovonly",
dir: "coverage",
subdir: "."
},
{
type: "text-summary"
}
]
},
});
};

View File

@@ -1,7 +1,6 @@
module.exports = function(config) {
config.set({
frameworks: ["jasmine"],
browsers: ["Chrome"],
autowatch: false,
singleRun: true,