Skip to content

Commit 5d332ab

Browse files
refactor: update constructors to use PageObject directly for better context handling
1 parent 7d1f37e commit 5d332ab

10 files changed

Lines changed: 15 additions & 10 deletions

File tree

src/main/java/org/jenkinsci/test/acceptance/plugins/disk_usage/DiskUsage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
@PluginPageObject("disk-usage")
3232
public class DiskUsage extends PageObject {
3333

34-
public DiskUsage(Injector i, URL url) {
34+
public DiskUsage(PageObject i, URL url) {
3535
super(i, url);
3636
}
3737

src/main/java/org/jenkinsci/test/acceptance/plugins/gerrit_trigger/GerritTriggerJob.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class GerritTriggerJob extends PageObject {
5959
"/com-sonyericsson-hudson-plugins-gerrit-trigger-hudsontrigger-GerritTrigger/triggerOnEvents/commentAddedTriggerApprovalValue");
6060

6161
public GerritTriggerJob(Jenkins jenkins, String jobName) {
62-
super(jenkins.injector, jenkins.url("job/" + jobName + "/configure"));
62+
super(jenkins, jenkins.url("job/" + jobName + "/configure"));
6363
this.jenkins = jenkins;
6464
}
6565

src/main/java/org/jenkinsci/test/acceptance/plugins/gerrit_trigger/GerritTriggerNewServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class GerritTriggerNewServer extends PageObject {
3838
public final Control modeDefault = control("/mode[com.sonyericsson.hudson.plugins.gerrit.trigger.GerritServer]");
3939

4040
public GerritTriggerNewServer(Jenkins jenkins) {
41-
super(jenkins.injector, jenkins.url("gerrit-trigger/newServer"));
41+
super(jenkins, jenkins.url("gerrit-trigger/newServer"));
4242
this.jenkins = jenkins;
4343
}
4444

src/main/java/org/jenkinsci/test/acceptance/plugins/gerrit_trigger/GerritTriggerServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class GerritTriggerServer extends PageObject {
5959
private static final String serverUrl = "gerrit-trigger/server/";
6060

6161
public GerritTriggerServer(Jenkins jenkins, String serverName) {
62-
super(jenkins.injector, jenkins.url(serverUrl + serverName));
62+
super(jenkins, jenkins.url(serverUrl + serverName));
6363
this.jenkins = jenkins;
6464
}
6565

src/main/java/org/jenkinsci/test/acceptance/po/Artifact.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class Artifact extends PageObject {
1919
private final @NonNull String path;
2020

2121
public Artifact(@NonNull Build build, @NonNull String path) {
22-
super(build.injector, build.url("artifact/%s", path));
22+
super(build, build.url("artifact/%s", path));
2323
this.build = build;
2424
this.path = path;
2525
}

src/main/java/org/jenkinsci/test/acceptance/po/BuildHistory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ public class BuildHistory extends PageObject {
1616
private static final Pattern CONSOLE_LINK_PATTERN = Pattern.compile("/job/(.+?)/(\\d+)/console");
1717

1818
public BuildHistory(Node parent) {
19-
super(parent.injector, parent.url("builds"));
19+
super(parent, parent.url("builds"));
2020
}
2121

2222
public BuildHistory(View parent) {
23-
super(parent.injector, parent.url("builds"));
23+
super(parent, parent.url("builds"));
2424
}
2525

2626
public Set<Build> getBuilds() {

src/main/java/org/jenkinsci/test/acceptance/po/PageObject.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ public abstract class PageObject extends CapybaraPortingLayerImpl {
4747

4848
private static final RandomNameGenerator RND = new RandomNameGenerator();
4949

50+
/**
51+
* @deprecated Use {@link #PageObject(PageObject, URL)} instead to preserve per-test context.
52+
* Classes extending PageObject should pass the parent context to maintain proper test context.
53+
*/
54+
@Deprecated
5055
public PageObject(Injector injector, URL url) {
5156
super(injector);
5257
this.url = url;

src/main/java/org/jenkinsci/test/acceptance/po/WizardCreateAdminUser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class WizardCreateAdminUser extends PageObject {
4949
JenkinsController controller;
5050

5151
public WizardCreateAdminUser(Jenkins jenkins) {
52-
super(jenkins.injector, jenkins.url(""));
52+
super(jenkins, jenkins.url(""));
5353
}
5454

5555
public WizardCreateAdminUser createAdminUser(String userName, String password, String fullName, String email) {

src/main/java/org/jenkinsci/test/acceptance/po/WizardLogin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class WizardLogin extends PageObject {
4747
private Control cLogin = control("/Continue");
4848

4949
public WizardLogin(Jenkins jenkins) {
50-
super(jenkins.injector, jenkins.url(""));
50+
super(jenkins, jenkins.url(""));
5151
}
5252

5353
/**

src/main/java/org/jenkinsci/test/acceptance/utils/pluginTests/SecurityDisabler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class SecurityDisabler extends PageObject {
3535
public final Jenkins jenkins;
3636

3737
public SecurityDisabler(Jenkins jenkins) {
38-
super(jenkins.injector, jenkins.url("configureSecurity"));
38+
super(jenkins, jenkins.url("configureSecurity"));
3939
this.jenkins = jenkins;
4040
}
4141

0 commit comments

Comments
 (0)