diff --git a/build/build.js b/build/build.js index 1dfe46cf..540a53cc 100644 --- a/build/build.js +++ b/build/build.js @@ -156,16 +156,19 @@ exports.build = function (compsBase32, buildName) { }; exports.test = function() { - var testacular = require('testacular'), - testConfig = {configFile : __dirname + '/../spec/testacular.conf.js'}; + var karma = require('karma'), + testConfig = {configFile : __dirname + '/../spec/karma.conf.js'}; testConfig.browsers = ['PhantomJS']; - isArgv('--chrome') && testConfig.browsers.push('Chrome'); - isArgv('--ff') && testConfig.browsers.push('Firefox'); - // will work only with new testacular that supports code coverage (today it's in master) - if (isArgv('--cov')) { // temporary hack until testacular with coverage becomes stable - testacular = require('../node_modules/testacular/lib/index.js'); // use local testacular + if (isArgv('--chrome')) { + testConfig.browsers.push('Chrome'); + } + if (isArgv('--ff')) { + testConfig.browsers.push('Firefox'); + } + + if (isArgv('--cov')) { testConfig.preprocessors = { '**/src/**/*.js': 'coverage', }; @@ -176,9 +179,9 @@ exports.test = function() { testConfig.reporters = ['coverage']; } - testacular.server.start(testConfig); + karma.server.start(testConfig); - function isArgv(optName){ + function isArgv(optName) { return process.argv.indexOf(optName) !== -1; } } diff --git a/package.json b/package.json index 14105fc9..8e9e16bd 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "JavaScript library for mobile-friendly interactive maps", "devDependencies": { "jshint": "~1.1.0", - "testacular": "~0.6.0", + "karma": "~0.8.0", "uglify-js": "~2.2.5", "jake": "~0.5.10" }, diff --git a/spec/testacular.conf.js b/spec/karma.conf.js similarity index 96% rename from spec/testacular.conf.js rename to spec/karma.conf.js index 58142f9e..c24ce64a 100644 --- a/spec/testacular.conf.js +++ b/spec/karma.conf.js @@ -1,4 +1,4 @@ -// Testacular configuration +// Karma configuration var libSources = require(__dirname+'/../build/build.js').getFiles(); // base path, that will be used to resolve files and exclude @@ -13,7 +13,7 @@ files = [].concat([ JASMINE, JASMINE_ADAPTER, "before.js", - "testacular.js" + "karma.js" ], libSources, [ "after.js", "happen.js", diff --git a/spec/testacular.js b/spec/karma.js similarity index 100% rename from spec/testacular.js rename to spec/karma.js