From 298b3f58af36a48512dedd058ddc4f4d1c122715 Mon Sep 17 00:00:00 2001
From: Teryk Bellahsene
Date: Mon, 25 Jul 2016 11:24:22 +0200
Subject: [PATCH] SONAR-7916 Remove built-in default project dashboard
---
.../it/componentDashboard/DashboardTest.java | 3 -
.../global_dashboard/default-dashboards.html | 45 ----------
.../order-project-default-dashboards.html | 89 -------------------
.../template/ProjectCustomDashboard.java | 79 ----------------
.../server/dashboard/ws/DashboardsWs.java | 1 +
.../platformlevel/PlatformLevel4.java | 2 -
.../template/ProjectCustomDashboardTest.java | 69 --------------
.../ProjectCustomDashboardTest/filters.xml | 33 -------
8 files changed, 1 insertion(+), 320 deletions(-)
delete mode 100644 it/it-tests/src/test/resources/componentDashboard/DashboardTest/global_dashboard/order-project-default-dashboards.html
delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/dashboard/template/ProjectCustomDashboard.java
delete mode 100644 server/sonar-server/src/test/java/org/sonar/server/dashboard/template/ProjectCustomDashboardTest.java
delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/dashboard/template/ProjectCustomDashboardTest/filters.xml
diff --git a/it/it-tests/src/test/java/it/componentDashboard/DashboardTest.java b/it/it-tests/src/test/java/it/componentDashboard/DashboardTest.java
index 8c2d3bf345e..4ef6c3000e9 100644
--- a/it/it-tests/src/test/java/it/componentDashboard/DashboardTest.java
+++ b/it/it-tests/src/test/java/it/componentDashboard/DashboardTest.java
@@ -58,9 +58,6 @@ public class DashboardTest {
// SONAR-4630
"/componentDashboard/DashboardTest/global_dashboard/create-global-dashboards-error.html",
- // SONAR-3461
- "/componentDashboard/DashboardTest/global_dashboard/order-project-default-dashboards.html",
-
// SONAR-3462
"/componentDashboard/DashboardTest/global_dashboard/order-global-dashboard.html",
diff --git a/it/it-tests/src/test/resources/componentDashboard/DashboardTest/global_dashboard/default-dashboards.html b/it/it-tests/src/test/resources/componentDashboard/DashboardTest/global_dashboard/default-dashboards.html
index 9a6439c22af..3bc101132a4 100644
--- a/it/it-tests/src/test/resources/componentDashboard/DashboardTest/global_dashboard/default-dashboards.html
+++ b/it/it-tests/src/test/resources/componentDashboard/DashboardTest/global_dashboard/default-dashboards.html
@@ -53,51 +53,6 @@
remove-Home |
|
-
- waitForText |
- activeProject |
- *Custom* |
-
-
- assertNotText |
- shared |
- *Custom* |
-
-
- clickAndWait |
- id=remove-Custom |
- |
-
-
- assertConfirmation |
- Are you sure to remove it from default dashboards? |
- |
-
-
- waitForText |
- shared |
- *Custom* |
-
-
- assertNotText |
- activeProject |
- *Custom* |
-
-
- clickAndWait |
- add-Custom |
- |
-
-
- waitForText |
- activeProject |
- *Custom* |
-
-
- assertNotText |
- shared |
- *Custom* |
-
-
-
-
- order-project-default-dashboards |
-
-
-
-
- open |
- /sessions/login |
- |
-
-
- type |
- login |
- admin |
-
-
- type |
- password |
- admin |
-
-
- clickAndWait |
- commit |
- |
-
-
- open |
- /admin_dashboards |
- |
-
-
- assertTextPresent |
- Project Dashboards |
- |
-
-
- assertTable |
- id=activeProject.1.0 |
- Custom |
-
-
- assertTable |
- id=activeProject.2.0 |
- Fake Fake dashboard for integration tests |
-
-
- clickAndWait |
- id=up-Fake |
- |
-
-
- assertTable |
- id=activeProject.1.0 |
- Fake Fake dashboard for integration tests |
-
-
- assertTable |
- id=activeProject.2.0 |
- Custom |
-
-
- clickAndWait |
- id=down-Fake |
- |
-
-
- assertTable |
- id=activeProject.1.0 |
- Custom |
-
-
- assertTable |
- id=activeProject.2.0 |
- Fake Fake dashboard for integration tests |
-
-
-
-
diff --git a/it/it-tests/src/test/resources/componentDashboard/DashboardTest/global_dashboard/order-project-default-dashboards.html b/it/it-tests/src/test/resources/componentDashboard/DashboardTest/global_dashboard/order-project-default-dashboards.html
deleted file mode 100644
index e0281f68124..00000000000
--- a/it/it-tests/src/test/resources/componentDashboard/DashboardTest/global_dashboard/order-project-default-dashboards.html
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-