From f50a3fb3769c812b4c77d984d20ef28ce6fdc7f9 Mon Sep 17 00:00:00 2001 From: Emerson Baillie Date: Wed, 27 Apr 2022 16:22:16 +0100 Subject: [PATCH] Updated to remove ru.yandex usage Updated POM --- pom.xml | 2 +- .../angularjs/pages/DeveloperGuidePage.java | 12 ++++-------- src/test/java/angularjs/pages/HomePage.java | 3 --- .../java/calcapp/pages/app/CalculatorPage.java | 2 +- src/test/java/github/pages/ExplorePage.java | 2 -- src/test/java/github/pages/HomePage.java | 2 -- .../java/github/pages/SearchResultsPage.java | 5 +---- .../pages/components/HeaderComponent.java | 8 +------- .../seleniumhq/components/HeaderComponent.java | 4 ++-- .../seleniumhq/pages/SeleniumDownloadPage.java | 2 +- src/test/java/tfl/web/pages/HomePage.java | 2 -- .../web/pages/JourneyPlannerResultsPage.java | 3 --- .../java/tfl/web/pages/PlanJourneyPage.java | 6 ------ .../pages/BasicAuthSuccessPage.java | 2 -- .../java/theinternet/pages/CheckboxesPage.java | 4 +--- .../theinternet/pages/DragAndDropPage.java | 4 ---- .../java/theinternet/pages/DropdownPage.java | 4 +--- .../pages/DynamicLoadingExamplePage.java | 9 +++------ .../theinternet/pages/DynamicLoadingPage.java | 5 +---- .../theinternet/pages/FileDownloadPage.java | 4 +--- .../java/theinternet/pages/FileUploadPage.java | 5 +---- .../pages/FileUploadSuccessPage.java | 2 -- .../pages/FormAuthenticationPage.java | 7 +------ .../pages/FormAuthenticationSuccessPage.java | 2 -- .../java/theinternet/pages/FramesPage.java | 2 -- .../java/theinternet/pages/HoversPage.java | 3 --- .../java/theinternet/pages/IFramePage.java | 4 ---- .../pages/JavaScriptAlertsPage.java | 9 ++------- .../java/theinternet/pages/KeyPressesPage.java | 3 --- .../pages/SortableDataTablesPage.java | 4 ---- .../java/theinternet/pages/WelcomePage.java | 18 +----------------- 31 files changed, 23 insertions(+), 121 deletions(-) diff --git a/pom.xml b/pom.xml index 95d5877..7a40e21 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ com.github.frameworkium frameworkium-core - 3.0.1 + 4.1.0.2 diff --git a/src/test/java/angularjs/pages/DeveloperGuidePage.java b/src/test/java/angularjs/pages/DeveloperGuidePage.java index 755eada..f6cdd31 100644 --- a/src/test/java/angularjs/pages/DeveloperGuidePage.java +++ b/src/test/java/angularjs/pages/DeveloperGuidePage.java @@ -7,25 +7,21 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.ExpectedConditions; -import ru.yandex.qatools.htmlelements.annotations.Name; -import ru.yandex.qatools.htmlelements.element.Link; -import ru.yandex.qatools.htmlelements.element.TextInput; +import com.frameworkium.core.htmlelements.element.Link; +import com.frameworkium.core.htmlelements.element.TextInput; -import java.util.concurrent.TimeUnit; +import java.time.Duration; public class DeveloperGuidePage extends BasePage { - @Name("Developer guide search") @Visible @FindBy(css = "input[name='as_q']") private TextInput searchField; - @Name("Bootstrap search item") @Visible @FindBy(linkText = "Bootstrap") private Link bootstrapSearchItem; - @Name("Guide article title") @FindBy(css = ".main-grid h1") private WebElement guideTitle; @@ -43,7 +39,7 @@ public DeveloperGuidePage setSearchBar(String inputText) { @Step("Click link from search results with title {0}") public DeveloperGuidePage clickLinkWithTitle(String linkTitle) { - driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS); + driver.manage().timeouts().implicitlyWait(Duration.ofSeconds(30)); var searchResultsLink = driver.findElement( By.xpath(String.format( "//nav[@id='navbar-main']//a[text()='%s']", diff --git a/src/test/java/angularjs/pages/HomePage.java b/src/test/java/angularjs/pages/HomePage.java index 55cd295..9e5c102 100644 --- a/src/test/java/angularjs/pages/HomePage.java +++ b/src/test/java/angularjs/pages/HomePage.java @@ -7,18 +7,15 @@ import io.qameta.allure.Step; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; import java.util.concurrent.TimeUnit; public class HomePage extends BasePage { - @Name("Develop navigation bar item") @Visible @FindBy(xpath = "//a[text()='Develop']") private WebElement developDropdown; - @Name("Developer Guide menu item") @FindBy(xpath = "//a[text()='Developer Guide']") private WebElement developerGuideMenuItem; diff --git a/src/test/java/calcapp/pages/app/CalculatorPage.java b/src/test/java/calcapp/pages/app/CalculatorPage.java index a51311e..a7cc724 100644 --- a/src/test/java/calcapp/pages/app/CalculatorPage.java +++ b/src/test/java/calcapp/pages/app/CalculatorPage.java @@ -4,7 +4,7 @@ import com.frameworkium.core.ui.pages.BasePage; import io.qameta.allure.Step; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.element.*; +import com.frameworkium.core.htmlelements.element.*; import java.util.List; diff --git a/src/test/java/github/pages/ExplorePage.java b/src/test/java/github/pages/ExplorePage.java index 799019a..740ab4b 100644 --- a/src/test/java/github/pages/ExplorePage.java +++ b/src/test/java/github/pages/ExplorePage.java @@ -5,12 +5,10 @@ import com.frameworkium.core.ui.pages.PageFactory; import github.pages.components.HeaderComponent; import io.qameta.allure.Step; -import ru.yandex.qatools.htmlelements.annotations.Name; public class ExplorePage extends BasePage { @Visible - @Name("Header") private HeaderComponent header; @Step("Navigate to the Github homepage") diff --git a/src/test/java/github/pages/HomePage.java b/src/test/java/github/pages/HomePage.java index 08d88a8..15b24ff 100644 --- a/src/test/java/github/pages/HomePage.java +++ b/src/test/java/github/pages/HomePage.java @@ -5,12 +5,10 @@ import com.frameworkium.core.ui.pages.PageFactory; import github.pages.components.HeaderComponent; import io.qameta.allure.Step; -import ru.yandex.qatools.htmlelements.annotations.Name; public class HomePage extends BasePage { @Visible - @Name("Header") private HeaderComponent header; @Step("Navigate to the Github homepage") diff --git a/src/test/java/github/pages/SearchResultsPage.java b/src/test/java/github/pages/SearchResultsPage.java index 0abaf6f..33a97a5 100644 --- a/src/test/java/github/pages/SearchResultsPage.java +++ b/src/test/java/github/pages/SearchResultsPage.java @@ -6,8 +6,7 @@ import github.pages.components.HeaderComponent; import io.qameta.allure.Step; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; -import ru.yandex.qatools.htmlelements.element.Link; +import com.frameworkium.core.htmlelements.element.Link; import java.util.List; import java.util.stream.Collectors; @@ -15,11 +14,9 @@ public class SearchResultsPage extends BasePage { @Visible - @Name("Header") private HeaderComponent header; @Visible(checkAtMost = 1) - @Name("Repository Links") @FindBy(css = "h3 > a") private List repoLinks; diff --git a/src/test/java/github/pages/components/HeaderComponent.java b/src/test/java/github/pages/components/HeaderComponent.java index 8d207d9..6f463e2 100644 --- a/src/test/java/github/pages/components/HeaderComponent.java +++ b/src/test/java/github/pages/components/HeaderComponent.java @@ -7,29 +7,23 @@ import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; -import ru.yandex.qatools.htmlelements.element.*; +import com.frameworkium.core.htmlelements.element.*; -@Name("Github Header") @FindBy(css = "header") public class HeaderComponent extends HtmlElement { @Visible - @Name("Home Logo/Link") @FindBy(css = "a.header-logo-invertocat") private Link homeLink; - @Name("Search Box") @FindBy(name = "q") private TextInput searchBox; @Visible - @Name("Explore Link") @FindBy(partialLinkText = "Explore") private Link exploreLink; @Visible - @Name("Marketing Sign-Up Banner") @FindBy(partialLinkText = "Marketplace") private WebElement marketingLink; diff --git a/src/test/java/seleniumhq/components/HeaderComponent.java b/src/test/java/seleniumhq/components/HeaderComponent.java index aeb5325..19201ed 100644 --- a/src/test/java/seleniumhq/components/HeaderComponent.java +++ b/src/test/java/seleniumhq/components/HeaderComponent.java @@ -4,8 +4,8 @@ import com.frameworkium.core.ui.pages.PageFactory; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.ExpectedConditions; -import ru.yandex.qatools.htmlelements.element.HtmlElement; -import ru.yandex.qatools.htmlelements.element.Link; +import com.frameworkium.core.htmlelements.element.HtmlElement; +import com.frameworkium.core.htmlelements.element.Link; import seleniumhq.pages.SeleniumDownloadPage; @FindBy(className = "navbar") diff --git a/src/test/java/seleniumhq/pages/SeleniumDownloadPage.java b/src/test/java/seleniumhq/pages/SeleniumDownloadPage.java index a04bb10..efd2334 100644 --- a/src/test/java/seleniumhq/pages/SeleniumDownloadPage.java +++ b/src/test/java/seleniumhq/pages/SeleniumDownloadPage.java @@ -4,7 +4,7 @@ import com.frameworkium.core.ui.pages.BasePage; import com.frameworkium.core.ui.pages.PageFactory; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.element.Link; +import com.frameworkium.core.htmlelements.element.Link; import seleniumhq.components.HeaderComponent; public class SeleniumDownloadPage extends BasePage { diff --git a/src/test/java/tfl/web/pages/HomePage.java b/src/test/java/tfl/web/pages/HomePage.java index b8bae08..478e54c 100644 --- a/src/test/java/tfl/web/pages/HomePage.java +++ b/src/test/java/tfl/web/pages/HomePage.java @@ -6,11 +6,9 @@ import io.qameta.allure.Step; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; public class HomePage extends BasePage { - @Name("Plan A Journey Link") @Visible @FindBy(css = "li.plan-journey a") private WebElement planJourneyLink; diff --git a/src/test/java/tfl/web/pages/JourneyPlannerResultsPage.java b/src/test/java/tfl/web/pages/JourneyPlannerResultsPage.java index d1cc70d..e42c16f 100644 --- a/src/test/java/tfl/web/pages/JourneyPlannerResultsPage.java +++ b/src/test/java/tfl/web/pages/JourneyPlannerResultsPage.java @@ -4,17 +4,14 @@ import com.frameworkium.core.ui.pages.BasePage; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; public class JourneyPlannerResultsPage extends BasePage { @Visible - @Name("Results viewport") @FindBy(css = ".journey-planner-results") private WebElement resultsViewport; @Visible - @Name("Page Title Area") @FindBy(css = "h1 span.hero-headline") private WebElement pageTitleArea; diff --git a/src/test/java/tfl/web/pages/PlanJourneyPage.java b/src/test/java/tfl/web/pages/PlanJourneyPage.java index 10f733a..a286752 100644 --- a/src/test/java/tfl/web/pages/PlanJourneyPage.java +++ b/src/test/java/tfl/web/pages/PlanJourneyPage.java @@ -6,7 +6,6 @@ import io.qameta.allure.Step; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; import java.util.List; @@ -16,25 +15,20 @@ public class PlanJourneyPage extends BasePage { @Visible - @Name("From Field") @FindBy(css = "input#InputFrom") private WebElement fromField; - @Name("List of from suggestions") @FindBy(css = "#search-filter-form-0 div.tt-dataset-stop-points-search div.tt-suggestion") private List fromSuggestions; @Visible - @Name("To Field") @FindBy(css = "input#InputTo") private WebElement toField; - @Name("List of to suggestions") @FindBy(css = "#search-filter-form-1 div.tt-dataset-stop-points-search div.tt-suggestion") private List toSuggestions; @Visible - @Name("Plan my Journey Button") @FindBy(css = "input.plan-journey-button") private WebElement planJourneyButton; diff --git a/src/test/java/theinternet/pages/BasicAuthSuccessPage.java b/src/test/java/theinternet/pages/BasicAuthSuccessPage.java index aa74959..22aeb3f 100644 --- a/src/test/java/theinternet/pages/BasicAuthSuccessPage.java +++ b/src/test/java/theinternet/pages/BasicAuthSuccessPage.java @@ -4,12 +4,10 @@ import com.frameworkium.core.ui.pages.BasePage; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; public class BasicAuthSuccessPage extends BasePage { @Visible - @Name("Header text") @FindBy(css = "div.example h3") private WebElement headerText; } diff --git a/src/test/java/theinternet/pages/CheckboxesPage.java b/src/test/java/theinternet/pages/CheckboxesPage.java index 76beaef..b8950dc 100644 --- a/src/test/java/theinternet/pages/CheckboxesPage.java +++ b/src/test/java/theinternet/pages/CheckboxesPage.java @@ -4,8 +4,7 @@ import com.frameworkium.core.ui.pages.BasePage; import io.qameta.allure.Step; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; -import ru.yandex.qatools.htmlelements.element.CheckBox; +import com.frameworkium.core.htmlelements.element.CheckBox; import java.util.List; import java.util.stream.Stream; @@ -13,7 +12,6 @@ public class CheckboxesPage extends BasePage { @Visible - @Name("All checkboxes") @FindBy(css = "form input[type='checkbox']") private List allCheckboxes; diff --git a/src/test/java/theinternet/pages/DragAndDropPage.java b/src/test/java/theinternet/pages/DragAndDropPage.java index b8eaa46..fe0d6aa 100644 --- a/src/test/java/theinternet/pages/DragAndDropPage.java +++ b/src/test/java/theinternet/pages/DragAndDropPage.java @@ -6,7 +6,6 @@ import io.restassured.RestAssured; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; import java.util.List; import java.util.stream.Collectors; @@ -23,16 +22,13 @@ public class DragAndDropPage extends BasePage { private static final String JQUERY_JS_URI = "https://code.jquery.com/jquery-1.12.4.min.js"; @Visible - @Name("Box A") @FindBy(id = "column-a") private WebElement boxA; @Visible - @Name("Box B") @FindBy(id = "column-b") private WebElement boxB; - @Name("List of headers") @FindBy(css = "header") private List boxes; diff --git a/src/test/java/theinternet/pages/DropdownPage.java b/src/test/java/theinternet/pages/DropdownPage.java index a8ffcb5..e0601a7 100644 --- a/src/test/java/theinternet/pages/DropdownPage.java +++ b/src/test/java/theinternet/pages/DropdownPage.java @@ -4,13 +4,11 @@ import com.frameworkium.core.ui.pages.BasePage; import io.qameta.allure.Step; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; -import ru.yandex.qatools.htmlelements.element.Select; +import com.frameworkium.core.htmlelements.element.Select; public class DropdownPage extends BasePage { @Visible - @Name("Dropdown list") @FindBy(css = "select#dropdown") private Select dropdown; diff --git a/src/test/java/theinternet/pages/DynamicLoadingExamplePage.java b/src/test/java/theinternet/pages/DynamicLoadingExamplePage.java index 413f7b6..a17f896 100644 --- a/src/test/java/theinternet/pages/DynamicLoadingExamplePage.java +++ b/src/test/java/theinternet/pages/DynamicLoadingExamplePage.java @@ -6,23 +6,20 @@ import io.qameta.allure.Step; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; -import ru.yandex.qatools.htmlelements.annotations.Timeout; -import ru.yandex.qatools.htmlelements.element.Button; -import ru.yandex.qatools.htmlelements.element.TextBlock; +import com.frameworkium.core.htmlelements.annotations.Timeout; +import com.frameworkium.core.htmlelements.element.Button; +import com.frameworkium.core.htmlelements.element.TextBlock; import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf; public class DynamicLoadingExamplePage extends BasePage { @Visible - @Name("Start button") @FindBy(css = "#start button") private Button startButton; @Invisible // make sure it's not there @Timeout(0) // used to speed up the wait for Invisible TypifiedElements - @Name("Hidden element") @FindBy(id = "finish") private TextBlock dynamicElement; diff --git a/src/test/java/theinternet/pages/DynamicLoadingPage.java b/src/test/java/theinternet/pages/DynamicLoadingPage.java index 99d6218..2777c75 100644 --- a/src/test/java/theinternet/pages/DynamicLoadingPage.java +++ b/src/test/java/theinternet/pages/DynamicLoadingPage.java @@ -5,17 +5,14 @@ import com.frameworkium.core.ui.pages.PageFactory; import io.qameta.allure.Step; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; -import ru.yandex.qatools.htmlelements.element.Link; +import com.frameworkium.core.htmlelements.element.Link; public class DynamicLoadingPage extends BasePage { @Visible - @Name("Example 1: Element on page that is hidden link") @FindBy(linkText = "Example 1: Element on page that is hidden") private Link example1Link; - @Name("Example 2: Element rendered after the fact") @FindBy(linkText = "Example 2: Element rendered after the fact") private Link example2Link; diff --git a/src/test/java/theinternet/pages/FileDownloadPage.java b/src/test/java/theinternet/pages/FileDownloadPage.java index 65e4c95..4e30080 100644 --- a/src/test/java/theinternet/pages/FileDownloadPage.java +++ b/src/test/java/theinternet/pages/FileDownloadPage.java @@ -4,8 +4,7 @@ import com.frameworkium.core.ui.pages.BasePage; import io.qameta.allure.Step; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; -import ru.yandex.qatools.htmlelements.element.Link; +import com.frameworkium.core.htmlelements.element.Link; import java.util.List; import java.util.stream.Stream; @@ -13,7 +12,6 @@ public class FileDownloadPage extends BasePage { @Visible - @Name("Generic download link") @FindBy(css = "div.example a") private List allDownloadLinks; diff --git a/src/test/java/theinternet/pages/FileUploadPage.java b/src/test/java/theinternet/pages/FileUploadPage.java index ab90729..f33ac8b 100644 --- a/src/test/java/theinternet/pages/FileUploadPage.java +++ b/src/test/java/theinternet/pages/FileUploadPage.java @@ -6,18 +6,15 @@ import io.qameta.allure.Step; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; -import ru.yandex.qatools.htmlelements.element.FileInput; +import com.frameworkium.core.htmlelements.element.FileInput; public class FileUploadPage extends BasePage { @Visible - @Name("Choose Files button") @FindBy(css = "input#file-upload") private FileInput chooseFileInput; @Visible - @Name("Upload button") @FindBy(css = "input#file-submit") private WebElement uploadButton; diff --git a/src/test/java/theinternet/pages/FileUploadSuccessPage.java b/src/test/java/theinternet/pages/FileUploadSuccessPage.java index f4aacc5..15acfb4 100644 --- a/src/test/java/theinternet/pages/FileUploadSuccessPage.java +++ b/src/test/java/theinternet/pages/FileUploadSuccessPage.java @@ -5,12 +5,10 @@ import io.qameta.allure.Step; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; public class FileUploadSuccessPage extends BasePage { @Visible - @Name("Uploaded Files") @FindBy(css = "div#uploaded-files") private WebElement uploadedFiles; diff --git a/src/test/java/theinternet/pages/FormAuthenticationPage.java b/src/test/java/theinternet/pages/FormAuthenticationPage.java index 1ddc9e4..c6e830e 100644 --- a/src/test/java/theinternet/pages/FormAuthenticationPage.java +++ b/src/test/java/theinternet/pages/FormAuthenticationPage.java @@ -7,27 +7,22 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.ExpectedConditions; -import ru.yandex.qatools.htmlelements.annotations.Name; -import ru.yandex.qatools.htmlelements.element.TextInput; +import com.frameworkium.core.htmlelements.element.TextInput; public class FormAuthenticationPage extends BasePage { @Visible - @Name("Username field") @FindBy(css = "input#username") private TextInput usernameField; @Visible - @Name("Password field") @FindBy(css = "input#password") private TextInput passwordField; @Visible - @Name("Login button") @FindBy(css = "#login > button") private WebElement loginButton; - @Name("Error message") @FindBy(css = "#flash") private WebElement errorMessage; diff --git a/src/test/java/theinternet/pages/FormAuthenticationSuccessPage.java b/src/test/java/theinternet/pages/FormAuthenticationSuccessPage.java index f57cef4..3e52d39 100644 --- a/src/test/java/theinternet/pages/FormAuthenticationSuccessPage.java +++ b/src/test/java/theinternet/pages/FormAuthenticationSuccessPage.java @@ -5,12 +5,10 @@ import io.qameta.allure.Step; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; public class FormAuthenticationSuccessPage extends BasePage { @Visible - @Name("Logout button") @FindBy(css = "a[href='/logout']") private WebElement logoutButton; diff --git a/src/test/java/theinternet/pages/FramesPage.java b/src/test/java/theinternet/pages/FramesPage.java index 213f703..0870bf0 100644 --- a/src/test/java/theinternet/pages/FramesPage.java +++ b/src/test/java/theinternet/pages/FramesPage.java @@ -6,12 +6,10 @@ import io.qameta.allure.Step; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; public class FramesPage extends BasePage { @Visible - @Name("iFrame Link") @FindBy(linkText = "iFrame") private WebElement iFrameLink; diff --git a/src/test/java/theinternet/pages/HoversPage.java b/src/test/java/theinternet/pages/HoversPage.java index 8234de9..ba8c837 100644 --- a/src/test/java/theinternet/pages/HoversPage.java +++ b/src/test/java/theinternet/pages/HoversPage.java @@ -6,16 +6,13 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; public class HoversPage extends BasePage { @Visible - @Name("First Figure") @FindBy(css = "div.figure:nth-of-type(1)") private WebElement firstFigure; - @Name("First Figure Caption") @FindBy(css = "div.figure:nth-of-type(1) div.figcaption") private WebElement firstFigureCaption; diff --git a/src/test/java/theinternet/pages/IFramePage.java b/src/test/java/theinternet/pages/IFramePage.java index 0d73232..de71bff 100644 --- a/src/test/java/theinternet/pages/IFramePage.java +++ b/src/test/java/theinternet/pages/IFramePage.java @@ -5,16 +5,13 @@ import io.qameta.allure.Step; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; public class IFramePage extends BasePage { @Visible - @Name("Wysiwyg editor iframe") @FindBy(css = "iframe#mce_0_ifr") private WebElement wysiwygIFrame; - @Name("Bold Button") @Visible @FindBy(css = "button[aria-label='Bold']") private WebElement boldButton; @@ -22,7 +19,6 @@ public class IFramePage extends BasePage { // This is within the iframe so while it'll be physically visible when the // page loads, it WILL NOT be 'visible' to the driver (i.e. selenium will // not be able to 'see' it) until we switchTo it - see below - @Name("Wysiwyg editor") @FindBy(id = "tinymce") private WebElement wysiwygTextBox; diff --git a/src/test/java/theinternet/pages/JavaScriptAlertsPage.java b/src/test/java/theinternet/pages/JavaScriptAlertsPage.java index 608ee0d..e56a4f1 100644 --- a/src/test/java/theinternet/pages/JavaScriptAlertsPage.java +++ b/src/test/java/theinternet/pages/JavaScriptAlertsPage.java @@ -4,30 +4,25 @@ import com.frameworkium.core.ui.pages.BasePage; import io.qameta.allure.Step; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; -import ru.yandex.qatools.htmlelements.element.Button; -import ru.yandex.qatools.htmlelements.element.TextBlock; +import com.frameworkium.core.htmlelements.element.Button; +import com.frameworkium.core.htmlelements.element.TextBlock; import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf; public class JavaScriptAlertsPage extends BasePage { @Visible - @Name("JS Alert button") @FindBy(css = "button[onclick='jsAlert()']") private Button jsAlertButton; @Visible - @Name("JS Confirm button") @FindBy(css = "button[onclick='jsConfirm()']") private Button jsConfirmButton; @Visible - @Name("JS Prompt button") @FindBy(css = "button[onclick='jsPrompt()']") private Button jsPromptButton; - @Name("Result area") @FindBy(css = "p#result") private TextBlock resultArea; diff --git a/src/test/java/theinternet/pages/KeyPressesPage.java b/src/test/java/theinternet/pages/KeyPressesPage.java index 796c175..b943337 100644 --- a/src/test/java/theinternet/pages/KeyPressesPage.java +++ b/src/test/java/theinternet/pages/KeyPressesPage.java @@ -7,16 +7,13 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; public class KeyPressesPage extends BasePage { @Visible - @Name("Container") @FindBy(css = "div.example") private WebElement container; - @Name("Result") @FindBy(css = "p#result") private WebElement result; diff --git a/src/test/java/theinternet/pages/SortableDataTablesPage.java b/src/test/java/theinternet/pages/SortableDataTablesPage.java index 291ac12..19569b3 100644 --- a/src/test/java/theinternet/pages/SortableDataTablesPage.java +++ b/src/test/java/theinternet/pages/SortableDataTablesPage.java @@ -7,7 +7,6 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.CacheLookup; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; import java.util.NoSuchElementException; import java.util.stream.Stream; @@ -15,16 +14,13 @@ public class SortableDataTablesPage extends BasePage { @Visible - @Name("Heading") @FindBy(css = "div.example h3") private WebElement heading; - @Name("Table 1") @CacheLookup @FindBy(id = "table1") private StreamTable table1; - @Name("Table 2") @CacheLookup @FindBy(id = "table2") private StreamTable table2; diff --git a/src/test/java/theinternet/pages/WelcomePage.java b/src/test/java/theinternet/pages/WelcomePage.java index 8df0182..4f959c2 100644 --- a/src/test/java/theinternet/pages/WelcomePage.java +++ b/src/test/java/theinternet/pages/WelcomePage.java @@ -5,70 +5,54 @@ import com.frameworkium.core.ui.pages.PageFactory; import io.qameta.allure.Step; import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.annotations.Name; -import ru.yandex.qatools.htmlelements.element.Link; +import com.frameworkium.core.htmlelements.element.Link; public class WelcomePage extends BasePage { @Visible - @Name("Basic auth link") @FindBy(linkText = "Basic Auth") private Link basicAuthLink; @Visible - @Name("Checkboxes link") @FindBy(linkText = "Checkboxes") private Link checkboxesLink; - @Name("Drag and Drop link") @FindBy(linkText = "Drag and Drop") private Link dragAndDropLink; - @Name("Dropdown Link") @FindBy(linkText = "Dropdown") private Link dropdownLink; - @Name("Dynamic Loading link") @FindBy(linkText = "Dynamic Loading") private Link dynamicLoadingLink; - @Name("File Download Link") @FindBy(linkText = "File Download") private Link fileDownloadLink; - @Name("File Upload Link") @FindBy(linkText = "File Upload") private Link fileUploadLink; - @Name("Form Authentication Link") @FindBy(linkText = "Form Authentication") private Link formAuthenticationLink; - @Name("Hovers Link") @FindBy(linkText = "Hovers") private Link hoversLink; - @Name("Frames Link") @FindBy(linkText = "Frames") private Link framesLink; - @Name("JQuery UI Link") @FindBy(linkText = "JQuery UI Menus") private Link jqueryUILink; - @Name("JavaScript Alerts Link") @FindBy(linkText = "JavaScript Alerts") private Link javascriptAlertsLink; - @Name("Key Presses Link") @FindBy(linkText = "Key Presses") private Link keyPressesLink; - @Name("Secure File Download Link") @FindBy(linkText = "Secure File Download") private Link secureFileLink; - @Name("Sortable Data Tables Link") @FindBy(linkText = "Sortable Data Tables") private Link sortableDataTablesLink;