From: Stas Vilchik Date: Mon, 9 Nov 2015 10:55:48 +0000 (+0100) Subject: bugfix: project permissions page shows all projects X-Git-Tag: 5.3-RC1~363 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=093b8c8fb43af25b04355cbfd81b4686d9f363ec;p=sonarqube.git bugfix: project permissions page shows all projects --- diff --git a/it/it-tests/src/test/java/it/projectAdministration/ProjectPermissionsTest.java b/it/it-tests/src/test/java/it/projectAdministration/ProjectPermissionsTest.java new file mode 100644 index 00000000000..504dbe9d365 --- /dev/null +++ b/it/it-tests/src/test/java/it/projectAdministration/ProjectPermissionsTest.java @@ -0,0 +1,55 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package it.projectAdministration; + +import com.sonar.orchestrator.Orchestrator; +import com.sonar.orchestrator.build.SonarRunner; +import com.sonar.orchestrator.selenium.Selenese; +import it.Category1Suite; +import org.junit.ClassRule; +import org.junit.Test; +import util.selenium.SeleneseTest; + +import static util.ItUtils.projectDir; + +public class ProjectPermissionsTest { + + @ClassRule + public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR; + + @Test + public void test_project_permissions_page_shows_only_single_project() throws Exception { + executeBuild("project-permissions-project", "Test Project"); + executeBuild("project-permissions-project-2", "Another Test Project"); + + Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("project_permissions_page_shows_only_single_project", + "/projectAdministration/ProjectPermissionsTest/test_project_permissions_page_shows_only_single_project.html" + ).build(); + new SeleneseTest(selenese).runOn(orchestrator); + } + + private void executeBuild(String projectKey, String projectName) { + orchestrator.executeBuild( + SonarRunner.create(projectDir("shared/xoo-sample")) + .setProjectKey(projectKey) + .setProjectName(projectName) + ); + } +} diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectPermissionsTest/test_project_permissions_page_shows_only_single_project.html b/it/it-tests/src/test/resources/projectAdministration/ProjectPermissionsTest/test_project_permissions_page_shows_only_single_project.html new file mode 100644 index 00000000000..c9eb0c8cec7 --- /dev/null +++ b/it/it-tests/src/test/resources/projectAdministration/ProjectPermissionsTest/test_project_permissions_page_shows_only_single_project.html @@ -0,0 +1,70 @@ + + + + + + + test_project_overview_after_first_analysis + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
test_project_overview_after_first_analysis
open/sonar/sessions/logout
open/sonar/sessions/login
typeloginadmin
typepasswordadmin
clickAndWaitcommit
open/sonar/project_roles?id=project-permissions-project
waitForElementPresentcss=#projects
assertNotTextcss=#projects*Another Test Project*
assertElementNotPresentcss=footer
assertElementNotPresentcss=.search-box
+ + diff --git a/server/sonar-web/src/main/js/apps/project-permissions/app.js b/server/sonar-web/src/main/js/apps/project-permissions/app.js index 299c94f9bb7..b00e13b9a6d 100644 --- a/server/sonar-web/src/main/js/apps/project-permissions/app.js +++ b/server/sonar-web/src/main/js/apps/project-permissions/app.js @@ -11,6 +11,6 @@ function requestPermissionTemplates () { window.sonarqube.appStarted.then(options => { requestPermissionTemplates().done(r => { var el = document.querySelector(options.el); - ReactDOM.render(
, el); + ReactDOM.render(
, el); }); });