Fix double inclusion of jquery.mockjax into medium tests

diff --git a/server/sonar-web/src/main/coffee/component-viewer/app.coffee b/server/sonar-web/src/main/coffee/component-viewer/app.coffee
index d091a396aa691cd5806d695ca82f9ec61291c3db..30d4c76ffc53a7e7953fd48808e4f5bdd978b2bf 100644 (file)
--- a/server/sonar-web/src/main/coffee/component-viewer/app.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/app.coffee
@@ -5,7 +5,6 @@ requirejs.config
     'backbone': 'third-party/backbone'
     'backbone.marionette': 'third-party/backbone.marionette'
     'handlebars': 'third-party/handlebars'
-    'jquery.mockjax': 'third-party/jquery.mockjax'
 
   shim:
     'backbone.marionette':

diff --git a/server/sonar-web/src/main/coffee/component-viewer/main.coffee b/server/sonar-web/src/main/coffee/component-viewer/main.coffee
index a7f4c7415a2fe86a5305e2c07fd69f7146b99411..c4cc5bb27ccd622e69001208717b20c0ae5b7280 100644 (file)
--- a/server/sonar-web/src/main/coffee/component-viewer/main.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/main.coffee
@@ -16,8 +16,6 @@ define [
   'component-viewer/source'
   'component-viewer/header'
   'component-viewer/utils'
-
-  'component-viewer/mockjax'
 ], (
   Backbone
   Marionette

diff --git a/server/sonar-web/src/main/coffee/component-viewer/mockjax.coffee b/server/sonar-web/src/main/coffee/component-viewer/mockjax.coffee
deleted file mode 100644 (file)
index 6513717..0000000
--- a/server/sonar-web/src/main/coffee/component-viewer/mockjax.coffee
+++ /dev/null
@@ -1,27 +0,0 @@
-define ['third-party/jquery.mockjax'], ->
-
-  jQuery.mockjaxSettings.contentType = 'text/json';
-  jQuery.mockjaxSettings.responseTime = 250;
-
-  jQuery.mockjax
-    url: "#{baseUrl}/api/sources/app"
-    responseText: JSON.stringify
-      key: 'org.codehaus.sonar:sonar-dev-maven-plugin:src/main/java/org/sonar/dev/UploadMojo.java'
-      path: 'src/main/java/org/sonar/dev/UploadMojo.java'
-      name: 'UploadMojo.java'
-      q: 'FIL'
-      fav: false
-      project: 'org.codehaus.sonar:sonar-dev-maven-plugin'
-      projectName: 'SonarQube Development Maven Plugin'
-      periods: []
-      measures:
-        'ncloc': 69
-        'coverage': '30%'
-        'duplication_density': '7.4%'
-        'debt': '3d 2h'
-        'issues': 4
-        'blocker_issues': 1
-        'critical_issues': 2
-        'major_issues': 0
-        'minor_issues': 1
-        'info_issues': 0
\ No newline at end of file

diff --git a/server/sonar-web/src/main/coffee/dashboard/file-app.coffee b/server/sonar-web/src/main/coffee/dashboard/file-app.coffee
index 661562cef33b6ae9b417fb6aac36c3ce85192d7d..0e35c08471077bbb9260b7726ac74ecbcc2ffefc 100644 (file)
--- a/server/sonar-web/src/main/coffee/dashboard/file-app.coffee
+++ b/server/sonar-web/src/main/coffee/dashboard/file-app.coffee
@@ -5,7 +5,6 @@ requirejs.config
     'backbone': 'third-party/backbone'
     'backbone.marionette': 'third-party/backbone.marionette'
     'handlebars': 'third-party/handlebars'
-    'jquery.mockjax': 'third-party/jquery.mockjax'
 
   shim:
     'backbone.marionette':

diff --git a/server/sonar-web/src/main/coffee/drilldown/app.coffee b/server/sonar-web/src/main/coffee/drilldown/app.coffee
index fc62830b711dae75b7d370d6fb960e38898cff1d..c1179e3e05d3276bcb821b73c100e38e4c740997 100644 (file)
--- a/server/sonar-web/src/main/coffee/drilldown/app.coffee
+++ b/server/sonar-web/src/main/coffee/drilldown/app.coffee
@@ -5,7 +5,6 @@ requirejs.config
     'backbone': 'third-party/backbone'
     'backbone.marionette': 'third-party/backbone.marionette'
     'handlebars': 'third-party/handlebars'
-    'jquery.mockjax': 'third-party/jquery.mockjax'
 
   shim:
     'backbone.marionette':

diff --git a/server/sonar-web/src/main/js/tests/e2e/tests/component-viewer-spec.js b/server/sonar-web/src/main/js/tests/e2e/tests/component-viewer-spec.js
index 8f9d589b293a19858d48725d46f01c3afc1e5a76..62c14b75bb6f3792b30f707669a39c5b25c63a23 100644 (file)
--- a/server/sonar-web/src/main/js/tests/e2e/tests/component-viewer-spec.js
+++ b/server/sonar-web/src/main/js/tests/e2e/tests/component-viewer-spec.js
@@ -305,15 +305,15 @@ casper.test.begin(testName('Coverage'), function (test) {
             test.assertSelectorContains('.bubble-popup li[title="should_update_existing_issue"]', '293');
 
             lib.clearRequestMocks();
-//            lib.mockRequestFromFile('/api/components/app', 'tests/app.json');
-//            lib.mockRequestFromFile('/api/sources/show', 'tests/source.json');
-//            lib.mockRequestFromFile('/api/resources', 'tests/resources.json');
-//            lib.mockRequestFromFile('/api/tests/show', 'tests/tests.json');
+            lib.mockRequestFromFile('/api/components/app', 'tests/app.json');
+            lib.mockRequestFromFile('/api/sources/show', 'tests/source.json');
+            lib.mockRequestFromFile('/api/resources', 'tests/resources.json');
+            lib.mockRequestFromFile('/api/tests/show', 'tests/tests.json');
             casper.click('.component-viewer-popup-test-file[data-key]');
 
-//            casper.waitForSelector('.js-unit-test', function () {
-//              test.assertElementCount('.js-unit-test', 2);
-//            });
+            casper.waitForSelector('.js-unit-test', function () {
+              test.assertElementCount('.js-unit-test', 2);
+            });
           });
         });
       })

diff --git a/server/sonar-web/src/main/js/third-party/jquery.mockjax.js b/server/sonar-web/src/main/js/third-party/jquery.mockjax.js
index 75eb9e5f171297cdd9df7947a280960992342212..b8e13145e4076bb2d0c8c16d309ac66675fa0ef0 100644 (file)
--- a/server/sonar-web/src/main/js/third-party/jquery.mockjax.js
+++ b/server/sonar-web/src/main/js/third-party/jquery.mockjax.js
@@ -431,8 +431,6 @@
                        origSettings.url = url;
                }
 
-    console.log('!!! AJAX REQUEST', origSettings.url);
-
                // Extend the original settings for the request
                requestSettings = $.extend(true, {}, $.ajaxSettings, origSettings);