Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace deprecated net.serenitybdd.screenplay.Action with non-deprecated net.serenitybdd.screenplay.Interaction #567

Merged
merged 1 commit into from
Feb 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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);
}
}
Original file line number Diff line number Diff line change
@@ -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 <T extends Actor> void performAs(T actor) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <T extends Actor> void performAs(T actor) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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));
}

Expand All @@ -31,7 +31,7 @@ public EnterCode(List<String> lines) {

private final List<String> lines;

public static class EnterCodeIntoCodeMirrorEditor implements Action {
public static class EnterCodeIntoCodeMirrorEditor implements Interaction {

private final Target target;
private final String code;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
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;
import java.util.Map;

import org.openqa.selenium.WebElement;

public class ScrollToTarget implements Action {
public class ScrollToTarget implements Interaction {

private static final Map<String, String> centerAlignOptions;

Expand Down