aboutsummaryrefslogtreecommitdiffstats
path: root/it
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2016-05-20 17:48:47 +0200
committerJulien Lancelot <julien.lancelot@sonarsource.com>2016-05-20 17:48:47 +0200
commitb8319286756e4b03edf2605dd25533ad7fa64da6 (patch)
tree10cc2d8805c312e1fe33d87fa36d1718d27b4429 /it
parent22e7e82183aa9fec5d414e4947605b5f4af9597e (diff)
downloadsonarqube-b8319286756e4b03edf2605dd25533ad7fa64da6.tar.gz
sonarqube-b8319286756e4b03edf2605dd25533ad7fa64da6.zip
Reactivate and simplify UiTest
Diffstat (limited to 'it')
-rw-r--r--it/it-tests/src/test/java/it/ui/UiTest.java2
-rw-r--r--it/it-tests/src/test/resources/ui/UiTest/footer.html25
2 files changed, 10 insertions, 17 deletions
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 5bebfc5cb00..66a90fbc6d6 100644
--- 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 ff45d7cda98..4fea7c4a5d9 100644
--- 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>