From 4011999bf846ee7d52727d48c3a7e817f47838c9 Mon Sep 17 00:00:00 2001 From: John Ferguson Smart Date: Sun, 6 Aug 2023 09:17:10 +0100 Subject: [PATCH] Fixed an issue with Saucelabs updates --- .github/workflows/ci_build.yml | 4 +- .../core/model/SampleTestResults.groovy | 1 - .../saucelabs/AfterASauceLabsScenario.java | 39 ++++++++++++++++--- serenity-smoketests/pom.xml | 2 +- .../todos/pageobjects/pages/TodoListPage.java | 2 +- .../pageobjects/pages/TodoMVCHomePage.java | 2 +- .../pageobjects/steps/TodoUserSteps.java | 2 +- .../todos/screenplay/actions/JSClick.java | 2 +- .../todos/screenplay/tasks/AddTodoItems.java | 2 +- .../AddDifferentSortsOfTodos.java | 8 ++-- .../LearnAboutTheApplication.java | 8 ++-- .../completing_todos/CompleteATodo.java | 8 ++-- .../completing_todos/ToggleAllTodos.java | 4 +- .../ClearCompletedTodos.java | 6 +-- .../maintain_my_todo_list/DeleteTodos.java | 6 +-- .../maintain_my_todo_list/FilteringTodos.java | 6 +-- .../TodosBelongToAUser.java | 2 +- .../features/record_todos/AddNewTodos.java | 4 +- .../LearnAboutTheApplication.java | 6 +-- .../completing_todos/CompleteATodo.java | 6 +-- .../ClearCompletedTodos.java | 6 +-- .../maintain_my_todo_list/DeleteTodos.java | 6 +-- .../maintain_my_todo_list/FilteringTodos.java | 6 +-- .../TodosBelongToAUser.java | 6 +-- .../features/record_todos/AddNewTodos.java | 6 +-- 25 files changed, 88 insertions(+), 62 deletions(-) diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml index 9682e7d977..99fc3136e5 100644 --- a/.github/workflows/ci_build.yml +++ b/.github/workflows/ci_build.yml @@ -9,11 +9,11 @@ jobs: steps: - uses: actions/checkout@v2 # Update to v2 - - name: Set up JDK 17 + - name: Set up JDK 11 uses: actions/setup-java@v2 # Update to v2 with: distribution: 'temurin' # 'temurin' distribution provides OpenJ9 builds of the OpenJDK - java-version: '17' + java-version: '11' - name: Cache the Maven packages to speed up build uses: actions/cache@v2 # Update to v2 diff --git a/serenity-core/src/test/groovy/net/thucydides/core/model/SampleTestResults.groovy b/serenity-core/src/test/groovy/net/thucydides/core/model/SampleTestResults.groovy index e3fac32a3d..a773dad41d 100644 --- a/serenity-core/src/test/groovy/net/thucydides/core/model/SampleTestResults.groovy +++ b/serenity-core/src/test/groovy/net/thucydides/core/model/SampleTestResults.groovy @@ -121,7 +121,6 @@ class SampleTestResults { testOutcome2.addTags(Lists.asList(TestTag.withName("Apples").andType("feature"))); testOutcome2.addTags(Lists.asList(TestTag.withName("Picking apples").andType("story"))); - return [testOutcome1, testOutcome2] } diff --git a/serenity-saucelabs/src/main/java/net/serenitybdd/plugins/saucelabs/AfterASauceLabsScenario.java b/serenity-saucelabs/src/main/java/net/serenitybdd/plugins/saucelabs/AfterASauceLabsScenario.java index 7c27e032cd..50d021d31a 100644 --- a/serenity-saucelabs/src/main/java/net/serenitybdd/plugins/saucelabs/AfterASauceLabsScenario.java +++ b/serenity-saucelabs/src/main/java/net/serenitybdd/plugins/saucelabs/AfterASauceLabsScenario.java @@ -1,5 +1,6 @@ package net.serenitybdd.plugins.saucelabs; +import com.google.gson.JsonObject; import net.serenitybdd.core.webdriver.RemoteDriver; import net.serenitybdd.core.webdriver.enhancers.AfterAWebdriverScenario; import net.serenitybdd.plugins.CapabilityTags; @@ -10,6 +11,13 @@ import org.openqa.selenium.WebDriver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.http.client.methods.HttpPut; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; + +import java.util.Arrays; +import java.util.Base64; public class AfterASauceLabsScenario implements AfterAWebdriverScenario { @@ -29,7 +37,6 @@ public void apply(EnvironmentVariables environmentVariables, TestOutcome testOut sessionId = RemoteDriver.of(driver).getSessionId().toString(); } String userName = SauceLabsCredentials.from(environmentVariables).getUser(); - String key = SauceLabsCredentials.from(environmentVariables).getAccessKey(); if (userName == null || key == null) { @@ -40,16 +47,36 @@ public void apply(EnvironmentVariables environmentVariables, TestOutcome testOut + "You can find both of these here: https://app.saucelabs.com/user-settings" ); } else { - ((JavascriptExecutor)driver).executeScript("job-build=" + BuildName.from(environmentVariables)); - ((JavascriptExecutor)driver).executeScript("job-tags=" + CapabilityTags.tagsFrom(testOutcome, environmentVariables)); - - String result = (testOutcome.isSuccess()) ? "passed" : "failed"; - ((JavascriptExecutor)driver).executeScript("job-result=" + result); +// ((JavascriptExecutor) driver).executeScript("sauce:job-build=" + BuildName.from(environmentVariables)); +// ((JavascriptExecutor)driver).executeScript("sauce:job-tags=" + CapabilityTags.tagsFrom(testOutcome, environmentVariables)); +// +// String result = (testOutcome.isSuccess()) ? "passed" : "failed"; +// ((JavascriptExecutor)driver).executeScript("sauce:job-result=" + result); SauceLabsTestSession sauceLabsTestSession = new SauceLabsTestSession(userName, key, sessionId); String publicUrl = sauceLabsTestSession.getTestLink(); testOutcome.setLink(new ExternalLink(publicUrl, "SauceLabs")); + + String result = (testOutcome.isSuccess()) ? "passed" : "failed"; + String tags = Arrays.toString(CapabilityTags.tagsFrom(testOutcome, environmentVariables)); + try (CloseableHttpClient httpClient = HttpClients.createDefault()) { + String jobUrl = "https://saucelabs.com/rest/v1/" + userName + "/jobs/" + sessionId; + HttpPut putRequest = new HttpPut(jobUrl); + putRequest.setHeader("Content-Type", "application/json"); + putRequest.setHeader("Authorization", "Basic " + Base64.getEncoder().encodeToString((userName + ":" + key).getBytes())); + + JsonObject json = new JsonObject(); + json.addProperty("build", BuildName.from(environmentVariables)); + json.addProperty("tags", tags); + json.addProperty("passed", result.equals("passed")); + + putRequest.setEntity(new StringEntity(json.toString())); + + httpClient.execute(putRequest); + } catch (Exception e) { + // Handle exception + } } } diff --git a/serenity-smoketests/pom.xml b/serenity-smoketests/pom.xml index 0a7e1e3615..7f60af9701 100644 --- a/serenity-smoketests/pom.xml +++ b/serenity-smoketests/pom.xml @@ -5,7 +5,7 @@ serenity-bdd net.serenity-bdd - 4.0.0-beta-2-SNAPSHOT + 4.0.0-beta-1 serenity-smoketests jar diff --git a/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/pageobjects/pages/TodoListPage.java b/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/pageobjects/pages/TodoListPage.java index 718b4f517f..8d71d49a20 100644 --- a/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/pageobjects/pages/TodoListPage.java +++ b/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/pageobjects/pages/TodoListPage.java @@ -5,7 +5,7 @@ import net.serenitybdd.core.pages.WebElementFacade; import net.serenitybdd.demos.todos.pageobjects.model.TodoStatus; import net.serenitybdd.demos.todos.pageobjects.model.TodoStatusFilter; -import net.thucydides.core.annotations.DefaultUrl; +import net.serenitybdd.annotations.DefaultUrl; import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/pageobjects/pages/TodoMVCHomePage.java b/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/pageobjects/pages/TodoMVCHomePage.java index 5d07019321..9c47de8a71 100644 --- a/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/pageobjects/pages/TodoMVCHomePage.java +++ b/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/pageobjects/pages/TodoMVCHomePage.java @@ -1,7 +1,7 @@ package net.serenitybdd.demos.todos.pageobjects.pages; import net.serenitybdd.core.pages.PageObject; -import net.thucydides.core.annotations.DefaultUrl; +import net.serenitybdd.annotations.DefaultUrl; @DefaultUrl("http://todomvc.com/") public class TodoMVCHomePage extends PageObject {} diff --git a/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/pageobjects/steps/TodoUserSteps.java b/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/pageobjects/steps/TodoUserSteps.java index a076b5ad76..90d62cb9c6 100644 --- a/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/pageobjects/steps/TodoUserSteps.java +++ b/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/pageobjects/steps/TodoUserSteps.java @@ -3,7 +3,7 @@ import net.serenitybdd.demos.todos.pageobjects.model.TodoStatusFilter; import net.serenitybdd.demos.todos.pageobjects.pages.TodoListPage; import net.thucydides.model.ThucydidesSystemProperty; -import net.thucydides.model.annotations.Step; +import net.serenitybdd.annotations.Step; import net.thucydides.model.util.EnvironmentVariables; import static java.util.Arrays.asList; diff --git a/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/screenplay/actions/JSClick.java b/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/screenplay/actions/JSClick.java index ae0bf96ede..c631d42525 100644 --- a/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/screenplay/actions/JSClick.java +++ b/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/screenplay/actions/JSClick.java @@ -1,10 +1,10 @@ package net.serenitybdd.demos.todos.screenplay.actions; +import net.serenitybdd.annotations.Step; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Interaction; import net.serenitybdd.screenplay.abilities.BrowseTheWeb; import net.serenitybdd.screenplay.targets.Target; -import net.thucydides.model.annotations.Step; import org.openqa.selenium.WebElement; import static net.serenitybdd.screenplay.Tasks.instrumented; diff --git a/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/screenplay/tasks/AddTodoItems.java b/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/screenplay/tasks/AddTodoItems.java index f6b00a9250..25ca85159b 100644 --- a/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/screenplay/tasks/AddTodoItems.java +++ b/serenity-smoketests/src/main/java/net/serenitybdd/demos/todos/screenplay/tasks/AddTodoItems.java @@ -3,7 +3,7 @@ import com.google.common.collect.ImmutableList; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; -import net.thucydides.model.annotations.Step; +import net.serenitybdd.annotations.Step; import java.util.Collection; import java.util.List; diff --git a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/accessing_the_application/AddDifferentSortsOfTodos.java b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/accessing_the_application/AddDifferentSortsOfTodos.java index 5f44da93b4..ae95760249 100644 --- a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/accessing_the_application/AddDifferentSortsOfTodos.java +++ b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/accessing_the_application/AddDifferentSortsOfTodos.java @@ -2,10 +2,10 @@ import net.serenitybdd.demos.todos.pageobjects.steps.TodoUserSteps; import net.serenitybdd.junit.runners.SerenityParameterizedRunner; -import net.thucydides.core.annotations.Managed; -import net.thucydides.core.annotations.Steps; -import net.thucydides.model.annotations.WithTag; -import net.thucydides.core.annotations.WithTags; +import net.serenitybdd.annotations.Managed; +import net.serenitybdd.annotations.Steps; +import net.serenitybdd.annotations.WithTag; +import net.serenitybdd.annotations.WithTags; import net.thucydides.junit.annotations.Concurrent; import net.thucydides.junit.annotations.TestData; import org.junit.Before; diff --git a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/accessing_the_application/LearnAboutTheApplication.java b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/accessing_the_application/LearnAboutTheApplication.java index c5179998fc..ad83fff147 100644 --- a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/accessing_the_application/LearnAboutTheApplication.java +++ b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/accessing_the_application/LearnAboutTheApplication.java @@ -2,10 +2,10 @@ import net.serenitybdd.demos.todos.pageobjects.steps.TodoUserSteps; import net.serenitybdd.junit.runners.SerenityRunner; -import net.thucydides.core.annotations.Managed; -import net.thucydides.core.annotations.Steps; -import net.thucydides.model.annotations.WithTag; -import net.thucydides.core.annotations.WithTags; +import net.serenitybdd.annotations.Managed; +import net.serenitybdd.annotations.Steps; +import net.serenitybdd.annotations.WithTag; +import net.serenitybdd.annotations.WithTags; import org.junit.Test; import org.junit.runner.RunWith; import org.openqa.selenium.WebDriver; diff --git a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/completing_todos/CompleteATodo.java b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/completing_todos/CompleteATodo.java index f869701b63..811018d302 100644 --- a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/completing_todos/CompleteATodo.java +++ b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/completing_todos/CompleteATodo.java @@ -2,10 +2,10 @@ import net.serenitybdd.demos.todos.pageobjects.steps.TodoUserSteps; import net.serenitybdd.junit.runners.SerenityRunner; -import net.thucydides.core.annotations.Managed; -import net.thucydides.core.annotations.Steps; -import net.thucydides.model.annotations.WithTag; -import net.thucydides.core.annotations.WithTags; +import net.serenitybdd.annotations.Managed; +import net.serenitybdd.annotations.Steps; +import net.serenitybdd.annotations.WithTag; +import net.serenitybdd.annotations.WithTags; import org.junit.Assume; import org.junit.Before; import org.junit.Test; diff --git a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/completing_todos/ToggleAllTodos.java b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/completing_todos/ToggleAllTodos.java index 66425e36bb..acd99f1ce2 100644 --- a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/completing_todos/ToggleAllTodos.java +++ b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/completing_todos/ToggleAllTodos.java @@ -2,7 +2,7 @@ import net.serenitybdd.demos.todos.pageobjects.steps.TodoUserSteps; import net.serenitybdd.junit.runners.SerenityRunner; -import net.thucydides.core.annotations.*; +import net.serenitybdd.annotations.*; import org.junit.Test; import org.junit.runner.RunWith; import org.openqa.selenium.WebDriver; @@ -65,4 +65,4 @@ public void should_see_how_many_items_todo_when_all_are_toggled_to_incomplete_wi james.should_see_that_the_number_of_items_left_is(2); } -} \ No newline at end of file +} diff --git a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/maintain_my_todo_list/ClearCompletedTodos.java b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/maintain_my_todo_list/ClearCompletedTodos.java index 4876a2db21..4f9b1fb725 100644 --- a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/maintain_my_todo_list/ClearCompletedTodos.java +++ b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/maintain_my_todo_list/ClearCompletedTodos.java @@ -2,9 +2,9 @@ import net.serenitybdd.demos.todos.pageobjects.steps.TodoUserSteps; import net.serenitybdd.junit.runners.SerenityRunner; -import net.thucydides.core.annotations.Managed; -import net.thucydides.core.annotations.Steps; -import net.thucydides.model.annotations.WithTag; +import net.serenitybdd.annotations.Managed; +import net.serenitybdd.annotations.Steps; +import net.serenitybdd.annotations.WithTag; import org.junit.Test; import org.junit.runner.RunWith; import org.openqa.selenium.WebDriver; diff --git a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/maintain_my_todo_list/DeleteTodos.java b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/maintain_my_todo_list/DeleteTodos.java index 9d29794bc0..8f452a1fec 100644 --- a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/maintain_my_todo_list/DeleteTodos.java +++ b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/maintain_my_todo_list/DeleteTodos.java @@ -2,9 +2,9 @@ import net.serenitybdd.demos.todos.pageobjects.steps.TodoUserSteps; import net.serenitybdd.junit.runners.SerenityRunner; -import net.thucydides.core.annotations.Managed; -import net.thucydides.core.annotations.Steps; -import net.thucydides.model.annotations.WithTag; +import net.serenitybdd.annotations.Managed; +import net.serenitybdd.annotations.Steps; +import net.serenitybdd.annotations.WithTag; import org.junit.Test; import org.junit.runner.RunWith; import org.openqa.selenium.WebDriver; diff --git a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/maintain_my_todo_list/FilteringTodos.java b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/maintain_my_todo_list/FilteringTodos.java index 2479412bc8..bafc1d0963 100644 --- a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/maintain_my_todo_list/FilteringTodos.java +++ b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/maintain_my_todo_list/FilteringTodos.java @@ -3,9 +3,9 @@ import net.serenitybdd.demos.todos.pageobjects.model.TodoStatusFilter; import net.serenitybdd.demos.todos.pageobjects.steps.TodoUserSteps; import net.serenitybdd.junit.runners.SerenityRunner; -import net.thucydides.core.annotations.Managed; -import net.thucydides.core.annotations.Steps; -import net.thucydides.model.annotations.WithTag; +import net.serenitybdd.annotations.Managed; +import net.serenitybdd.annotations.Steps; +import net.serenitybdd.annotations.WithTag; import org.junit.Test; import org.junit.runner.RunWith; import org.openqa.selenium.WebDriver; diff --git a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/maintain_my_todo_list/TodosBelongToAUser.java b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/maintain_my_todo_list/TodosBelongToAUser.java index 4d6b880245..1f8cb9b86a 100644 --- a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/maintain_my_todo_list/TodosBelongToAUser.java +++ b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/maintain_my_todo_list/TodosBelongToAUser.java @@ -1,7 +1,7 @@ package net.serenitybdd.demos.todos.pageobjects.features.maintain_my_todo_list; import net.serenitybdd.junit.runners.SerenityRunner; -import net.thucydides.model.annotations.WithTag; +import net.serenitybdd.annotations.WithTag; import org.junit.Ignore; import org.junit.runner.RunWith; diff --git a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/record_todos/AddNewTodos.java b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/record_todos/AddNewTodos.java index 4a689e0404..07ae913444 100644 --- a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/record_todos/AddNewTodos.java +++ b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/pageobjects/features/record_todos/AddNewTodos.java @@ -2,7 +2,7 @@ import net.serenitybdd.demos.todos.pageobjects.steps.TodoUserSteps; import net.serenitybdd.junit.runners.SerenityRunner; -import net.thucydides.core.annotations.*; +import net.serenitybdd.annotations.*; import org.junit.Test; import org.junit.runner.RunWith; import org.openqa.selenium.WebDriver; @@ -38,4 +38,4 @@ public void should_be_able_to_add_additional_todo_items_with_page_objects() { james.should_see_that_displayed_items_contain("Walk the dog", "Put out the garbage", "Buy some milk"); } -} \ No newline at end of file +} diff --git a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/accessing_the_application/LearnAboutTheApplication.java b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/accessing_the_application/LearnAboutTheApplication.java index f6f7eda4a1..9687e045fb 100644 --- a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/accessing_the_application/LearnAboutTheApplication.java +++ b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/accessing_the_application/LearnAboutTheApplication.java @@ -6,9 +6,9 @@ import net.serenitybdd.junit.runners.SerenityRunner; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.abilities.BrowseTheWeb; -import net.thucydides.core.annotations.Managed; -import net.thucydides.model.annotations.WithTag; -import net.thucydides.core.annotations.WithTags; +import net.serenitybdd.annotations.Managed; +import net.serenitybdd.annotations.WithTag; +import net.serenitybdd.annotations.WithTags; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/completing_todos/CompleteATodo.java b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/completing_todos/CompleteATodo.java index fbf8fc8a58..a0cf2503a1 100644 --- a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/completing_todos/CompleteATodo.java +++ b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/completing_todos/CompleteATodo.java @@ -7,9 +7,9 @@ import net.serenitybdd.junit.runners.SerenityRunner; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.abilities.BrowseTheWeb; -import net.thucydides.core.annotations.Managed; -import net.thucydides.model.annotations.WithTag; -import net.thucydides.core.annotations.WithTags; +import net.serenitybdd.annotations.Managed; +import net.serenitybdd.annotations.WithTag; +import net.serenitybdd.annotations.WithTags; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/maintain_my_todo_list/ClearCompletedTodos.java b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/maintain_my_todo_list/ClearCompletedTodos.java index c189aec6ff..cd17e2649b 100644 --- a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/maintain_my_todo_list/ClearCompletedTodos.java +++ b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/maintain_my_todo_list/ClearCompletedTodos.java @@ -8,9 +8,9 @@ import net.serenitybdd.junit.runners.SerenityRunner; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.abilities.BrowseTheWeb; -import net.thucydides.core.annotations.Managed; -import net.thucydides.model.annotations.WithTag; -import net.thucydides.core.annotations.WithTags; +import net.serenitybdd.annotations.Managed; +import net.serenitybdd.annotations.WithTag; +import net.serenitybdd.annotations.WithTags; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/maintain_my_todo_list/DeleteTodos.java b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/maintain_my_todo_list/DeleteTodos.java index fdb3de920e..ff346d23be 100644 --- a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/maintain_my_todo_list/DeleteTodos.java +++ b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/maintain_my_todo_list/DeleteTodos.java @@ -6,9 +6,9 @@ import net.serenitybdd.junit.runners.SerenityRunner; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.abilities.BrowseTheWeb; -import net.thucydides.core.annotations.Managed; -import net.thucydides.model.annotations.WithTag; -import net.thucydides.core.annotations.WithTags; +import net.serenitybdd.annotations.Managed; +import net.serenitybdd.annotations.WithTag; +import net.serenitybdd.annotations.WithTags; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/maintain_my_todo_list/FilteringTodos.java b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/maintain_my_todo_list/FilteringTodos.java index b0e273dc37..22c3a4398a 100644 --- a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/maintain_my_todo_list/FilteringTodos.java +++ b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/maintain_my_todo_list/FilteringTodos.java @@ -8,9 +8,9 @@ import net.serenitybdd.junit.runners.SerenityRunner; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.abilities.BrowseTheWeb; -import net.thucydides.core.annotations.Managed; -import net.thucydides.model.annotations.WithTag; -import net.thucydides.core.annotations.WithTags; +import net.serenitybdd.annotations.Managed; +import net.serenitybdd.annotations.WithTag; +import net.serenitybdd.annotations.WithTags; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/maintain_my_todo_list/TodosBelongToAUser.java b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/maintain_my_todo_list/TodosBelongToAUser.java index fdf150874d..dad845c88d 100644 --- a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/maintain_my_todo_list/TodosBelongToAUser.java +++ b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/maintain_my_todo_list/TodosBelongToAUser.java @@ -7,9 +7,9 @@ import net.serenitybdd.junit.runners.SerenityRunner; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.abilities.BrowseTheWeb; -import net.thucydides.core.annotations.Managed; -import net.thucydides.model.annotations.WithTag; -import net.thucydides.core.annotations.WithTags; +import net.serenitybdd.annotations.Managed; +import net.serenitybdd.annotations.WithTag; +import net.serenitybdd.annotations.WithTags; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/record_todos/AddNewTodos.java b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/record_todos/AddNewTodos.java index b4a76b2bdc..a889140f48 100644 --- a/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/record_todos/AddNewTodos.java +++ b/serenity-smoketests/src/test/java/net/serenitybdd/demos/todos/screenplay/features/record_todos/AddNewTodos.java @@ -5,9 +5,9 @@ import net.serenitybdd.junit.runners.SerenityRunner; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.abilities.BrowseTheWeb; -import net.thucydides.core.annotations.Managed; -import net.thucydides.model.annotations.WithTag; -import net.thucydides.core.annotations.WithTags; +import net.serenitybdd.annotations.Managed; +import net.serenitybdd.annotations.WithTag; +import net.serenitybdd.annotations.WithTags; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith;