From: Grégoire Aubert <gregoire.aubert@sonarsource.com>
Date: Fri, 27 Apr 2018 15:12:23 +0000 (+0200)
Subject: SONARCLOUD-49 Wrap organization extension inside OrganizationAdminContainer
X-Git-Tag: 7.5~1277
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a8720f16734bee6b8c69d5364ac30d83af420567;p=sonarqube.git

SONARCLOUD-49 Wrap organization extension inside OrganizationAdminContainer
---

diff --git a/server/sonar-web/src/main/js/apps/organizations/routes.ts b/server/sonar-web/src/main/js/apps/organizations/routes.ts
index 3277341cfb3..e267926dce1 100644
--- a/server/sonar-web/src/main/js/apps/organizations/routes.ts
+++ b/server/sonar-web/src/main/js/apps/organizations/routes.ts
@@ -77,10 +77,6 @@ const routes = [
         component: OrganizationContainer,
         childRoutes: qualityGatesRoutes
       },
-      {
-        path: 'extension/:pluginKey/:extensionKey',
-        component: OrganizationPageExtension
-      },
       {
         component: OrganizationAdminContainer,
         childRoutes: [
@@ -90,7 +86,11 @@ const routes = [
           { path: 'permissions', component: GlobalPermissionsApp },
           { path: 'permission_templates', component: PermissionTemplateApp },
           { path: 'projects_management', component: ProjectManagementApp },
-          { path: 'webhooks', childRoutes: webhooksRoutes }
+          { path: 'webhooks', childRoutes: webhooksRoutes },
+          {
+            path: 'extension/:pluginKey/:extensionKey',
+            component: OrganizationPageExtension
+          }
         ]
       }
     ]
diff --git a/tests/src/test/java/org/sonarqube/tests/organization/OrganizationWebExtensionsTest.java b/tests/src/test/java/org/sonarqube/tests/organization/OrganizationWebExtensionsTest.java
index 2efd912a4c5..09cc242c6ba 100644
--- a/tests/src/test/java/org/sonarqube/tests/organization/OrganizationWebExtensionsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/organization/OrganizationWebExtensionsTest.java
@@ -45,7 +45,9 @@ public class OrganizationWebExtensionsTest {
   @Test
   public void organization_page() {
     Organization organization = tester.organizations().generate();
-    tester.openBrowser().open("/organizations/" + organization.getKey() + "/projects");
+    User administrator = tester.users().generateAdministrator(organization);
+    tester.openBrowser().logIn().submitCredentials(administrator.getLogin())
+      .open("/organizations/" + organization.getKey() + "/projects");
 
     $("#organization-navigation-more").click();
     $(By.linkText("Organization Page")).shouldBe(Condition.visible).click();