Skip to content

Commit edb8c39

Browse files
RanjitCStimja
andauthored
Adapt CasC test to new UI changes (#2605)
--------- Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
1 parent 65db170 commit edb8c39

2 files changed

Lines changed: 14 additions & 3 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ and
787787
<id>lts</id>
788788
<properties>
789789
<!--RENOVATE-LTS-->
790-
<jenkins.version>2.528.3</jenkins.version>
790+
<jenkins.version>2.541.1</jenkins.version>
791791
</properties>
792792
</profile>
793793
</profiles>

src/main/java/org/jenkinsci/test/acceptance/plugins/configuration_as_code/JcascManage.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,13 @@
2828
import static org.hamcrest.Matchers.not;
2929

3030
import java.time.Duration;
31+
import org.jenkinsci.test.acceptance.po.Conditions;
3132
import org.jenkinsci.test.acceptance.po.Control;
3233
import org.jenkinsci.test.acceptance.po.FormValidation;
3334
import org.jenkinsci.test.acceptance.po.Jenkins;
3435
import org.jenkinsci.test.acceptance.po.PageObject;
36+
import org.openqa.selenium.By;
37+
import org.openqa.selenium.NoSuchElementException;
3538

3639
public class JcascManage extends PageObject {
3740
public JcascManage(Jenkins jenkins) {
@@ -42,6 +45,14 @@ public JcascManage(Jenkins jenkins) {
4245
* Configure and apply the new source
4346
*/
4447
public void configure(String path) {
48+
visit("#new");
49+
50+
waitFor(driver)
51+
.withTimeout(Duration.ofSeconds(10))
52+
.pollingEvery(Duration.ofMillis(100))
53+
.ignoring(NoSuchElementException.class)
54+
.until(Conditions.waitForElementAnimationToFinish(By.cssSelector("dialog[open]")));
55+
4556
Control control = control("/newSource");
4657
control.set(path);
4758
waitFor()
@@ -54,12 +65,12 @@ public void configure(String path) {
5465
return true;
5566
});
5667

57-
clickButton("Apply new configuration");
68+
clickButton("Apply configuration");
5869
verifySuccessfulApplication();
5970
}
6071

6172
public void reload() {
62-
clickButton("Reload existing configuration");
73+
find(by.name("reload")).click();
6374
verifySuccessfulApplication();
6475
}
6576

0 commit comments

Comments
 (0)