From 39707810c59036f0ff64ded7ff50044f4906d23a Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 5 May 2015 10:36:09 +0200 Subject: [PATCH] SONAR-5851 apply feedback --- server/sonar-web/src/main/js/quality-profiles/controller.js | 1 + .../main/js/quality-profiles/restore-built-in-profiles-view.js | 1 + server/sonar-web/src/test/js/quality-profiles.js | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/server/sonar-web/src/main/js/quality-profiles/controller.js b/server/sonar-web/src/main/js/quality-profiles/controller.js index 87c481b4436..b3fabdd04d0 100644 --- a/server/sonar-web/src/main/js/quality-profiles/controller.js +++ b/server/sonar-web/src/main/js/quality-profiles/controller.js @@ -111,6 +111,7 @@ define([ this.options.app.router.navigate(''); this.options.app.layout.headerRegion.reset(); this.options.app.layout.detailsRegion.reset(); + this.options.app.profilesView.highlight(null); }, fetchProfiles: function () { diff --git a/server/sonar-web/src/main/js/quality-profiles/restore-built-in-profiles-view.js b/server/sonar-web/src/main/js/quality-profiles/restore-built-in-profiles-view.js index 4285a6bf8d3..3d86785c579 100644 --- a/server/sonar-web/src/main/js/quality-profiles/restore-built-in-profiles-view.js +++ b/server/sonar-web/src/main/js/quality-profiles/restore-built-in-profiles-view.js @@ -57,6 +57,7 @@ define([ } }).done(function () { that.collection.fetch({ reset: true }); + that.collection.trigger('destroy'); that.close(); }).fail(function (jqXHR) { that.showErrors(jqXHR.responseJSON.errors, jqXHR.responseJSON.warnings); diff --git a/server/sonar-web/src/test/js/quality-profiles.js b/server/sonar-web/src/test/js/quality-profiles.js index 50042e42ce2..56aa831f751 100644 --- a/server/sonar-web/src/test/js/quality-profiles.js +++ b/server/sonar-web/src/test/js/quality-profiles.js @@ -815,7 +815,7 @@ casper.test.begin(testName('Importers'), 6, function (test) { }); -casper.test.begin(testName('Restore Built-in Profiles'), 2, function (test) { +casper.test.begin(testName('Restore Built-in Profiles'), 3, function (test) { casper .start(lib.buildUrl('profiles'), function () { lib.setDefaultViewport(); @@ -861,6 +861,7 @@ casper.test.begin(testName('Restore Built-in Profiles'), 2, function (test) { .then(function () { test.assertSelectorContains('.js-list .list-group-item', 'Sonar way'); + test.assertDoesntExist('.search-navigator-header-component'); }) .then(function () { -- 2.39.5