summaryrefslogtreecommitdiffstats
path: root/sonar-server/src/main
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2014-07-08 12:25:03 +0600
committerStas Vilchik <vilchiks@gmail.com>2014-07-08 12:25:03 +0600
commit308b3b4e1fc1790a4299b5106c66729842584f6f (patch)
treefada3f5566a056b2e7a40f0d0e68f25cb10f6dba /sonar-server/src/main
parent4b0f2cd14b2d20d2ed9c214b2110246ede391f2c (diff)
downloadsonarqube-308b3b4e1fc1790a4299b5106c66729842584f6f.tar.gz
sonarqube-308b3b4e1fc1790a4299b5106c66729842584f6f.zip
CasperJS tests improvements. Drop karma.
Diffstat (limited to 'sonar-server/src/main')
-rw-r--r--sonar-server/src/main/coffee/tests/common/inputsSpec.coffee87
-rw-r--r--sonar-server/src/main/coffee/tests/translateSpec.coffee75
-rw-r--r--sonar-server/src/main/coffee/tests/widgets/BaseSpec.coffee47
-rw-r--r--sonar-server/src/main/js/tests/e2e/pages/quality-gates.html2
-rw-r--r--sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec.js (renamed from sonar-server/src/main/js/tests/e2e/tests/quality-gates.js)0
-rw-r--r--sonar-server/src/main/js/tests/main.js44
-rw-r--r--sonar-server/src/main/js/tests/navigator/filters/BaseFilterViewSpec.js15
-rw-r--r--sonar-server/src/main/js/tests/navigator/filters/ChoiceFilterViewSpec.js39
-rw-r--r--sonar-server/src/main/js/translate.js10
9 files changed, 8 insertions, 311 deletions
diff --git a/sonar-server/src/main/coffee/tests/common/inputsSpec.coffee b/sonar-server/src/main/coffee/tests/common/inputsSpec.coffee
deleted file mode 100644
index 3cbc6591925..00000000000
--- a/sonar-server/src/main/coffee/tests/common/inputsSpec.coffee
+++ /dev/null
@@ -1,87 +0,0 @@
-$ = jQuery
-
-describe 'WORK_DUR suite', ->
-
- beforeEach ->
- window.SS = {}
- window.SS.phrases =
- 'work_duration':
- 'x_days': '{0}d', 'x_hours': '{0}h', 'x_minutes': '{0}min'
-
- @input = $('<input type="text">')
- @input.appendTo $('body')
- @input.data 'type', 'WORK_DUR'
-
-
- it 'converts', ->
- @input.originalVal '2d 7h 13min'
- expect(@input.val()).toBe 1393
-
- it 'converts only days', ->
- @input.originalVal '1d'
- expect(@input.val()).toBe 480
-
- it 'converts hours with minutes', ->
- @input.originalVal '2h 30min'
- expect(@input.val()).toBe 150
-
- it 'converts zero', ->
- @input.originalVal '0'
- expect(@input.val()).toBe 0
-
-
- it 'restores', ->
- @input.val 1393
- expect(@input.originalVal()).toBe '2d 7h 13min'
-
- it 'restores zero', ->
- @input.val '0'
- expect(@input.originalVal()).toBe '0'
-
-
- it 'returns initially incorrect value', ->
- @input.val 'something'
- expect(@input.val()).toBe 'something'
-
-
-describe 'RATING suite', ->
-
- beforeEach ->
- @input = $('<input type="text">')
- @input.appendTo $('body')
- @input.data 'type', 'RATING'
-
-
- it 'converts A', ->
- @input.originalVal 'A'
- expect(@input.val()).toBe 1
-
-
- it 'converts B', ->
- @input.originalVal 'B'
- expect(@input.val()).toBe 2
-
-
- it 'converts E', ->
- @input.originalVal 'E'
- expect(@input.val()).toBe 5
-
-
- it 'does not convert F', ->
- @input.originalVal 'F'
- expect(@input.val()).toBe 'F'
-
-
- it 'restores A', ->
- @input.val 1
- expect(@input.originalVal()).toBe 'A'
-
-
- it 'restores E', ->
- @input.val 5
- expect(@input.originalVal()).toBe 'E'
-
-
- it 'returns initially incorrect value', ->
- @input.val 'something'
- expect(@input.val()).toBe 'something'
diff --git a/sonar-server/src/main/coffee/tests/translateSpec.coffee b/sonar-server/src/main/coffee/tests/translateSpec.coffee
deleted file mode 100644
index 7b4576bcfff..00000000000
--- a/sonar-server/src/main/coffee/tests/translateSpec.coffee
+++ /dev/null
@@ -1,75 +0,0 @@
-$ = jQuery
-
-describe 'translation "t" suite', ->
-
- beforeEach ->
- window.messages =
- 'something': 'SOMETHING'
- 'something_with_underscore': 'SOMETHING_WITH_UNDERSCORE'
- 'something_with{braces}': 'SOMETHING_WITH{braces}'
-
- window.SS =
- phrases:
- 'something': 'SOMETHING ANOTHER'
-
-
- afterEach ->
- window.messages = window.SS = undefined
-
-
- it 'translates', ->
- expect(t('something')).toBe 'SOMETHING'
-
-
- it 'translates with underscore', ->
- expect(t('something_with_underscore')).toBe 'SOMETHING_WITH_UNDERSCORE'
-
-
- it 'translates with braces', ->
- expect(t('something_with{braces}')).toBe 'SOMETHING_WITH{braces}'
-
-
- it 'fallbacks to "translate"', ->
- window.messages = undefined
- expect(t('something')).toBe 'SOMETHING ANOTHER'
-
-
- it 'returns the key when no translation', ->
- expect(t('something_another')).toBe 'something_another'
-
-
-
-describe 'translation "translate" suite', ->
-
- beforeEach ->
- window.SS =
- phrases:
- 'something': 'SOMETHING'
- 'something_with_underscore': 'SOMETHING_WITH_UNDERSCORE'
- 'something_with{braces}': 'SOMETHING_WITH{braces}'
-
-
- afterEach ->
- window.messages = window.SS = undefined
-
-
- it 'translates', ->
- expect(translate('something')).toBe 'SOMETHING'
-
-
- it 'translates with underscore', ->
- expect(translate('something_with_underscore')).toBe 'SOMETHING_WITH_UNDERSCORE'
-
-
- it 'translates with braces', ->
- expect(translate('something_with{braces}')).toBe 'SOMETHING_WITH{braces}'
-
-
- it 'returns the key when no translation', ->
- expect(translate('something_another')).toBe 'something_another'
-
-
- it 'does not fail when there is no dictionary', ->
- window.SS = undefined
- expect(translate('something_another')).toBe 'something_another'
-
diff --git a/sonar-server/src/main/coffee/tests/widgets/BaseSpec.coffee b/sonar-server/src/main/coffee/tests/widgets/BaseSpec.coffee
deleted file mode 100644
index 797acf75588..00000000000
--- a/sonar-server/src/main/coffee/tests/widgets/BaseSpec.coffee
+++ /dev/null
@@ -1,47 +0,0 @@
-$ = jQuery
-
-describe 'base widget suite', ->
-
- it 'exists', ->
- expect(window.SonarWidgets).toBeDefined()
- expect(window.SonarWidgets.BaseWidget).toBeDefined()
-
-
- it 'adds fields', ->
- widget = new window.SonarWidgets.BaseWidget()
- widget.addField 'fieldName', 1
-
- expect(typeof widget.fieldName).toBe 'function'
- expect(widget.fieldName()).toBe 1
-
- expect(widget.fieldName(2)).toBe widget
- expect(widget.fieldName()).toBe 2
-
-
- it 'adds metrics', ->
- widget = new window.SonarWidgets.BaseWidget()
- widget.addField 'metrics', 'metricA': { name: 'Metric A', someField: 2 }
- widget.addField 'metricsPriority', ['metricA']
- widget.addMetric 'myMetric', 0
-
- expect(widget.myMetric).toBeDefined()
- expect(widget.myMetric.key).toBe 'metricA'
- expect(widget.myMetric.name).toBe 'Metric A'
- expect(widget.myMetric.someField).toBe 2
- expect(typeof widget.myMetric.value).toBe 'function'
- expect(typeof widget.myMetric.formattedValue).toBe 'function'
-
-
- it 'has default properties', ->
- widget = new window.SonarWidgets.BaseWidget()
-
- expect(widget.components).toBeDefined()
- expect(widget.metrics).toBeDefined()
- expect(widget.metricsPriority).toBeDefined()
- expect(widget.options).toBeDefined()
-
-
- it 'created "translate" string', ->
- widget = new window.SonarWidgets.BaseWidget()
-
- expect(widget.trans(1, 2)).toBe 'translate(1,2)' \ No newline at end of file
diff --git a/sonar-server/src/main/js/tests/e2e/pages/quality-gates.html b/sonar-server/src/main/js/tests/e2e/pages/quality-gates.html
index c4152e98755..c2eaba8d13e 100644
--- a/sonar-server/src/main/js/tests/e2e/pages/quality-gates.html
+++ b/sonar-server/src/main/js/tests/e2e/pages/quality-gates.html
@@ -9,9 +9,9 @@
<script type="text/javascript">
var baseUrl = '..';
var $j = jQuery.noConflict();
+ window.suppressTranslationWarnings = true;
$j(document).ready(function () {
$j('.open-modal').modal();
-
$j('<scr' + 'ipt data-main="../js/quality-gate/app" src="../js/require.js"></scr' + 'ipt>').appendTo('body');
});
</script>
diff --git a/sonar-server/src/main/js/tests/e2e/tests/quality-gates.js b/sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec.js
index 94f134693c3..94f134693c3 100644
--- a/sonar-server/src/main/js/tests/e2e/tests/quality-gates.js
+++ b/sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec.js
diff --git a/sonar-server/src/main/js/tests/main.js b/sonar-server/src/main/js/tests/main.js
deleted file mode 100644
index eb95545cb5b..00000000000
--- a/sonar-server/src/main/js/tests/main.js
+++ /dev/null
@@ -1,44 +0,0 @@
-window.__karma__.loaded = function() {};
-
-var tests = [];
-for (var file in window.__karma__.files) {
- if (window.__karma__.files.hasOwnProperty(file)) {
- if (/Spec\.js$/.test(file)) {
- tests.push(file);
- }
- }
-}
-
-requirejs.config({
- baseUrl: '/base',
-
- paths: {
- 'backbone': 'third-party/backbone',
- 'backbone.marionette': 'third-party/backbone.marionette',
- 'handlebars': 'third-party/handlebars',
- 'moment': 'third-party/moment'
- },
-
- shim: {
- 'backbone.marionette': {
- deps: ['backbone'],
- exports: 'Marionette'
- },
- 'backbone': {
- exports: 'Backbone'
- },
- 'handlebars': {
- exports: 'Handlebars'
- },
- 'moment': {
- exports: 'moment'
- }
- },
-
- // ask Require.js to load these files (all our tests)
- deps: tests,
-
- // start test run, once Require.js is done
- callback: window.__karma__.start
-
-});
diff --git a/sonar-server/src/main/js/tests/navigator/filters/BaseFilterViewSpec.js b/sonar-server/src/main/js/tests/navigator/filters/BaseFilterViewSpec.js
deleted file mode 100644
index b1a0ab15c4f..00000000000
--- a/sonar-server/src/main/js/tests/navigator/filters/BaseFilterViewSpec.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(['navigator/filters/base-filters'], function(BaseFilters) {
-
- describe('BaseFilterView', function() {
-
- it('initializes', function() {
- var baseFilterView = new BaseFilters.BaseFilterView({
- model: new BaseFilters.Filter()
- });
- expect(baseFilterView.detailsView).toBeDefined();
- expect(baseFilterView.detailsView.options.filterView).toBe(baseFilterView);
- });
-
- });
-
-});
diff --git a/sonar-server/src/main/js/tests/navigator/filters/ChoiceFilterViewSpec.js b/sonar-server/src/main/js/tests/navigator/filters/ChoiceFilterViewSpec.js
deleted file mode 100644
index 3b905a9f88f..00000000000
--- a/sonar-server/src/main/js/tests/navigator/filters/ChoiceFilterViewSpec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-define(['navigator/filters/base-filters', 'navigator/filters/choice-filters'], function(BaseFilters, ChoiceFilters) {
-
- describe('BaseFilterView', function() {
- var choices, choiceFilter, choiceFilterView;
-
- beforeEach(function() {
- choices = {
- 'ONE': 'one',
- 'TWO': 'two',
- 'THREE': 'three',
- '!OPPOSITE': 'opposite'
- };
-
- choiceFilter = new BaseFilters.Filter({
- name: 'Choice Filter Name',
- property: 'choiceFilterProperty',
- type: ChoiceFilters.ChoiceFilterView,
- enabled: true,
- optional: false,
- choices: choices
- });
-
- choiceFilterView = new ChoiceFilters.ChoiceFilterView({
- model: choiceFilter
- });
- });
-
- it('creates choices', function() {
- expect(choiceFilterView.choices).toBeDefined();
- expect(choiceFilterView.choices.length).toBe(Object.keys(choices).length);
- });
-
- it('does not have selected by default', function() {
- expect(choiceFilterView.getSelected().length).toBe(0);
- });
-
- });
-
-});
diff --git a/sonar-server/src/main/js/translate.js b/sonar-server/src/main/js/translate.js
index cb10b996220..c86d28c09ef 100644
--- a/sonar-server/src/main/js/translate.js
+++ b/sonar-server/src/main/js/translate.js
@@ -1,7 +1,11 @@
(function() {
+ window.suppressTranslationWarnings = false;
+
var warn = function(message) {
- if (console != null && typeof console.warn === 'function') {
- console.warn(message);
+ if (!window.suppressTranslationWarnings) {
+ if (console != null && typeof console.warn === 'function') {
+ console.warn(message);
+ }
}
};
@@ -90,7 +94,7 @@
window.messages = bundle;
localStorage.setItem('l10n.bundle', JSON.stringify(bundle));
- } else if (jqXHR.status === 304) {
+ } else if (jqXHR.status == 304) {
window.messages = JSON.parse(localStorage.getItem('l10n.bundle'));
}
});