diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProject.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProject.java index 7a844e1bc..abe8b3727 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProject.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProject.java @@ -1,16 +1,16 @@ package net.serenitybdd.screenplay.interacting_with_jenkins_api.interactions; -import net.serenitybdd.screenplay.Action; +import net.serenitybdd.screenplay.Interaction; import static net.serenitybdd.screenplay.Tasks.instrumented; public class NotifyOfExternalProject { - public static Action successOf(String project) { + public static Interaction successOf(String project) { return instrumented(NotifyOfExternalProjectSuccess.class, project); } - public static Action failureOf(String project) { + public static Interaction failureOf(String project) { return instrumented(NotifyOfExternalProjectFailure.class, project); } } diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProjectFailure.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProjectFailure.java index edbebbe43..37e69d8f0 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProjectFailure.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProjectFailure.java @@ -1,11 +1,11 @@ package net.serenitybdd.screenplay.interacting_with_jenkins_api.interactions; -import net.serenitybdd.screenplay.Action; import net.serenitybdd.screenplay.Actor; +import net.serenitybdd.screenplay.Interaction; import net.serenitybdd.screenplay.interacting_with_jenkins_api.abilities.InteractWithJenkinsAPI; import net.thucydides.core.annotations.Step; -class NotifyOfExternalProjectFailure implements Action { +class NotifyOfExternalProjectFailure implements Interaction { @Override @Step("{0} notifies Jenkins that the '#project' has failed") public void performAs(T actor) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProjectSuccess.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProjectSuccess.java index 27d4a30ed..bce9c15e4 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProjectSuccess.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProjectSuccess.java @@ -1,11 +1,11 @@ package net.serenitybdd.screenplay.interacting_with_jenkins_api.interactions; -import net.serenitybdd.screenplay.Action; import net.serenitybdd.screenplay.Actor; +import net.serenitybdd.screenplay.Interaction; import net.serenitybdd.screenplay.interacting_with_jenkins_api.abilities.InteractWithJenkinsAPI; import net.thucydides.core.annotations.Step; -class NotifyOfExternalProjectSuccess implements Action { +class NotifyOfExternalProjectSuccess implements Interaction { @Override @Step("{0} notifies Jenkins that the '#project' has succeeded") public void performAs(T actor) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/Choose.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/Choose.java index 6dbae9956..3267da209 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/Choose.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/Choose.java @@ -1,14 +1,14 @@ package net.serenitybdd.screenplay.jenkins.actions; -import net.serenitybdd.screenplay.Action; import net.serenitybdd.screenplay.Actor; +import net.serenitybdd.screenplay.Interaction; import net.serenitybdd.screenplay.actions.Click; import net.serenitybdd.screenplay.targets.Target; import static net.serenitybdd.screenplay.Tasks.instrumented; -public class Choose implements Action{ - public static Action the(Target radioButton) { +public class Choose implements Interaction { + public static Interaction the(Target radioButton) { return instrumented(Choose.class, radioButton); } diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/EnterCode.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/EnterCode.java index ac2b0450e..37be30b06 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/EnterCode.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/EnterCode.java @@ -1,7 +1,7 @@ package net.serenitybdd.screenplay.jenkins.actions; -import net.serenitybdd.screenplay.Action; import net.serenitybdd.screenplay.Actor; +import net.serenitybdd.screenplay.Interaction; import net.serenitybdd.screenplay.actions.Click; import net.serenitybdd.screenplay.targets.Target; import net.serenitybdd.screenplayx.actions.Evaluate; @@ -17,11 +17,11 @@ public static EnterCode asFollows(String... lines) { return new EnterCode(asList(lines)); } - public Action intoTheCodeMirror(Target editorField) { + public Interaction intoTheCodeMirror(Target editorField) { return instrumented(EnterCodeIntoCodeMirrorEditor.class, editorField, String.join(System.lineSeparator(), lines)); } - public Action intoThePipelineEditor(Target editorField) { + public Interaction intoThePipelineEditor(Target editorField) { return instrumented(EnterCodeIntoPipelineEditor.class, editorField, String.join(System.lineSeparator(), lines)); } @@ -31,7 +31,7 @@ public EnterCode(List lines) { private final List lines; - public static class EnterCodeIntoCodeMirrorEditor implements Action { + public static class EnterCodeIntoCodeMirrorEditor implements Interaction { private final Target target; private final String code; @@ -69,7 +69,7 @@ private String escapeNewLineCharacters(String code) { } } - private static class EnterCodeIntoPipelineEditor implements Action { + private static class EnterCodeIntoPipelineEditor implements Interaction { private final Target target; private final String code; diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/Evaluate.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/Evaluate.java index 0fa73828f..326db8d61 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/Evaluate.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/Evaluate.java @@ -1,13 +1,13 @@ package net.serenitybdd.screenplayx.actions; import net.serenitybdd.core.steps.Instrumented; -import net.serenitybdd.screenplay.Action; import net.serenitybdd.screenplay.Actor; +import net.serenitybdd.screenplay.Interaction; import net.serenitybdd.screenplay.abilities.BrowseTheWeb; import org.openqa.selenium.JavascriptExecutor; // the original implementation has a side-effect of injecting the jQuery library, which conflicts with Jenkins' prototype.js -public class Evaluate implements Action { +public class Evaluate implements Interaction { private final String expression; private Object[] parameters; diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/Navigate.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/Navigate.java index def288e8c..b5e41f383 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/Navigate.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/Navigate.java @@ -1,14 +1,14 @@ package net.serenitybdd.screenplayx.actions; -import net.serenitybdd.screenplay.Action; import net.serenitybdd.screenplay.Actor; +import net.serenitybdd.screenplay.Interaction; import net.serenitybdd.screenplay.abilities.BrowseTheWeb; import java.net.URL; import static net.serenitybdd.screenplay.Tasks.instrumented; -public class Navigate implements Action { +public class Navigate implements Interaction { private final URL destination; diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/ScrollToTarget.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/ScrollToTarget.java index 9c819fc3e..dae6dbb83 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/ScrollToTarget.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/ScrollToTarget.java @@ -1,7 +1,7 @@ package net.serenitybdd.screenplayx.actions; -import net.serenitybdd.screenplay.Action; import net.serenitybdd.screenplay.Actor; +import net.serenitybdd.screenplay.Interaction; import net.serenitybdd.screenplay.targets.Target; import java.util.HashMap; @@ -9,7 +9,7 @@ import org.openqa.selenium.WebElement; -public class ScrollToTarget implements Action { +public class ScrollToTarget implements Interaction { private static final Map centerAlignOptions;