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 3277341cfb30c39fa9b8cb81a945b451bf011002..e267926dce1d125b2bb5b9eb7bcdc47cf01e5b88 100644 (file)
--- 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 2efd912a4c5057476447bdef67b7dab89df36131..09cc242c6bae81df301d7166159fb04c75376bfa 100644 (file)
--- 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();