SONAR-6581 fix deletion of provisioned project

diff --git a/server/sonar-web/src/main/js/apps/provisioning/project.js b/server/sonar-web/src/main/js/apps/provisioning/project.js
index 90963b7a1b5a33d88d005efe9954f7ead8271620..00bc73dd1507fe485429158d5dc4a93be287de90 100644 (file)
--- a/server/sonar-web/src/main/js/apps/provisioning/project.js
+++ b/server/sonar-web/src/main/js/apps/provisioning/project.js
@@ -18,9 +18,9 @@ define(function () {
       }
       if (method === 'delete') {
         _.defaults(opts, {
-          url: this.urlRoot() + '/delete',
+          url: this.urlRoot() + '/bulk_delete',
           type: 'POST',
-          data: { uuids: this.id }
+          data: { ids: this.id }
         });
       }
       return Backbone.ajax(opts);

diff --git a/server/sonar-web/src/test/js/provisioning-spec.js b/server/sonar-web/src/test/js/provisioning-spec.js
index 28482a165d5f0777ac5a50c78c2057ca1be08423..6a1b6b6abb2d3a9025ffb10f95ac045901235264 100644 (file)
--- a/server/sonar-web/src/test/js/provisioning-spec.js
+++ b/server/sonar-web/src/test/js/provisioning-spec.js
@@ -209,7 +209,7 @@ casper.test.begin(testName('Delete'), 1, function (test) {
       .start(lib.buildUrl('provisioning'), function () {
         lib.setDefaultViewport();
         this.searchMock = lib.mockRequestFromFile('/api/projects/provisioned', 'search.json');
-        this.updateMock = lib.mockRequestFromFile('/api/projects/delete', 'delete-error.json', { status: 400 });
+        this.updateMock = lib.mockRequestFromFile('/api/projects/bulk_delete', 'delete-error.json', { status: 400 });
       })
 
       .then(function () {
@@ -237,7 +237,7 @@ casper.test.begin(testName('Delete'), 1, function (test) {
 
       .then(function () {
         lib.clearRequestMock(this.updateMock);
-        lib.mockRequest('/api/projects/delete', '{}', { data: { uuids: 'id-javascript'} });
+        lib.mockRequest('/api/projects/bulk_delete', '{}', { data: { ids: 'id-javascript'} });
         casper.click('#delete-project-submit');
         casper.waitWhileSelector('[data-id="id-javascript"]');
       })