Reactivate and simplify UiTest

diff --git a/it/it-tests/src/test/java/it/ui/UiTest.java b/it/it-tests/src/test/java/it/ui/UiTest.java
index 5bebfc5cb00741d67f0d1c22a886531593f1c9ec..66a90fbc6d6d7f97dfc11ae506289249c32554e0 100644 (file)
--- a/it/it-tests/src/test/java/it/ui/UiTest.java
+++ b/it/it-tests/src/test/java/it/ui/UiTest.java
@@ -23,7 +23,6 @@ import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.selenium.Selenese;
 import it.Category4Suite;
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import util.QaOnly;
@@ -36,7 +35,6 @@ public class UiTest {
   public static Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
 
   @Test
-  @Ignore("Temporary disable to allow 5.6-RC1 to be released")
   public void test_footer() {
     new SeleneseTest(
       Selenese.builder().setHtmlTestsInClasspath("ui-footer",

diff --git a/it/it-tests/src/test/resources/ui/UiTest/footer.html b/it/it-tests/src/test/resources/ui/UiTest/footer.html
index ff45d7cda98c8e77e3ea230699fc8bf55b5c776c..4fea7c4a5d9094a3d0cf4d4324685cd1de3e5b3f 100644 (file)
--- a/it/it-tests/src/test/resources/ui/UiTest/footer.html
+++ b/it/it-tests/src/test/resources/ui/UiTest/footer.html
@@ -13,21 +13,16 @@
   </thead>
   <tbody>
   <tr>
-    <td>open</td>
-    <td>/</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>waitForText</td>
-    <td>footer</td>
-    <td>*This application is based on SonarQube™ but is not an official version provided by SonarSource SA*</td>
-  </tr>
-  <tr>
-    <td>waitForText</td>
-    <td>footer</td>
-    <td>*Version *.*-* - Community - Documentation - Get Support - Plugins*</td>
-  </tr>
-  </tbody>
+       <td>open</td>
+       <td>/</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForText</td>
+       <td>footer</td>
+       <td>*SonarSource SA*</td>
+</tr>
+</tbody>
 </table>
 </body>
 </html>