Skip to content

Updated to remove ru.yandex usage #29

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<dependency>
<groupId>com.github.frameworkium</groupId>
<artifactId>frameworkium-core</artifactId>
<version>3.0.1</version>
<version>4.1.0.2</version>
</dependency>

<!-- Your own dependencies here -->
Expand Down
12 changes: 4 additions & 8 deletions src/test/java/angularjs/pages/DeveloperGuidePage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<DeveloperGuidePage> {

@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;

Expand All @@ -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']",
Expand Down
3 changes: 0 additions & 3 deletions src/test/java/angularjs/pages/HomePage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<HomePage> {

@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;

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/calcapp/pages/app/CalculatorPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 0 additions & 2 deletions src/test/java/github/pages/ExplorePage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<ExplorePage> {

@Visible
@Name("Header")
private HeaderComponent header;

@Step("Navigate to the Github homepage")
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/github/pages/HomePage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<HomePage> {

@Visible
@Name("Header")
private HeaderComponent header;

@Step("Navigate to the Github homepage")
Expand Down
5 changes: 1 addition & 4 deletions src/test/java/github/pages/SearchResultsPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,17 @@
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;

public class SearchResultsPage extends BasePage<SearchResultsPage> {

@Visible
@Name("Header")
private HeaderComponent header;

@Visible(checkAtMost = 1)
@Name("Repository Links")
@FindBy(css = "h3 > a")
private List<Link> repoLinks;

Expand Down
8 changes: 1 addition & 7 deletions src/test/java/github/pages/components/HeaderComponent.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/seleniumhq/components/HeaderComponent.java
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/seleniumhq/pages/SeleniumDownloadPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<SeleniumDownloadPage> {
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/tfl/web/pages/HomePage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<HomePage> {

@Name("Plan A Journey Link")
@Visible
@FindBy(css = "li.plan-journey a")
private WebElement planJourneyLink;
Expand Down
3 changes: 0 additions & 3 deletions src/test/java/tfl/web/pages/JourneyPlannerResultsPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<JourneyPlannerResultsPage> {

@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;

Expand Down
6 changes: 0 additions & 6 deletions src/test/java/tfl/web/pages/PlanJourneyPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -16,25 +15,20 @@
public class PlanJourneyPage extends BasePage<PlanJourneyPage> {

@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<WebElement> 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<WebElement> toSuggestions;

@Visible
@Name("Plan my Journey Button")
@FindBy(css = "input.plan-journey-button")
private WebElement planJourneyButton;

Expand Down
2 changes: 0 additions & 2 deletions src/test/java/theinternet/pages/BasicAuthSuccessPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<BasicAuthSuccessPage> {

@Visible
@Name("Header text")
@FindBy(css = "div.example h3")
private WebElement headerText;
}
4 changes: 1 addition & 3 deletions src/test/java/theinternet/pages/CheckboxesPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@
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;

public class CheckboxesPage extends BasePage<CheckboxesPage> {

@Visible
@Name("All checkboxes")
@FindBy(css = "form input[type='checkbox']")
private List<CheckBox> allCheckboxes;

Expand Down
4 changes: 0 additions & 4 deletions src/test/java/theinternet/pages/DragAndDropPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -23,16 +22,13 @@ public class DragAndDropPage extends BasePage<DragAndDropPage> {
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<WebElement> boxes;

Expand Down
4 changes: 1 addition & 3 deletions src/test/java/theinternet/pages/DropdownPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<DropdownPage> {

@Visible
@Name("Dropdown list")
@FindBy(css = "select#dropdown")
private Select dropdown;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<DynamicLoadingExamplePage> {

@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;

Expand Down
5 changes: 1 addition & 4 deletions src/test/java/theinternet/pages/DynamicLoadingPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<DynamicLoadingPage> {

@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;

Expand Down
4 changes: 1 addition & 3 deletions src/test/java/theinternet/pages/FileDownloadPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@
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;

public class FileDownloadPage extends BasePage<FileDownloadPage> {

@Visible
@Name("Generic download link")
@FindBy(css = "div.example a")
private List<Link> allDownloadLinks;

Expand Down
5 changes: 1 addition & 4 deletions src/test/java/theinternet/pages/FileUploadPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<FileUploadPage> {

@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;

Expand Down
Loading