diff options
author | Stas Vilchik <vilchiks@gmail.com> | 2014-07-15 12:03:55 +0600 |
---|---|---|
committer | Stas Vilchik <vilchiks@gmail.com> | 2014-07-15 12:04:08 +0600 |
commit | 5e08c120b428f43c5f2d09bccaae97125a3269bf (patch) | |
tree | 5a4c3d5671f3f208d4fcfa4400ca1f820153ab72 | |
parent | 557db7be44ec049f777c7705eace34f2486a93c6 (diff) | |
download | sonarqube-5e08c120b428f43c5f2d09bccaae97125a3269bf.tar.gz sonarqube-5e08c120b428f43c5f2d09bccaae97125a3269bf.zip |
Update karma tests
-rw-r--r-- | server/sonar-web/Gruntfile.coffee | 2 | ||||
-rw-r--r-- | server/sonar-web/karma.conf.js (renamed from sonar-server/karma.conf.js) | 0 | ||||
-rw-r--r-- | server/sonar-web/src/main/coffee/tests/common/inputsSpec.coffee (renamed from sonar-server/src/main/coffee/tests/common/inputsSpec.coffee) | 0 | ||||
-rw-r--r-- | server/sonar-web/src/main/coffee/tests/component-viewer/baseSpec.coffee (renamed from sonar-server/src/main/coffee/tests/component-viewer/baseSpec.coffee) | 0 | ||||
-rw-r--r-- | server/sonar-web/src/main/coffee/tests/translateSpec.coffee (renamed from sonar-server/src/main/coffee/tests/translateSpec.coffee) | 0 | ||||
-rw-r--r-- | server/sonar-web/src/main/coffee/tests/widgets/BaseSpec.coffee (renamed from sonar-server/src/main/coffee/tests/widgets/BaseSpec.coffee) | 0 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/tests/main.js (renamed from sonar-server/src/main/js/tests/main.js) | 0 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/tests/navigator/filters/BaseFilterViewSpec.js (renamed from sonar-server/src/main/js/tests/navigator/filters/BaseFilterViewSpec.js) | 0 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/tests/navigator/filters/ChoiceFilterViewSpec.js (renamed from sonar-server/src/main/js/tests/navigator/filters/ChoiceFilterViewSpec.js) | 0 | ||||
-rw-r--r-- | sonar-server/src/main/coffee/tests/widgets/treemapSpec.coffee | 49 |
10 files changed, 1 insertions, 50 deletions
diff --git a/server/sonar-web/Gruntfile.coffee b/server/sonar-web/Gruntfile.coffee index ae6102b43f2..329ff3476a5 100644 --- a/server/sonar-web/Gruntfile.coffee +++ b/server/sonar-web/Gruntfile.coffee @@ -321,4 +321,4 @@ module.exports = (grunt) -> 'concat:build', 'requirejs', 'clean:js', 'copy:build', 'copy:requirejs', 'clean:build'] - grunt.registerTask 'test', ['coffee:build', 'handlebars:build', 'copy:js', 'concat:dev', 'karma:unit'] + grunt.registerTask 'test', ['clean:js', 'coffee:build', 'handlebars:build', 'copy:js', 'concat:dev', 'karma:unit'] diff --git a/sonar-server/karma.conf.js b/server/sonar-web/karma.conf.js index a247efa23e1..a247efa23e1 100644 --- a/sonar-server/karma.conf.js +++ b/server/sonar-web/karma.conf.js diff --git a/sonar-server/src/main/coffee/tests/common/inputsSpec.coffee b/server/sonar-web/src/main/coffee/tests/common/inputsSpec.coffee index 3cbc6591925..3cbc6591925 100644 --- a/sonar-server/src/main/coffee/tests/common/inputsSpec.coffee +++ b/server/sonar-web/src/main/coffee/tests/common/inputsSpec.coffee diff --git a/sonar-server/src/main/coffee/tests/component-viewer/baseSpec.coffee b/server/sonar-web/src/main/coffee/tests/component-viewer/baseSpec.coffee index 7fd5a4cbe50..7fd5a4cbe50 100644 --- a/sonar-server/src/main/coffee/tests/component-viewer/baseSpec.coffee +++ b/server/sonar-web/src/main/coffee/tests/component-viewer/baseSpec.coffee diff --git a/sonar-server/src/main/coffee/tests/translateSpec.coffee b/server/sonar-web/src/main/coffee/tests/translateSpec.coffee index 7b4576bcfff..7b4576bcfff 100644 --- a/sonar-server/src/main/coffee/tests/translateSpec.coffee +++ b/server/sonar-web/src/main/coffee/tests/translateSpec.coffee diff --git a/sonar-server/src/main/coffee/tests/widgets/BaseSpec.coffee b/server/sonar-web/src/main/coffee/tests/widgets/BaseSpec.coffee index b869aed84d5..b869aed84d5 100644 --- a/sonar-server/src/main/coffee/tests/widgets/BaseSpec.coffee +++ b/server/sonar-web/src/main/coffee/tests/widgets/BaseSpec.coffee diff --git a/sonar-server/src/main/js/tests/main.js b/server/sonar-web/src/main/js/tests/main.js index eb95545cb5b..eb95545cb5b 100644 --- a/sonar-server/src/main/js/tests/main.js +++ b/server/sonar-web/src/main/js/tests/main.js diff --git a/sonar-server/src/main/js/tests/navigator/filters/BaseFilterViewSpec.js b/server/sonar-web/src/main/js/tests/navigator/filters/BaseFilterViewSpec.js index b1a0ab15c4f..b1a0ab15c4f 100644 --- a/sonar-server/src/main/js/tests/navigator/filters/BaseFilterViewSpec.js +++ b/server/sonar-web/src/main/js/tests/navigator/filters/BaseFilterViewSpec.js diff --git a/sonar-server/src/main/js/tests/navigator/filters/ChoiceFilterViewSpec.js b/server/sonar-web/src/main/js/tests/navigator/filters/ChoiceFilterViewSpec.js index 3b905a9f88f..3b905a9f88f 100644 --- a/sonar-server/src/main/js/tests/navigator/filters/ChoiceFilterViewSpec.js +++ b/server/sonar-web/src/main/js/tests/navigator/filters/ChoiceFilterViewSpec.js diff --git a/sonar-server/src/main/coffee/tests/widgets/treemapSpec.coffee b/sonar-server/src/main/coffee/tests/widgets/treemapSpec.coffee deleted file mode 100644 index 4f1ddcfd20a..00000000000 --- a/sonar-server/src/main/coffee/tests/widgets/treemapSpec.coffee +++ /dev/null @@ -1,49 +0,0 @@ -$ = jQuery - -METRICS = - ncloc: - name: 'Lines of code' - coverage: - name: 'Coverage' - direction: -1 - -METRICS_PRIORITY = ['coverage', 'ncloc'] - -COMPONENTS = [ - { key: 'some-key-1', name: 'Some Name 1', longName: 'Some Long Name 1', qualifier: 'TRK', measures } -] - - - -describe 'treemap widget suite', -> - - uid = 1 - - render = (treemap, components = COMPONENTS, metrics = METRICS, metricsPriority = METRICS_PRIORITY) -> - elementId = 'treemap-' + ++uid - $("<div id='#{elementId}'></div>").appendTo 'body' - treemap.metrics(metrics).metricsPriority(metricsPriority).components(components).options( - heightInPercents: 55 - maxItems: 10 - maxItemsReachedMessage: '' - baseUrl: '' - noData: '' - ).render('#' + elementId); - - - close = -> - elementId = 'treemap-' + uid - $('#' + elementId).delete() - - - beforeEach -> - @treemap = new window.SonarWidgets.Treemap() - - - afterEach -> - @treemap = undefined - close() - - - it 'renders', -> - render @treemap |