From 06ae4fc77a0eb8f9687f8f614cde5e4f464eaf18 Mon Sep 17 00:00:00 2001 From: Dmitri Akatov Date: Tue, 24 Jun 2014 17:03:06 +0100 Subject: [PATCH] simpler karma usage (there are no unit tests) --- Gruntfile.coffee | 9 ++------ test/e2e.karma.coffee => karma.coffee | 2 -- test/unit.karma.coffee | 33 --------------------------- test/unit/test.coffee | 3 --- 4 files changed, 2 insertions(+), 45 deletions(-) rename test/e2e.karma.coffee => karma.coffee (97%) delete mode 100644 test/unit.karma.coffee delete mode 100644 test/unit/test.coffee diff --git a/Gruntfile.coffee b/Gruntfile.coffee index d4a1ddd..355b924 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -7,14 +7,9 @@ module.exports = (grunt) -> meta: test: 'test' karma: - unit: configFile: 'test/unit.karma.coffee' - e2e: configFile: 'test/e2e.karma.coffee' - unit_ci: - configFile: 'test/unit.karma.coffee' - singleRun: true - browsers: ['PhantomJS'] + e2e: configFile: 'karma.coffee' e2e_ci: - configFile: 'test/e2e.karma.coffee' + configFile: 'karma.coffee' singleRun: true browsers: ['PhantomJS'] jshint: diff --git a/test/e2e.karma.coffee b/karma.coffee similarity index 97% rename from test/e2e.karma.coffee rename to karma.coffee index d0e82f4..6f8dd68 100644 --- a/test/e2e.karma.coffee +++ b/karma.coffee @@ -10,8 +10,6 @@ module.exports = (karma) -> served: true karma.set - basePath: '..' - frameworks: ['ng-scenario'] preprocessors: '**/*.coffee': 'coffee' diff --git a/test/unit.karma.coffee b/test/unit.karma.coffee deleted file mode 100644 index d7871f6..0000000 --- a/test/unit.karma.coffee +++ /dev/null @@ -1,33 +0,0 @@ -module.exports = (karma) -> - karma.set - basePath: '..' - - frameworks: ['mocha'] - - files: [ - 'bower_components/angular/angular.js' - 'angular-contenteditable.js' - 'test/unit/*.coffee' - ] - - preprocessors: '**/*.coffee': 'coffee' - - exclude: [] - - reporters: ['progress'] - - port: 9876 - - runnerPort: 9100 - - colors: true - - logLevel: karma.LOG_INFO - - autoWatch: true - - browsers: ['Chrome'] - - captureTimeout: 60000 - - singleRun: false diff --git a/test/unit/test.coffee b/test/unit/test.coffee deleted file mode 100644 index 15c02e5..0000000 --- a/test/unit/test.coffee +++ /dev/null @@ -1,3 +0,0 @@ -describe 'radians', -> - describe 'contenteditable', -> - it 'passes', ->