Updated smoke tests

IvanLiulko · Dec 6, 2018 · 63750cc · 63750cc
1 parent ef2ada9
commit 63750cc
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 10 deletions.
diff --git a/serenity-smoketests/pom.xml b/serenity-smoketests/pom.xml
@@ -11,8 +11,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <serenity.version>1.2.3-</serenity.version>
-        <serenity.maven.version>1.2.2</serenity.maven.version>
+        <serenity.version>2.0.21-SNAPSHOT</serenity.version>
+        <serenity.maven.version>2.0.20</serenity.maven.version>
         <parallel.tests>4</parallel.tests>
         <browserstack.url></browserstack.url>
         <browserstack.os></browserstack.os>

diff --git a/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/pages/ApplicationHomePage.java b/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/pages/ApplicationHomePage.java
@@ -8,7 +8,7 @@
 @DefaultUrl("http://todomvc.com/examples/angularjs/#/")
 public class ApplicationHomePage extends PageObject {
     public void waitForTheApplicationToLoad() {
-        withTimeoutOf(60, TimeUnit.SECONDS).waitFor("#new-todo");
+        withTimeoutOf(60, TimeUnit.SECONDS).waitFor(".new-todo");
     }
 
     public void openApplication() {

diff --git a/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/pages/TodoPage.java b/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/pages/TodoPage.java
@@ -19,7 +19,7 @@ public class TodoPage extends PageObject {
     public static final String COMPLETE_TICKBOX = ".//input[@ng-model='todo.completed']";
 
     public void addAnActionCalled(String actionName) {
-        $("#new-todo").type(actionName)
+        $(".new-todo").type(actionName)
                       .then().sendKeys(Keys.ENTER);
     }
 
@@ -68,6 +68,6 @@ public void updateAction(String currentActionName, String newActionName) {
     }
 
     public void clearCompletedActions() {
-        $("#clear-completed").click();
+        $(".clear-completed").click();
     }
 }
diff --git a/...nity-smoketests/src/main/java/net/serenitybdd/demos/todos/pages/components/FilterBar.java b/...nity-smoketests/src/main/java/net/serenitybdd/demos/todos/pages/components/FilterBar.java
@@ -3,7 +3,7 @@
 import net.serenitybdd.screenplay.targets.Target;
 
 public class FilterBar {
-    public static final Target CLEAR_COMPLETED = Target.the("Clear completed button").locatedBy("#clear-completed");
+    public static final Target CLEAR_COMPLETED = Target.the("Clear completed button").locatedBy(".clear-completed");
 
     public static Target filterCalled(String name) {
         String FILTER_BUTTON = "//a[.='%s']";

diff --git a/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/pages/components/ToDoList.java b/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/pages/components/ToDoList.java
@@ -3,7 +3,7 @@
 import net.serenitybdd.screenplay.targets.Target;
 
 public class ToDoList {
-    public static Target NEW_TODO_FIELD = Target.the("New Todo Field").locatedBy("#new-todo");
+    public static Target NEW_TODO_FIELD = Target.the("New Todo Field").locatedBy(".new-todo");
     public static String TODO_ITEMS = ".view label";
 
     public static Target deleteButtonForItem(String itemName) {

diff --git a/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/tasks/AddItems.java b/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/tasks/AddItems.java
@@ -5,6 +5,7 @@
 import net.serenitybdd.screenplay.Performable;
 import net.serenitybdd.screenplay.actions.Open;
 import net.thucydides.core.annotations.Step;
+import static java.util.Arrays.asList;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public AddItems called(List<String> thingsToDo) {
     }
 
     public AddItems called(String... thingsToDo) {
-        return called(new ArrayList<>(thingsToDo));
+        return called(asList(thingsToDo));
     }
 
 }
diff --git a/...sts/src/test/java/net/serenitybdd/demos/todos/features/update_my_todos/CompleteTodos.java b/...sts/src/test/java/net/serenitybdd/demos/todos/features/update_my_todos/CompleteTodos.java
@@ -47,4 +47,4 @@ public void should_be_able_to_clear_completed_actions_from_the_todo_list() {
     @Ignore
     public void shouldBeAbleToIgnoreStuff() {
     }
-}
+}
diff --git a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/serenity/ATodoUser.java b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/serenity/ATodoUser.java
@@ -4,6 +4,8 @@
 import net.serenitybdd.demos.todos.pages.ApplicationHomePage;
 import net.serenitybdd.demos.todos.pages.TodoPage;
 import net.thucydides.core.annotations.Step;
+import static java.util.Arrays.asList;
+
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -24,7 +26,7 @@ public void adds_an_action_called(String actionName) {
 
     @Step("Joe completed **many** tasks")
     public void has_added_actions_called(String... actionNames) {
-        newArrayList(actionNames).forEach(
+        asList(actionNames).forEach(
                 action -> adds_an_action_called(action)
         );
     }
-Original file line number
+Diff line change
@@ Expand Up @@
         @Ignore
         public void shouldBeAbleToIgnoreStuff() {
         }
-    }
+    }