From a2cbc2c571855b1137ac80d32e054e6f8d78fc6e Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Tue, 21 Jun 2016 18:18:33 +0200 Subject: [PATCH] Fix ITs --- its/pom.xml | 4 ++-- .../sonar/it/jenkins/orchestrator/JenkinsOrchestrator.java | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/its/pom.xml b/its/pom.xml index e6e3674e..8038ccc3 100644 --- a/its/pom.xml +++ b/its/pom.xml @@ -19,7 +19,7 @@ -server - 1.580.3 + 1.651.3 @@ -44,7 +44,7 @@ org.jenkins-ci.main cli - 1.596.1 + 1.651.3 diff --git a/its/src/test/java/com/sonar/it/jenkins/orchestrator/JenkinsOrchestrator.java b/its/src/test/java/com/sonar/it/jenkins/orchestrator/JenkinsOrchestrator.java index 9d670e27..1ca18542 100644 --- a/its/src/test/java/com/sonar/it/jenkins/orchestrator/JenkinsOrchestrator.java +++ b/its/src/test/java/com/sonar/it/jenkins/orchestrator/JenkinsOrchestrator.java @@ -58,7 +58,6 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.firefox.FirefoxDriver; import org.openqa.selenium.firefox.FirefoxProfile; -import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.Select; import org.openqa.selenium.support.ui.WebDriverWait; import org.slf4j.Logger; @@ -352,8 +351,6 @@ public WebElement scrollTo(WebElement e) { public JenkinsOrchestrator configureSQScannerInstallation(String version, int index) { driver.get(server.getUrl() + "/configure"); - WebDriverWait wait = new WebDriverWait(driver, 5); - wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("footer"), "Page generated")); SonarScannerInstaller installer = new SonarScannerInstaller(config.fileSystem()); File runnerScript = installer.install(Version.create(version), config.fileSystem().workspace(), true); @@ -378,8 +375,6 @@ private String getSQScannerInstallName(String version) { public JenkinsOrchestrator configureMsBuildSQScanner_installation(String version, int index) { driver.get(server.getUrl() + "/configure"); - WebDriverWait wait = new WebDriverWait(driver, 5); - wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("footer"), "Page generated")); if (index > 0) { findElement(buttonByText("SonarQube Scanner for MSBuild installations...")).click();