From 653dc6fd716be87d2e67204d39bc422cca5c84c3 Mon Sep 17 00:00:00 2001 From: Rukavishnikova Date: Tue, 20 Nov 2018 02:41:01 +0400 Subject: [PATCH 01/17] InitialCommit --- Rukavishnikova/pom.xml | 35 +++++++ .../java/ru/oriflame/pages/AnotherLinks.java | 36 ++++++++ .../ru/oriflame/pages/ChangeLanguages.java | 30 ++++++ .../test/java/ru/oriflame/pages/FilterBy.java | 65 +++++++++++++ .../test/java/ru/oriflame/pages/MainPage.java | 46 ++++++++++ .../java/ru/oriflame/pages/MultiMedia.java | 31 +++++++ .../test/java/ru/oriflame/pages/Search.java | 30 ++++++ .../test/java/ru/oriflame/pages/SortBy.java | 36 ++++++++ .../ru/oriflame/tests/AnotherlinksTest.java | 53 +++++++++++ .../ru/oriflame/tests/ChangeLanguageTest.java | 43 +++++++++ .../java/ru/oriflame/tests/FilterByTest.java | 92 +++++++++++++++++++ .../java/ru/oriflame/tests/MainPageTest.java | 75 +++++++++++++++ .../ru/oriflame/tests/MultiMediaTest.java | 43 +++++++++ .../java/ru/oriflame/tests/SearchingTest.java | 51 ++++++++++ .../java/ru/oriflame/tests/SortByTest.java | 53 +++++++++++ 15 files changed, 719 insertions(+) create mode 100644 Rukavishnikova/pom.xml create mode 100644 Rukavishnikova/src/test/java/ru/oriflame/pages/AnotherLinks.java create mode 100644 Rukavishnikova/src/test/java/ru/oriflame/pages/ChangeLanguages.java create mode 100644 Rukavishnikova/src/test/java/ru/oriflame/pages/FilterBy.java create mode 100644 Rukavishnikova/src/test/java/ru/oriflame/pages/MainPage.java create mode 100644 Rukavishnikova/src/test/java/ru/oriflame/pages/MultiMedia.java create mode 100644 Rukavishnikova/src/test/java/ru/oriflame/pages/Search.java create mode 100644 Rukavishnikova/src/test/java/ru/oriflame/pages/SortBy.java create mode 100644 Rukavishnikova/src/test/java/ru/oriflame/tests/AnotherlinksTest.java create mode 100644 Rukavishnikova/src/test/java/ru/oriflame/tests/ChangeLanguageTest.java create mode 100644 Rukavishnikova/src/test/java/ru/oriflame/tests/FilterByTest.java create mode 100644 Rukavishnikova/src/test/java/ru/oriflame/tests/MainPageTest.java create mode 100644 Rukavishnikova/src/test/java/ru/oriflame/tests/MultiMediaTest.java create mode 100644 Rukavishnikova/src/test/java/ru/oriflame/tests/SearchingTest.java create mode 100644 Rukavishnikova/src/test/java/ru/oriflame/tests/SortByTest.java diff --git a/Rukavishnikova/pom.xml b/Rukavishnikova/pom.xml new file mode 100644 index 0000000..6acbed6 --- /dev/null +++ b/Rukavishnikova/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + project_testing + project_testing + 1.0-SNAPSHOT + + + + + junit + junit + 4.12 + test + + + + org.seleniumhq.selenium + selenium-java + 3.4.0 + + + + org.testng + testng + 6.9.10 + test + + + + + \ No newline at end of file diff --git a/Rukavishnikova/src/test/java/ru/oriflame/pages/AnotherLinks.java b/Rukavishnikova/src/test/java/ru/oriflame/pages/AnotherLinks.java new file mode 100644 index 0000000..6bc6f04 --- /dev/null +++ b/Rukavishnikova/src/test/java/ru/oriflame/pages/AnotherLinks.java @@ -0,0 +1,36 @@ +package ru.oriflame.pages; + +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; +import org.openqa.selenium.support.PageFactory; + +public class AnotherLinks { + public WebDriver driver; + + public AnotherLinks(WebDriver driver) { + PageFactory.initElements(driver, this); + this.driver = driver; + } + + @FindBy(className = "shipping-info-link") + private WebElement delivery; + + @FindBy(linkText = "Контакты Сервисных Центров Орифлэйм") + private WebElement contactsServicesCenters; + + @FindBy(css = "nav.w-grid > div:nth-child(1) > div:nth-child(1) > a:nth-child(1)") + private WebElement oriLogo; + + public void deliveryClicking () { + delivery.click(); + } + + public void clickingContactsServicesCenters() { + contactsServicesCenters.click(); + } + + public void clickingOrifalemLogo() { + oriLogo.click(); + } +} diff --git a/Rukavishnikova/src/test/java/ru/oriflame/pages/ChangeLanguages.java b/Rukavishnikova/src/test/java/ru/oriflame/pages/ChangeLanguages.java new file mode 100644 index 0000000..a6a2960 --- /dev/null +++ b/Rukavishnikova/src/test/java/ru/oriflame/pages/ChangeLanguages.java @@ -0,0 +1,30 @@ +package ru.oriflame.pages; + +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; +import org.openqa.selenium.support.PageFactory; + +public class ChangeLanguages { + + public WebDriver driver; + + public ChangeLanguages(WebDriver driver) { + PageFactory.initElements(driver, this); + this.driver = driver; + } + + @FindBy(xpath = "//*[@id=\"accordion-2\"]") + private WebElement asiaButton; + + @FindBy(xpath = "//*[@id=\"sect2\"]/ul[1]/li[1]/a/span") + private WebElement chinaLink; + + public void asiaButtonClicking() { + asiaButton.click(); + } + + public void chinaLinking() { + chinaLink.click(); + } +} diff --git a/Rukavishnikova/src/test/java/ru/oriflame/pages/FilterBy.java b/Rukavishnikova/src/test/java/ru/oriflame/pages/FilterBy.java new file mode 100644 index 0000000..3910f8b --- /dev/null +++ b/Rukavishnikova/src/test/java/ru/oriflame/pages/FilterBy.java @@ -0,0 +1,65 @@ +package ru.oriflame.pages; + +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; +import org.openqa.selenium.support.PageFactory; + +public class FilterBy { + + public WebDriver driver; + + public FilterBy(WebDriver driver) { + PageFactory.initElements(driver, this); + this.driver = driver; + } + + @FindBy(xpath = "//*[@id=\"primary-navigation\"]/ul/li[2]/a") + private WebElement face; + + @FindBy(xpath = "//*[@id=\"main\"]/div[5]/div/section/div[1]/div/div/div[1]/div[1]") + private WebElement openedFilterrBy; + + @FindBy(xpath = "//*[@id=\"main\"]/div[5]/div/section/div[1]/div/div/div[3]/form/ul/li[2]/h3") + private WebElement filetrByIndications; + + @FindBy(xpath = "//*[@id=\"main\"]/div[5]/div/section/div[1]/div/div/div[3]/form/ul/li[5]/h3") + private WebElement filterByAge; + + @FindBy(xpath = "//*[@id=\"main\"]/div[5]/div/section/div[1]/div/div/div[3]/form/ul/li[3]/h3") + private WebElement filterByAdvantage; + + @FindBy(xpath = "//*[@id=\"main\"]/div[5]/div/section/div[1]/div/div/div[3]/form/ul/li[6]/h3") + private WebElement filterByBrand; + + @FindBy(xpath = "//*[@id=\"main\"]/div[5]/div/section/div[1]/div/div/div[3]/form/ul/li[3]/div/ul[1]/li[7]/a") + private WebElement filterByAdvantageOsv; + + public void faceClick() { + face.click(); + } + + public void openingFilterBy() { + openedFilterrBy.click(); + } + + public void clickingFilterByIndications() { + filetrByIndications.click(); + } + + public void clickingFilterByAge() { + filterByAge.click(); + } + + public void clickingFilterByAdvantage () { + filterByAdvantage.click(); + } + + public void clickingFilterByBrand() { + filterByBrand.click(); + } + + public void clickingFilterByAdvantageOsv () { + filterByAdvantageOsv.click(); + } +} diff --git a/Rukavishnikova/src/test/java/ru/oriflame/pages/MainPage.java b/Rukavishnikova/src/test/java/ru/oriflame/pages/MainPage.java new file mode 100644 index 0000000..7c636f0 --- /dev/null +++ b/Rukavishnikova/src/test/java/ru/oriflame/pages/MainPage.java @@ -0,0 +1,46 @@ +package ru.oriflame.pages; + +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; +import org.openqa.selenium.support.PageFactory; + +public class MainPage { + + public WebDriver driver; + + public MainPage(WebDriver driver) { + PageFactory.initElements(driver, this); + } + + @FindBy(xpath = "//*[@id=\"primary-navigation\"]/ul/li[2]/a") + private WebElement face; + + @FindBy(css = "body > header > div > div.ui-sticky-bar.js-sticky-bar > div.w-sticky-bar-list.clearfix > ul > li:nth-child(3) > a") + private WebElement registr; + + @FindBy(css = "body > footer > div.ui-standard-footer.w-grid > ul > li:nth-child(3) > a") + private WebElement podval; + + @FindBy(css = "#hero-promo-slider > div.rsOverflow > div > div.rsSlide.rsActiveSlide > div > article > a > div.image-A1 > img") + private WebElement banner; + + @FindBy(css = "#main > div > div:nth-child(2) > div > div > div > section.tab.ui-product-list.g-all.active > a:nth-child(1) > div.figure > img") + private WebElement product; + + public void faceClick() { + face.click(); + } + + public void registrClick() { + registr.click(); + } + + public void podvalClick() { + podval.click(); + } + + public void bannerClick() { banner.click(); } + + public void productClick() { product.click(); } +} diff --git a/Rukavishnikova/src/test/java/ru/oriflame/pages/MultiMedia.java b/Rukavishnikova/src/test/java/ru/oriflame/pages/MultiMedia.java new file mode 100644 index 0000000..498c4e6 --- /dev/null +++ b/Rukavishnikova/src/test/java/ru/oriflame/pages/MultiMedia.java @@ -0,0 +1,31 @@ +package ru.oriflame.pages; + +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; +import org.openqa.selenium.support.PageFactory; + +public class MultiMedia { + + public WebDriver driver; + + public MultiMedia(WebDriver driver) { + PageFactory.initElements(driver, this); + this.driver = driver; + } + + @FindBy(xpath = "//*[@id=\"block-block-5\"]/p/a") + private WebElement playVideo; + + @FindBy(css = "body > div.mfp-wrap.mfp-close-btn-in.mfp-auto-cursor.mfp-ready > div > div > div > button") + private WebElement closeButton; + + public void playVideoElement() { + playVideo.click(); + } + + public void closeButton() { + closeButton.click(); + } + +} diff --git a/Rukavishnikova/src/test/java/ru/oriflame/pages/Search.java b/Rukavishnikova/src/test/java/ru/oriflame/pages/Search.java new file mode 100644 index 0000000..0c59976 --- /dev/null +++ b/Rukavishnikova/src/test/java/ru/oriflame/pages/Search.java @@ -0,0 +1,30 @@ +package ru.oriflame.pages; + +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; +import org.openqa.selenium.support.PageFactory; + +public class Search { + + public WebDriver driver; + + public Search(WebDriver driver) { + PageFactory.initElements(driver, this); + this.driver = driver; + } + + @FindBy(css = "#global-search") + private WebElement searchField; + + @FindBy(css = "#form-search > fieldset > button") + private WebElement searchButton; + + public void inputSearchField(String keyWord) { + searchField.sendKeys(keyWord); + } + + public void clickSearchingButton() { + searchButton.click(); + } +} \ No newline at end of file diff --git a/Rukavishnikova/src/test/java/ru/oriflame/pages/SortBy.java b/Rukavishnikova/src/test/java/ru/oriflame/pages/SortBy.java new file mode 100644 index 0000000..2277a09 --- /dev/null +++ b/Rukavishnikova/src/test/java/ru/oriflame/pages/SortBy.java @@ -0,0 +1,36 @@ +package ru.oriflame.pages; + +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; +import org.openqa.selenium.support.PageFactory; + +public class SortBy { + public WebDriver driver; + + public SortBy(WebDriver driver) { + PageFactory.initElements(driver, this); + this.driver = driver; + } + + @FindBy(xpath = "//*[@id=\"primary-navigation\"]/ul/li[2]/a") + private WebElement face; + + @FindBy(xpath = "//*[@id=\"main\"]/div[5]/div/section/div[1]/div/div/div[1]/div[2]") + private WebElement sortingBy; + + @FindBy(xpath = "//*[@id=\"main\"]/div[5]/div/section/div[1]/div/div/div[2]/ul/li[2]/span/label") + private WebElement byPopular; + + public void faceClick() { + face.click(); + } + + public void sortByClick() { + sortingBy.click(); + } + + public void sortByPopularClick() { + byPopular.click(); + } +} diff --git a/Rukavishnikova/src/test/java/ru/oriflame/tests/AnotherlinksTest.java b/Rukavishnikova/src/test/java/ru/oriflame/tests/AnotherlinksTest.java new file mode 100644 index 0000000..9aa0743 --- /dev/null +++ b/Rukavishnikova/src/test/java/ru/oriflame/tests/AnotherlinksTest.java @@ -0,0 +1,53 @@ +package ru.oriflame.tests; + +import junit.framework.TestCase; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.chrome.ChromeDriver; +import org.testng.Assert; +import ru.oriflame.pages.AnotherLinks; + +import static java.util.concurrent.TimeUnit.SECONDS; + +public class AnotherlinksTest { + + public static WebDriver driver; + public static AnotherLinks anotherLinks; + + @BeforeClass + public static void setup() { + System.setProperty("webdriver.chrome.driver", "C:\\chromedriver\\chromedriver.exe"); + driver = new ChromeDriver(); + anotherLinks = new AnotherLinks(driver); + driver.manage().window().maximize(); + driver.manage().timeouts().implicitlyWait(20, SECONDS); + driver.get("https://www.oriflame.ru/products/product?code=32418"); + } + + @Test + public void checkDeliveryClick() { + TestCase.assertTrue("Testing if true holds", true); + anotherLinks.deliveryClicking(); + String url = driver.getCurrentUrl(); + Assert.assertTrue(url.contains("https://www.oriflame.ru/products/product?code=32418")); + } + + @Test + public void checkContactsSCClick() { + TestCase.assertTrue("Testing if true holds", true); + anotherLinks.deliveryClicking(); + anotherLinks.clickingContactsServicesCenters(); + String url = driver.getCurrentUrl(); + Assert.assertTrue(url.contains("https://www.oriflame.ru/products/~/link.aspx?_id=C4D5FBB327A943F5AC38D85A6D69ED21&_z=z")); + } + + @Test + public void checkOriflameLogoClickingFromMainPage() { + TestCase.assertTrue("Testing if true holds", true); + anotherLinks.clickingOrifalemLogo(); + String url = driver.getCurrentUrl(); + Assert.assertTrue(url.contains("https://www.oriflame.ru")); + } + +} diff --git a/Rukavishnikova/src/test/java/ru/oriflame/tests/ChangeLanguageTest.java b/Rukavishnikova/src/test/java/ru/oriflame/tests/ChangeLanguageTest.java new file mode 100644 index 0000000..8e7d453 --- /dev/null +++ b/Rukavishnikova/src/test/java/ru/oriflame/tests/ChangeLanguageTest.java @@ -0,0 +1,43 @@ +package ru.oriflame.tests; + +import junit.framework.TestCase; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.chrome.ChromeDriver; +import org.testng.Assert; +import ru.oriflame.pages.ChangeLanguages; + +import static java.util.concurrent.TimeUnit.SECONDS; + +public class ChangeLanguageTest { + + public static WebDriver driver; + public static ChangeLanguages changeLanguage; + + @BeforeClass + public static void setup() { + System.setProperty("webdriver.chrome.driver", "C:\\chromedriver\\chromedriver.exe"); + driver = new ChromeDriver(); + changeLanguage = new ChangeLanguages(driver); + driver.manage().window().maximize(); + driver.manage().timeouts().implicitlyWait(20, SECONDS); + driver.get("https://oriflame.com/"); + } + + @Test + public void checkChangelanguage() { + TestCase.assertTrue("Testing if true holds", true); + changeLanguage.asiaButtonClicking(); + changeLanguage.chinaLinking(); + driver.manage().timeouts().implicitlyWait(50, SECONDS); + String url = driver.getCurrentUrl(); + Assert.assertTrue(url.contains("https://cn.oriflame.com/")); + } + + @AfterClass + public static void closeChrome() { + driver.close(); + } +} diff --git a/Rukavishnikova/src/test/java/ru/oriflame/tests/FilterByTest.java b/Rukavishnikova/src/test/java/ru/oriflame/tests/FilterByTest.java new file mode 100644 index 0000000..6f0eb80 --- /dev/null +++ b/Rukavishnikova/src/test/java/ru/oriflame/tests/FilterByTest.java @@ -0,0 +1,92 @@ +package ru.oriflame.tests; + +import junit.framework.TestCase; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.chrome.ChromeDriver; +import org.testng.Assert; +import ru.oriflame.pages.FilterBy; + +import static java.util.concurrent.TimeUnit.SECONDS; + +public class FilterByTest { + public static WebDriver driver; + public static FilterBy filterBy; + + @BeforeClass + public static void setup() { + System.setProperty("webdriver.chrome.driver", "C:\\chromedriver\\chromedriver.exe"); + driver = new ChromeDriver(); + filterBy = new FilterBy(driver); + driver.manage().window().maximize(); + driver.manage().timeouts().implicitlyWait(20, SECONDS); + driver.get("https://www.oriflame.ru"); + } + + @Test + public void checkOpenFilters() { + TestCase.assertTrue("Testing if true holds", true); + filterBy.faceClick(); + filterBy.openingFilterBy(); + String url = driver.getCurrentUrl(); + Assert.assertTrue((url.contains("https://www.oriflame.ru/skincare"))); + } + + @Test + public void checkFilterByIndications() { + TestCase.assertTrue("Testing if true holds", true); + filterBy.faceClick(); + filterBy.openingFilterBy(); + filterBy.clickingFilterByIndications(); + String url = driver.getCurrentUrl(); + Assert.assertTrue((url.contains("https://www.oriflame.ru/skincare"))); + } + + @Test + public void checkFilterByAge() { + TestCase.assertTrue("Testing if true holds", true); + filterBy.faceClick(); + filterBy.openingFilterBy(); + filterBy.clickingFilterByAge(); + String url = driver.getCurrentUrl(); + Assert.assertTrue((url.contains("https://www.oriflame.ru/skincare"))); + } + + @Test + public void checkFilterByAdvantage() { + TestCase.assertTrue("Testing if true holds", true); + filterBy.faceClick(); + filterBy.openingFilterBy(); + filterBy.clickingFilterByAdvantage(); + String url = driver.getCurrentUrl(); + Assert.assertTrue((url.contains("https://www.oriflame.ru/skincare"))); + } + + @Test + public void checkFilterByBrand() { + TestCase.assertTrue("Testing if true holds", true); + filterBy.faceClick(); + filterBy.openingFilterBy(); + filterBy.clickingFilterByBrand(); + String url = driver.getCurrentUrl(); + Assert.assertTrue((url.contains("https://www.oriflame.ru/skincare"))); + } + + @Test + public void checkFilterByAdvantageOsv() { + TestCase.assertTrue("Testing if true holds", true); + filterBy.faceClick(); + filterBy.openingFilterBy(); + filterBy.clickingFilterByAdvantage(); + filterBy.clickingFilterByAdvantageOsv(); + String url = driver.getCurrentUrl(); + Assert.assertTrue((url.contains("https://www.oriflame.ru/skincare/?benefits=fairness"))); + } + + @AfterClass + public static void closeChrome() { + driver.close(); + } +} diff --git a/Rukavishnikova/src/test/java/ru/oriflame/tests/MainPageTest.java b/Rukavishnikova/src/test/java/ru/oriflame/tests/MainPageTest.java new file mode 100644 index 0000000..95d2e15 --- /dev/null +++ b/Rukavishnikova/src/test/java/ru/oriflame/tests/MainPageTest.java @@ -0,0 +1,75 @@ +package ru.oriflame.tests; + +import junit.framework.TestCase; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.chrome.ChromeDriver; +import org.testng.Assert; +import ru.oriflame.pages.MainPage; + +import static java.util.concurrent.TimeUnit.SECONDS; + +public class MainPageTest { + + private static WebDriver driver; + private static MainPage mainPage; + + + @BeforeClass + public static void setup() { + System.setProperty("webdriver.chrome.driver", "C:\\chromedriver\\chromedriver.exe"); + driver = new ChromeDriver(); + mainPage = new MainPage(driver); + driver.manage().window().maximize(); + driver.manage().timeouts().implicitlyWait(20, SECONDS); + driver.get("https://www.oriflame.ru/"); + } + + @Test + public void checkHeightMenu() { + TestCase.assertTrue("Testing if true holds", true); + mainPage.faceClick(); + String url = driver.getCurrentUrl(); + Assert.assertTrue((url.contains("https://www.oriflame.ru/skincare"))); + } + + @Test + public void checkProfileCap() { + TestCase.assertTrue("Testing if true holds", true); + mainPage.registrClick(); + String url = driver.getCurrentUrl(); + Assert.assertTrue(url.contains("https://www.oriflame.ru/business-opportunity/become-consultant")); + } + + @Test + public void checkDown() { + TestCase.assertTrue("Testing if true holds", true); + mainPage.podvalClick(); + String url = driver.getCurrentUrl(); + Assert.assertTrue((url.contains("https://oriflame.com"))); + } + + @Test + public void checkBasementLink() { + TestCase.assertTrue("Testing if true holds", true); + mainPage.bannerClick(); + String url = driver.getCurrentUrl(); + Assert.assertTrue((url.contains("https://www.oriflame.ru/products/product?code=33959"))); + } + + @Test + public void checkProduct() { + TestCase.assertTrue("Testing if true holds", true); + mainPage.productClick(); + String url = driver.getCurrentUrl(); + Assert.assertTrue((url.contains("https://www.oriflame.ru/products/product?code=32440"))); + } + + @AfterClass + public static void chromeClose() { + driver.quit(); + } + +} diff --git a/Rukavishnikova/src/test/java/ru/oriflame/tests/MultiMediaTest.java b/Rukavishnikova/src/test/java/ru/oriflame/tests/MultiMediaTest.java new file mode 100644 index 0000000..6db0216 --- /dev/null +++ b/Rukavishnikova/src/test/java/ru/oriflame/tests/MultiMediaTest.java @@ -0,0 +1,43 @@ +package ru.oriflame.tests; + +import junit.framework.TestCase; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.chrome.ChromeDriver; +import ru.oriflame.pages.MultiMedia; + +import static java.util.concurrent.TimeUnit.SECONDS; + +public class MultiMediaTest { + + public static WebDriver driver; + public static MultiMedia multiMedia; + + @BeforeClass + public static void setup() { + System.setProperty("webdriver.chrome.driver", "C:\\chromedriver\\chromedriver.exe"); + driver = new ChromeDriver(); + multiMedia = new MultiMedia(driver); + driver.manage().window().maximize(); + driver.manage().timeouts().implicitlyWait(20, SECONDS); + driver.get("http://investors.oriflame.com/"); + } + + @Test + public void checkVideoPlay() { + TestCase.assertTrue("Testing if true holds", true); + multiMedia.playVideoElement(); + driver.manage().timeouts().implicitlyWait(15, SECONDS); + multiMedia.closeButton(); + String url = driver.getCurrentUrl(); + Assert.assertTrue(url.contains("http://investors.oriflame.com")); + } + + @AfterClass + public static void closeChrome() { + driver.close(); + } +} diff --git a/Rukavishnikova/src/test/java/ru/oriflame/tests/SearchingTest.java b/Rukavishnikova/src/test/java/ru/oriflame/tests/SearchingTest.java new file mode 100644 index 0000000..83e40cc --- /dev/null +++ b/Rukavishnikova/src/test/java/ru/oriflame/tests/SearchingTest.java @@ -0,0 +1,51 @@ +package ru.oriflame.tests; + +import junit.framework.TestCase; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.chrome.ChromeDriver; +import ru.oriflame.pages.Search; + +import static java.util.concurrent.TimeUnit.SECONDS; + +public class SearchingTest { + public static WebDriver driver; + public static Search search; + + @BeforeClass + public static void setup() { + System.setProperty("webdriver.chrome.driver", "C:\\chromedriver\\chromedriver.exe"); + driver = new ChromeDriver(); + search = new Search(driver); + driver.manage().window().maximize(); + driver.manage().timeouts().implicitlyWait(20, SECONDS); + driver.get("https://oriflame.ru/"); + } + + @Test + public void checkSearchingByKeyWords() throws InterruptedException { + TestCase.assertTrue("Testing if true holds", true); + search.inputSearchField("шампунь"); + search.clickSearchingButton(); + String url = driver.getCurrentUrl(); + Assert.assertTrue((url.contains("https://www.oriflame.ru/search?query=шампунь"))); + } + + @Test + public void checkSearchingByNumb() throws InterruptedException { + TestCase.assertTrue("Testing if true holds", true); + search.inputSearchField("123"); + search.clickSearchingButton(); + String url = driver.getCurrentUrl(); + Assert.assertTrue((url.contains("https://www.oriflame.ru/search?query=123"))); + } + + @AfterClass + public static void cromeClose() { + driver.close(); + } + +} diff --git a/Rukavishnikova/src/test/java/ru/oriflame/tests/SortByTest.java b/Rukavishnikova/src/test/java/ru/oriflame/tests/SortByTest.java new file mode 100644 index 0000000..f55c113 --- /dev/null +++ b/Rukavishnikova/src/test/java/ru/oriflame/tests/SortByTest.java @@ -0,0 +1,53 @@ +package ru.oriflame.tests; + +import junit.framework.TestCase; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.chrome.ChromeDriver; +import org.testng.Assert; +import ru.oriflame.pages.SortBy; + +import static java.util.concurrent.TimeUnit.SECONDS; + +public class SortByTest { + + public static WebDriver driver; + public static SortBy sortBy; + + @BeforeClass + public static void setup() { + System.setProperty("webdriver.chrome.driver", "C:\\chromedriver\\chromedriver.exe"); + driver = new ChromeDriver(); + sortBy = new SortBy(driver); + driver.manage().window().maximize(); + driver.manage().timeouts().implicitlyWait(20, SECONDS); + driver.get("https://www.oriflame.ru"); + } + + @Test + public void checkShowMenuSort() { + + TestCase.assertTrue("Testing if true holds", true); + sortBy.faceClick(); + sortBy.sortByClick(); + String url = driver.getCurrentUrl(); + Assert.assertTrue((url.contains("https://www.oriflame.ru/skincare"))); + } + + @Test + public void checkLinkBySort() { + TestCase.assertTrue("Testing if true holds", true); + sortBy.faceClick(); + sortBy.sortByClick(); + sortBy.sortByPopularClick(); + String url = driver.getCurrentUrl(); + Assert.assertTrue(url.contains("https://www.oriflame.ru/skincare/?sort=popular")); + } + + @AfterClass + public static void closeChrome() { + driver.close(); + } +} -- 2.25.1 From 065d590693cb8610fa45b1c83be6fdb79911d44e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BA=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=BD=D0=B0?= Date: Sat, 8 Dec 2018 20:41:23 +0000 Subject: [PATCH 02/17] Update AnotherLinks.java --- .../java/ru/oriflame/pages/AnotherLinks.java | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/Rukavishnikova/src/test/java/ru/oriflame/pages/AnotherLinks.java b/Rukavishnikova/src/test/java/ru/oriflame/pages/AnotherLinks.java index 6bc6f04..5c75c73 100644 --- a/Rukavishnikova/src/test/java/ru/oriflame/pages/AnotherLinks.java +++ b/Rukavishnikova/src/test/java/ru/oriflame/pages/AnotherLinks.java @@ -1,20 +1,19 @@ package ru.oriflame.pages; +import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; public class AnotherLinks { public WebDriver driver; public AnotherLinks(WebDriver driver) { - PageFactory.initElements(driver, this); this.driver = driver; } @FindBy(className = "shipping-info-link") - private WebElement delivery; + private WebElement form; @FindBy(linkText = "Контакты Сервисных Центров Орифлэйм") private WebElement contactsServicesCenters; @@ -22,15 +21,31 @@ public class AnotherLinks { @FindBy(css = "nav.w-grid > div:nth-child(1) > div:nth-child(1) > a:nth-child(1)") private WebElement oriLogo; - public void deliveryClicking () { - delivery.click(); - } + public void formClicking () { form.click(); } public void clickingContactsServicesCenters() { contactsServicesCenters.click(); } - public void clickingOrifalemLogo() { - oriLogo.click(); + public void clickingOrifalemLogo() { oriLogo.click(); } + + public boolean assertMainMenu() { return driver.findElement(By.cssSelector("#main > div")).isDisplayed(); } + + public boolean assertContactsServicesCenters() { + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + return driver.findElement(By.cssSelector("body > div.w-grid")).isDisplayed(); + } + + public boolean assertFormClick() { + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + return driver.findElement(By.cssSelector("#pdp-shipping-popup")).isDisplayed(); } } -- 2.25.1 From 72643afa789022c2bf7690720898bc1fa23d02eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BA=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=BD=D0=B0?= Date: Sat, 8 Dec 2018 20:43:44 +0000 Subject: [PATCH 03/17] Update SortByTest.java --- .../java/ru/oriflame/tests/SortByTest.java | 45 ++++++++----------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/Rukavishnikova/src/test/java/ru/oriflame/tests/SortByTest.java b/Rukavishnikova/src/test/java/ru/oriflame/tests/SortByTest.java index f55c113..843ddfe 100644 --- a/Rukavishnikova/src/test/java/ru/oriflame/tests/SortByTest.java +++ b/Rukavishnikova/src/test/java/ru/oriflame/tests/SortByTest.java @@ -1,53 +1,46 @@ package ru.oriflame.tests; -import junit.framework.TestCase; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.chrome.ChromeDriver; -import org.testng.Assert; +import org.openqa.selenium.support.PageFactory; +import ru.oriflame.context.ChromeContext; +import ru.oriflame.context.Context; import ru.oriflame.pages.SortBy; -import static java.util.concurrent.TimeUnit.SECONDS; - public class SortByTest { - public static WebDriver driver; - public static SortBy sortBy; + private final static String APP_URL = "https://www.oriflame.ru"; + private static Context context; @BeforeClass public static void setup() { - System.setProperty("webdriver.chrome.driver", "C:\\chromedriver\\chromedriver.exe"); - driver = new ChromeDriver(); - sortBy = new SortBy(driver); - driver.manage().window().maximize(); - driver.manage().timeouts().implicitlyWait(20, SECONDS); - driver.get("https://www.oriflame.ru"); + context = new ChromeContext(); + context.start(); + } + + @AfterClass + public static void quit() { + context.close(); } @Test public void checkShowMenuSort() { - - TestCase.assertTrue("Testing if true holds", true); + context.getDriver().get(APP_URL); + SortBy sortBy = PageFactory.initElements(context.getDriver(), SortBy.class); sortBy.faceClick(); sortBy.sortByClick(); - String url = driver.getCurrentUrl(); - Assert.assertTrue((url.contains("https://www.oriflame.ru/skincare"))); + Assert.assertTrue(sortBy.assertShowMenuSort()); } @Test public void checkLinkBySort() { - TestCase.assertTrue("Testing if true holds", true); + context.getDriver().get(APP_URL); + SortBy sortBy = PageFactory.initElements(context.getDriver(), SortBy.class); sortBy.faceClick(); sortBy.sortByClick(); sortBy.sortByPopularClick(); - String url = driver.getCurrentUrl(); - Assert.assertTrue(url.contains("https://www.oriflame.ru/skincare/?sort=popular")); - } - - @AfterClass - public static void closeChrome() { - driver.close(); + Assert.assertTrue(sortBy.assertcheckLinkBySort()); } } -- 2.25.1 From 6c97e12bd2dd3f80a57564e3aa8c8e241bd18b36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BA=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=BD=D0=B0?= Date: Sat, 8 Dec 2018 20:44:48 +0000 Subject: [PATCH 04/17] Update SearchingTest.java --- .../java/ru/oriflame/tests/SearchingTest.java | 63 +++++++++---------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/Rukavishnikova/src/test/java/ru/oriflame/tests/SearchingTest.java b/Rukavishnikova/src/test/java/ru/oriflame/tests/SearchingTest.java index 83e40cc..473beb6 100644 --- a/Rukavishnikova/src/test/java/ru/oriflame/tests/SearchingTest.java +++ b/Rukavishnikova/src/test/java/ru/oriflame/tests/SearchingTest.java @@ -1,51 +1,48 @@ package ru.oriflame.tests; -import junit.framework.TestCase; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.chrome.ChromeDriver; +import org.openqa.selenium.support.PageFactory; +import ru.oriflame.context.ChromeContext; +import ru.oriflame.context.Context; import ru.oriflame.pages.Search; -import static java.util.concurrent.TimeUnit.SECONDS; - public class SearchingTest { - public static WebDriver driver; - public static Search search; + + private final static String APP_URL = "https://oriflame.ru/"; + private static Context context; + String search1 = "шампунь"; + String search2 = "123"; + @BeforeClass public static void setup() { - System.setProperty("webdriver.chrome.driver", "C:\\chromedriver\\chromedriver.exe"); - driver = new ChromeDriver(); - search = new Search(driver); - driver.manage().window().maximize(); - driver.manage().timeouts().implicitlyWait(20, SECONDS); - driver.get("https://oriflame.ru/"); - } - - @Test - public void checkSearchingByKeyWords() throws InterruptedException { - TestCase.assertTrue("Testing if true holds", true); - search.inputSearchField("шампунь"); - search.clickSearchingButton(); - String url = driver.getCurrentUrl(); - Assert.assertTrue((url.contains("https://www.oriflame.ru/search?query=шампунь"))); - } - - @Test - public void checkSearchingByNumb() throws InterruptedException { - TestCase.assertTrue("Testing if true holds", true); - search.inputSearchField("123"); - search.clickSearchingButton(); - String url = driver.getCurrentUrl(); - Assert.assertTrue((url.contains("https://www.oriflame.ru/search?query=123"))); + context = new ChromeContext(); + context.start(); } @AfterClass - public static void cromeClose() { - driver.close(); + public static void quit() { + context.close(); } + @Test + public void checkSearchingByKeyWords() { + context.getDriver().get(APP_URL); + Search search = PageFactory.initElements(context.getDriver(), Search.class); + search.inputSearchField(search1); + search.clickSearchingButton(); + Assert.assertTrue(search.checkSearch(search1)); + } + + @Test + public void checkSearchingByNumb() { + context.getDriver().get(APP_URL); + Search search = PageFactory.initElements(context.getDriver(), Search.class); + search.inputSearchField(search2); + search.clickSearchingButton(); + Assert.assertTrue(search.checkSearch(search2)); + } } -- 2.25.1 From 3cff2872167eefb7bb33a7ed2181f10c1e9d9fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BA=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=BD=D0=B0?= Date: Sat, 8 Dec 2018 20:46:45 +0000 Subject: [PATCH 05/17] Update MainPageTest.java --- .../java/ru/oriflame/tests/MainPageTest.java | 67 +++++++++---------- 1 file changed, 31 insertions(+), 36 deletions(-) diff --git a/Rukavishnikova/src/test/java/ru/oriflame/tests/MainPageTest.java b/Rukavishnikova/src/test/java/ru/oriflame/tests/MainPageTest.java index 95d2e15..d64392c 100644 --- a/Rukavishnikova/src/test/java/ru/oriflame/tests/MainPageTest.java +++ b/Rukavishnikova/src/test/java/ru/oriflame/tests/MainPageTest.java @@ -1,75 +1,70 @@ package ru.oriflame.tests; -import junit.framework.TestCase; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.chrome.ChromeDriver; -import org.testng.Assert; +import org.openqa.selenium.support.PageFactory; +import ru.oriflame.context.ChromeContext; +import ru.oriflame.context.Context; import ru.oriflame.pages.MainPage; -import static java.util.concurrent.TimeUnit.SECONDS; - public class MainPageTest { - private static WebDriver driver; - private static MainPage mainPage; - + private final static String APP_URL = "https://www.oriflame.ru/products/product?code=32418"; + private static Context context; @BeforeClass public static void setup() { - System.setProperty("webdriver.chrome.driver", "C:\\chromedriver\\chromedriver.exe"); - driver = new ChromeDriver(); - mainPage = new MainPage(driver); - driver.manage().window().maximize(); - driver.manage().timeouts().implicitlyWait(20, SECONDS); - driver.get("https://www.oriflame.ru/"); + context = new ChromeContext(); + context.start(); + } + + @AfterClass + public static void quit() { + context.close(); } @Test public void checkHeightMenu() { - TestCase.assertTrue("Testing if true holds", true); + context.getDriver().get(APP_URL); + MainPage mainPage = PageFactory.initElements(context.getDriver(), MainPage.class); mainPage.faceClick(); - String url = driver.getCurrentUrl(); - Assert.assertTrue((url.contains("https://www.oriflame.ru/skincare"))); + Assert.assertTrue(MainPage.assertHeightMenu()); } @Test public void checkProfileCap() { - TestCase.assertTrue("Testing if true holds", true); + context.getDriver().get(APP_URL); + MainPage mainPage = PageFactory.initElements(context.getDriver(), MainPage.class); mainPage.registrClick(); - String url = driver.getCurrentUrl(); - Assert.assertTrue(url.contains("https://www.oriflame.ru/business-opportunity/become-consultant")); + Assert.assertTrue(MainPage.assertRegister()); } @Test public void checkDown() { - TestCase.assertTrue("Testing if true holds", true); + context.getDriver().get(APP_URL); + MainPage mainPage = PageFactory.initElements(context.getDriver(), MainPage.class); + mainPage.mainClick(); mainPage.podvalClick(); - String url = driver.getCurrentUrl(); - Assert.assertTrue((url.contains("https://oriflame.com"))); + Assert.assertTrue(MainPage.assertDown()); } @Test public void checkBasementLink() { - TestCase.assertTrue("Testing if true holds", true); + context.getDriver().get(APP_URL); + MainPage mainPage = PageFactory.initElements(context.getDriver(), MainPage.class); + mainPage.mainClick(); mainPage.bannerClick(); - String url = driver.getCurrentUrl(); - Assert.assertTrue((url.contains("https://www.oriflame.ru/products/product?code=33959"))); + Assert.assertTrue(MainPage.assertBanner()); } @Test public void checkProduct() { - TestCase.assertTrue("Testing if true holds", true); + context.getDriver().get(APP_URL); + MainPage mainPage = PageFactory.initElements(context.getDriver(), MainPage.class); + mainPage.faceClick(); mainPage.productClick(); - String url = driver.getCurrentUrl(); - Assert.assertTrue((url.contains("https://www.oriflame.ru/products/product?code=32440"))); + Assert.assertTrue(MainPage.assertProduct()); } - - @AfterClass - public static void chromeClose() { - driver.quit(); - } - } -- 2.25.1 From bd0b9f5479dd28293e4f05c3d427f5f1ce209e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BA=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=BD=D0=B0?= Date: Sat, 8 Dec 2018 20:49:41 +0000 Subject: [PATCH 07/17] Update FilterByTest.java --- .../java/ru/oriflame/tests/FilterByTest.java | 100 +++++++++--------- 1 file changed, 48 insertions(+), 52 deletions(-) diff --git a/Rukavishnikova/src/test/java/ru/oriflame/tests/FilterByTest.java b/Rukavishnikova/src/test/java/ru/oriflame/tests/FilterByTest.java index 6f0eb80..c5aec02 100644 --- a/Rukavishnikova/src/test/java/ru/oriflame/tests/FilterByTest.java +++ b/Rukavishnikova/src/test/java/ru/oriflame/tests/FilterByTest.java @@ -1,92 +1,88 @@ package ru.oriflame.tests; -import junit.framework.TestCase; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.chrome.ChromeDriver; -import org.testng.Assert; +import org.openqa.selenium.support.PageFactory; +import ru.oriflame.context.ChromeContext; +import ru.oriflame.context.Context; import ru.oriflame.pages.FilterBy; -import static java.util.concurrent.TimeUnit.SECONDS; - public class FilterByTest { - public static WebDriver driver; - public static FilterBy filterBy; + + private final static String APP_URL = "https://www.oriflame.ru"; + private static Context context; @BeforeClass public static void setup() { - System.setProperty("webdriver.chrome.driver", "C:\\chromedriver\\chromedriver.exe"); - driver = new ChromeDriver(); - filterBy = new FilterBy(driver); - driver.manage().window().maximize(); - driver.manage().timeouts().implicitlyWait(20, SECONDS); - driver.get("https://www.oriflame.ru"); + context = new ChromeContext(); + context.start(); + } + + @AfterClass + public static void quit() { + context.close(); } @Test public void checkOpenFilters() { - TestCase.assertTrue("Testing if true holds", true); + context.getDriver().get(APP_URL); + FilterBy filterBy = PageFactory.initElements(context.getDriver(), FilterBy.class); filterBy.faceClick(); filterBy.openingFilterBy(); - String url = driver.getCurrentUrl(); - Assert.assertTrue((url.contains("https://www.oriflame.ru/skincare"))); + filterBy.AssertFilterBy(); } @Test public void checkFilterByIndications() { - TestCase.assertTrue("Testing if true holds", true); + context.getDriver().get(APP_URL); + FilterBy filterBy = PageFactory.initElements(context.getDriver(), FilterBy.class); filterBy.faceClick(); filterBy.openingFilterBy(); filterBy.clickingFilterByIndications(); - String url = driver.getCurrentUrl(); - Assert.assertTrue((url.contains("https://www.oriflame.ru/skincare"))); - } - - @Test - public void checkFilterByAge() { - TestCase.assertTrue("Testing if true holds", true); - filterBy.faceClick(); - filterBy.openingFilterBy(); - filterBy.clickingFilterByAge(); - String url = driver.getCurrentUrl(); - Assert.assertTrue((url.contains("https://www.oriflame.ru/skincare"))); - } - - @Test - public void checkFilterByAdvantage() { - TestCase.assertTrue("Testing if true holds", true); - filterBy.faceClick(); - filterBy.openingFilterBy(); - filterBy.clickingFilterByAdvantage(); - String url = driver.getCurrentUrl(); - Assert.assertTrue((url.contains("https://www.oriflame.ru/skincare"))); + filterBy.AssertByIndications(); } @Test public void checkFilterByBrand() { - TestCase.assertTrue("Testing if true holds", true); + context.getDriver().get(APP_URL); + FilterBy filterBy = PageFactory.initElements(context.getDriver(), FilterBy.class); filterBy.faceClick(); filterBy.openingFilterBy(); filterBy.clickingFilterByBrand(); - String url = driver.getCurrentUrl(); - Assert.assertTrue((url.contains("https://www.oriflame.ru/skincare"))); + Assert.assertTrue(filterBy.assertFilterByBrand()); + } + + @Test + public void checkFilterByAge() { + context.getDriver().get(APP_URL); + FilterBy filterBy = PageFactory.initElements(context.getDriver(), FilterBy.class); + filterBy.faceClick(); + filterBy.openingFilterBy(); + filterBy.clickingFilterByAge(); + filterBy.filterByAge12(); + Assert.assertTrue(filterBy.assertFilterByAge()); + } + + @Test + public void checkFilterByAdvantage() { + context.getDriver().get(APP_URL); + FilterBy filterBy = PageFactory.initElements(context.getDriver(), FilterBy.class); + filterBy.faceClick(); + filterBy.openingFilterBy(); + filterBy.clickingFilterByAdvantage(); + Assert.assertTrue(filterBy.assertFilterByAdvantage()); } @Test public void checkFilterByAdvantageOsv() { - TestCase.assertTrue("Testing if true holds", true); + context.getDriver().get(APP_URL); + FilterBy filterBy = PageFactory.initElements(context.getDriver(), FilterBy.class); filterBy.faceClick(); filterBy.openingFilterBy(); filterBy.clickingFilterByAdvantage(); - filterBy.clickingFilterByAdvantageOsv(); - String url = driver.getCurrentUrl(); - Assert.assertTrue((url.contains("https://www.oriflame.ru/skincare/?benefits=fairness"))); - } - - @AfterClass - public static void closeChrome() { - driver.close(); + filterBy.FilterByAdvantageAnti(); + Assert.assertTrue(filterBy.assertFilterByAdvantageAnti()); } } -- 2.25.1 From 709ac331bace0fe9f644b6930809051d700c239d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BA=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=BD=D0=B0?= Date: Sat, 8 Dec 2018 20:50:23 +0000 Subject: [PATCH 08/17] Update ChangeLanguageTest.java --- .../ru/oriflame/tests/ChangeLanguageTest.java | 42 +++++++++---------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/Rukavishnikova/src/test/java/ru/oriflame/tests/ChangeLanguageTest.java b/Rukavishnikova/src/test/java/ru/oriflame/tests/ChangeLanguageTest.java index 8e7d453..49b1523 100644 --- a/Rukavishnikova/src/test/java/ru/oriflame/tests/ChangeLanguageTest.java +++ b/Rukavishnikova/src/test/java/ru/oriflame/tests/ChangeLanguageTest.java @@ -1,43 +1,39 @@ package ru.oriflame.tests; -import junit.framework.TestCase; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.chrome.ChromeDriver; -import org.testng.Assert; +import org.openqa.selenium.support.PageFactory; +import ru.oriflame.context.ChromeContext; +import ru.oriflame.context.Context; import ru.oriflame.pages.ChangeLanguages; - -import static java.util.concurrent.TimeUnit.SECONDS; +import ru.oriflame.pages.MainPage; public class ChangeLanguageTest { - public static WebDriver driver; - public static ChangeLanguages changeLanguage; + private final static String APP_URL = "https://www.oriflame.ru"; + private static Context context; @BeforeClass public static void setup() { - System.setProperty("webdriver.chrome.driver", "C:\\chromedriver\\chromedriver.exe"); - driver = new ChromeDriver(); - changeLanguage = new ChangeLanguages(driver); - driver.manage().window().maximize(); - driver.manage().timeouts().implicitlyWait(20, SECONDS); - driver.get("https://oriflame.com/"); + context = new ChromeContext(); + context.start(); + } + + @AfterClass + public static void quit() { + context.close(); } @Test public void checkChangelanguage() { - TestCase.assertTrue("Testing if true holds", true); + context.getDriver().get(APP_URL); + MainPage mainPage = PageFactory.initElements(context.getDriver(), MainPage.class); + mainPage.podvalClick(); + ChangeLanguages changeLanguage = PageFactory.initElements(context.getDriver(), ChangeLanguages.class); changeLanguage.asiaButtonClicking(); changeLanguage.chinaLinking(); - driver.manage().timeouts().implicitlyWait(50, SECONDS); - String url = driver.getCurrentUrl(); - Assert.assertTrue(url.contains("https://cn.oriflame.com/")); - } - - @AfterClass - public static void closeChrome() { - driver.close(); + Assert.assertTrue(changeLanguage.assertChangelanguag()); } } -- 2.25.1 From f0e42847a5268bcd5d89de737aca7eb7bd93dca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BA=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=BD=D0=B0?= Date: Sat, 8 Dec 2018 20:51:06 +0000 Subject: [PATCH 09/17] Update AnotherlinksTest.java --- .../ru/oriflame/tests/AnotherlinksTest.java | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Rukavishnikova/src/test/java/ru/oriflame/tests/AnotherlinksTest.java b/Rukavishnikova/src/test/java/ru/oriflame/tests/AnotherlinksTest.java index 9aa0743..463a6b8 100644 --- a/Rukavishnikova/src/test/java/ru/oriflame/tests/AnotherlinksTest.java +++ b/Rukavishnikova/src/test/java/ru/oriflame/tests/AnotherlinksTest.java @@ -1,53 +1,53 @@ package ru.oriflame.tests; -import junit.framework.TestCase; +import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.chrome.ChromeDriver; -import org.testng.Assert; +import org.openqa.selenium.support.PageFactory; +import ru.oriflame.context.ChromeContext; +import ru.oriflame.context.Context; import ru.oriflame.pages.AnotherLinks; -import static java.util.concurrent.TimeUnit.SECONDS; - public class AnotherlinksTest { - public static WebDriver driver; - public static AnotherLinks anotherLinks; + private final static String APP_URL = "https://www.oriflame.ru/products/product?code=32418"; + private static Context context; @BeforeClass public static void setup() { - System.setProperty("webdriver.chrome.driver", "C:\\chromedriver\\chromedriver.exe"); - driver = new ChromeDriver(); - anotherLinks = new AnotherLinks(driver); - driver.manage().window().maximize(); - driver.manage().timeouts().implicitlyWait(20, SECONDS); - driver.get("https://www.oriflame.ru/products/product?code=32418"); + context = new ChromeContext(); + context.start(); + } + + @AfterClass + public static void quit() { + context.close(); } @Test - public void checkDeliveryClick() { - TestCase.assertTrue("Testing if true holds", true); - anotherLinks.deliveryClicking(); - String url = driver.getCurrentUrl(); - Assert.assertTrue(url.contains("https://www.oriflame.ru/products/product?code=32418")); + public void checkFormClick() { + context.getDriver().get(APP_URL); + AnotherLinks anotherLinks = PageFactory.initElements(context.getDriver(), AnotherLinks.class); + anotherLinks.formClicking(); + Assert.assertTrue(anotherLinks.assertFormClick()); } @Test public void checkContactsSCClick() { - TestCase.assertTrue("Testing if true holds", true); - anotherLinks.deliveryClicking(); + context.getDriver().get(APP_URL); + AnotherLinks anotherLinks = PageFactory.initElements(context.getDriver(), AnotherLinks.class); + anotherLinks.formClicking(); anotherLinks.clickingContactsServicesCenters(); - String url = driver.getCurrentUrl(); - Assert.assertTrue(url.contains("https://www.oriflame.ru/products/~/link.aspx?_id=C4D5FBB327A943F5AC38D85A6D69ED21&_z=z")); + Assert.assertTrue(anotherLinks.assertContactsServicesCenters()); } @Test public void checkOriflameLogoClickingFromMainPage() { - TestCase.assertTrue("Testing if true holds", true); + context.getDriver().get(APP_URL); + AnotherLinks anotherLinks = PageFactory.initElements(context.getDriver(), AnotherLinks.class); anotherLinks.clickingOrifalemLogo(); - String url = driver.getCurrentUrl(); - Assert.assertTrue(url.contains("https://www.oriflame.ru")); + Assert.assertTrue(anotherLinks.assertMainMenu()); } } -- 2.25.1 From 8ab0bf1374e204ec5a238e8d09e6e0eaf1934f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BA=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=BD=D0=B0?= Date: Sat, 8 Dec 2018 20:54:00 +0000 Subject: [PATCH 10/17] Update ChangeLanguages.java --- .../ru/oriflame/pages/ChangeLanguages.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Rukavishnikova/src/test/java/ru/oriflame/pages/ChangeLanguages.java b/Rukavishnikova/src/test/java/ru/oriflame/pages/ChangeLanguages.java index a6a2960..5e53518 100644 --- a/Rukavishnikova/src/test/java/ru/oriflame/pages/ChangeLanguages.java +++ b/Rukavishnikova/src/test/java/ru/oriflame/pages/ChangeLanguages.java @@ -1,20 +1,19 @@ package ru.oriflame.pages; +import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; public class ChangeLanguages { public WebDriver driver; public ChangeLanguages(WebDriver driver) { - PageFactory.initElements(driver, this); this.driver = driver; } - @FindBy(xpath = "//*[@id=\"accordion-2\"]") + @FindBy(xpath = "//*[@id=\"accordion-2\"]") private WebElement asiaButton; @FindBy(xpath = "//*[@id=\"sect2\"]/ul[1]/li[1]/a/span") @@ -27,4 +26,20 @@ public class ChangeLanguages { public void chinaLinking() { chinaLink.click(); } + + public boolean assertChangelanguag() { + try { + Thread.sleep(15000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + try { + return driver.findElement(By.cssSelector("body > header > div > div.ui-sticky-bar.js-sticky-bar > div.w-sticky-bar-list.clearfix > ul > li.catalogue.left.only-for-desktop-size > a")).getText().indexOf("产品目录") >= 0; + } + catch (Exception e) + { + return false; + } + } } -- 2.25.1 From 3b964d787e9a1152515e0891ee39dab0de60cf9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BA=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=BD=D0=B0?= Date: Sat, 8 Dec 2018 20:54:56 +0000 Subject: [PATCH 11/17] Update FilterBy.java --- .../test/java/ru/oriflame/pages/FilterBy.java | 118 ++++++++++++++++-- 1 file changed, 110 insertions(+), 8 deletions(-) diff --git a/Rukavishnikova/src/test/java/ru/oriflame/pages/FilterBy.java b/Rukavishnikova/src/test/java/ru/oriflame/pages/FilterBy.java index 3910f8b..689c624 100644 --- a/Rukavishnikova/src/test/java/ru/oriflame/pages/FilterBy.java +++ b/Rukavishnikova/src/test/java/ru/oriflame/pages/FilterBy.java @@ -1,16 +1,15 @@ package ru.oriflame.pages; +import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; public class FilterBy { public WebDriver driver; public FilterBy(WebDriver driver) { - PageFactory.initElements(driver, this); this.driver = driver; } @@ -32,34 +31,137 @@ public class FilterBy { @FindBy(xpath = "//*[@id=\"main\"]/div[5]/div/section/div[1]/div/div/div[3]/form/ul/li[6]/h3") private WebElement filterByBrand; - @FindBy(xpath = "//*[@id=\"main\"]/div[5]/div/section/div[1]/div/div/div[3]/form/ul/li[3]/div/ul[1]/li[7]/a") - private WebElement filterByAdvantageOsv; + @FindBy(xpath = "//*[@id=\"main\"]/div[5]/div/section/div[1]/div/div/div[3]/form/ul/li[5]/div/ul[1]/li[1]/a") + private WebElement age12; + + @FindBy(xpath = "//*[@id=\"main\"]/div[5]/div/section/div[1]/div/div/div[3]/form/ul/li[3]/div/ul[1]/li[1]/a") + private WebElement anti; public void faceClick() { face.click(); } + public void FilterByAdvantageAnti() { + try { + Thread.sleep(15000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + anti.click(); + } + + public void filterByAge12() { + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + age12.click(); + } + public void openingFilterBy() { + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + openedFilterrBy.click(); } public void clickingFilterByIndications() { - filetrByIndications.click(); - } + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + filetrByIndications.click(); } public void clickingFilterByAge() { + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + filterByAge.click(); } public void clickingFilterByAdvantage () { + try { + Thread.sleep(15000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + filterByAdvantage.click(); } public void clickingFilterByBrand() { + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + filterByBrand.click(); } - public void clickingFilterByAdvantageOsv () { - filterByAdvantageOsv.click(); + public boolean AssertFilterBy() { + return driver.findElement(By.cssSelector("#main > div:nth-child(5) > div > section > div.w-filter-bar > div > div > div.w-filter-box.w-filter-box-no-css.fixed > form")).isDisplayed(); + } + + public boolean AssertByIndications() { + return driver.findElement(By.cssSelector("#main > div:nth-child(5) > div > section > div.w-filter-bar > div > div > div.w-filter-box.w-filter-box-no-css.fixed > form > ul > li.facet.row.g-all.opened > div > ul:nth-child(1)")).isDisplayed(); + } + + public boolean assertFilterByBrand() { + return driver.findElement(By.cssSelector("li.facet:nth-child(6) > div:nth-child(2) > ul:nth-child(1)")).isDisplayed(); + } + + public boolean assertFilterByAdvantage() { + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + return driver.findElement(By.cssSelector("#main > div:nth-child(5) > div > section > div.w-filter-bar > div > div > div.w-filter-box.w-filter-box-no-css.fixed > form > ul > li.facet.row.g-all.opened > div > ul:nth-child(1)")).isDisplayed(); + } + + public boolean assertFilterByAge() { + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + try { + return driver.findElement(By.cssSelector("#main > div:nth-child(5) > div > section > div.w-filter-bar > div > div > div.w-filtering-info.g-all > div.w-filtered-facets > span")).getText().indexOf("12+") >= 0; + } + catch (Exception e) + { + return false; + } + } + + public boolean assertFilterByAdvantageAnti() { + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + try { + return driver.findElement(By.cssSelector("#main > div:nth-child(5) > div > section > div.w-filter-bar > div > div > div.w-filtering-info.g-all > div.w-filtered-facets > span")).getText().indexOf("Антивозрастной Уход") >= 0; + } + catch (Exception e) + { + return false; + } } } + -- 2.25.1 From 119520f2aa2b4be612ad72ed75d16a007ec13c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BA=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=BD=D0=B0?= Date: Sat, 8 Dec 2018 20:57:23 +0000 Subject: [PATCH 12/17] Update MainPage.java --- .../test/java/ru/oriflame/pages/MainPage.java | 42 ++++++++++++++----- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/Rukavishnikova/src/test/java/ru/oriflame/pages/MainPage.java b/Rukavishnikova/src/test/java/ru/oriflame/pages/MainPage.java index 7c636f0..790f93d 100644 --- a/Rukavishnikova/src/test/java/ru/oriflame/pages/MainPage.java +++ b/Rukavishnikova/src/test/java/ru/oriflame/pages/MainPage.java @@ -1,21 +1,23 @@ package ru.oriflame.pages; +import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; public class MainPage { - - public WebDriver driver; + public static WebDriver driver; public MainPage(WebDriver driver) { - PageFactory.initElements(driver, this); + this.driver = driver; } @FindBy(xpath = "//*[@id=\"primary-navigation\"]/ul/li[2]/a") private WebElement face; + @FindBy(css = "body > header > div > div.ui-header-bar > nav > div > div.ui-logo > a > span > svg") + private WebElement main; + @FindBy(css = "body > header > div > div.ui-sticky-bar.js-sticky-bar > div.w-sticky-bar-list.clearfix > ul > li:nth-child(3) > a") private WebElement registr; @@ -25,22 +27,40 @@ public class MainPage { @FindBy(css = "#hero-promo-slider > div.rsOverflow > div > div.rsSlide.rsActiveSlide > div > article > a > div.image-A1 > img") private WebElement banner; - @FindBy(css = "#main > div > div:nth-child(2) > div > div > div > section.tab.ui-product-list.g-all.active > a:nth-child(1) > div.figure > img") + @FindBy(css = "#main > div:nth-child(5) > div > section > section > a:nth-child(1) > div.figure > img") private WebElement product; - public void faceClick() { - face.click(); - } + public void faceClick() { face.click(); } - public void registrClick() { - registr.click(); - } + public void mainClick() { main.click(); } + + public void registrClick() { registr.click(); } public void podvalClick() { + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + e.printStackTrace(); + } podval.click(); } public void bannerClick() { banner.click(); } public void productClick() { product.click(); } + + public static boolean assertHeightMenu() { return driver.findElement(By.cssSelector("#main > div.w-top-area-banner.category-skincare.with-background.with-img > div.ui-banner-image > img")).isDisplayed(); } + + public static boolean assertBanner() { return driver.findElement(By.cssSelector("#facets-search-results > section")).isDisplayed(); } + + public static boolean assertProduct() { return driver.findElement(By.cssSelector("#pdp-image-slider > div.rsOverflow > div > div:nth-child(1) > div > img")).isDisplayed(); } + + public static boolean assertRegister() { return driver.findElement(By.cssSelector("#main > div.w-content > div > div > p")).isDisplayed(); } + + public static boolean assertDown() { + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + e.printStackTrace(); + }return driver.findElement(By.cssSelector("#main > div > div > div")).isDisplayed(); } } -- 2.25.1 From 307e02ad689576e342b88ca0fb0cafd72bd723a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BA=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=BD=D0=B0?= Date: Sat, 8 Dec 2018 20:57:58 +0000 Subject: [PATCH 13/17] Update Search.java --- .../test/java/ru/oriflame/pages/Search.java | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/Rukavishnikova/src/test/java/ru/oriflame/pages/Search.java b/Rukavishnikova/src/test/java/ru/oriflame/pages/Search.java index 0c59976..08e00fd 100644 --- a/Rukavishnikova/src/test/java/ru/oriflame/pages/Search.java +++ b/Rukavishnikova/src/test/java/ru/oriflame/pages/Search.java @@ -3,14 +3,14 @@ package ru.oriflame.pages; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; + +import java.util.List; public class Search { public WebDriver driver; public Search(WebDriver driver) { - PageFactory.initElements(driver, this); this.driver = driver; } @@ -20,11 +20,25 @@ public class Search { @FindBy(css = "#form-search > fieldset > button") private WebElement searchButton; - public void inputSearchField(String keyWord) { - searchField.sendKeys(keyWord); + @FindBy(css = "#main > div.w-content.ui-search-content.mode-products-search") + private List listResultSearch; + + public void inputSearchField(String text) { + searchField.click(); + searchField.sendKeys(text); } public void clickSearchingButton() { searchButton.click(); } + + public boolean checkSearch(String strSearch) { + boolean checkSearch = false; + int count = listResultSearch.size(); + for (int i = 0; i < count - 1; i++) { + if (listResultSearch.get(i).getText().contains(strSearch)) + checkSearch = true; + } + return true; + } } \ No newline at end of file -- 2.25.1 From 4d3f85fab9c267518173abf847ca7fee4786ecaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BA=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=BD=D0=B0?= Date: Sat, 8 Dec 2018 20:58:31 +0000 Subject: [PATCH 14/17] Update SortBy.java --- .../test/java/ru/oriflame/pages/SortBy.java | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/Rukavishnikova/src/test/java/ru/oriflame/pages/SortBy.java b/Rukavishnikova/src/test/java/ru/oriflame/pages/SortBy.java index 2277a09..245439b 100644 --- a/Rukavishnikova/src/test/java/ru/oriflame/pages/SortBy.java +++ b/Rukavishnikova/src/test/java/ru/oriflame/pages/SortBy.java @@ -1,15 +1,15 @@ package ru.oriflame.pages; +import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; public class SortBy { + public WebDriver driver; public SortBy(WebDriver driver) { - PageFactory.initElements(driver, this); this.driver = driver; } @@ -27,10 +27,39 @@ public class SortBy { } public void sortByClick() { + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + e.printStackTrace(); + } sortingBy.click(); } public void sortByPopularClick() { + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + e.printStackTrace(); + } byPopular.click(); } + + public boolean assertShowMenuSort() { + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + return driver.findElement(By.cssSelector("#main > div:nth-child(5) > div > section > div.w-filter-bar > div > div > div.w-sort-box.fixed > ul")).isDisplayed(); + } + + public boolean assertcheckLinkBySort() { + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + return driver.findElement(By.cssSelector("#main > div:nth-child(5) > div > section > div.w-filter-bar > div > div > div.w-filtering-info.g-all > div.w-filtered-facets > span")).getText().indexOf("популярности") >= 0; + + } } -- 2.25.1 From 53546b1ae76919a310e6416620522527012a1108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BA=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=BD=D0=B0?= Date: Sat, 8 Dec 2018 21:20:57 +0000 Subject: [PATCH 15/17] Update MultiMediaTest.java --- .../ru/oriflame/tests/MultiMediaTest.java | 38 ++++++++----------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/Rukavishnikova/src/test/java/ru/oriflame/tests/MultiMediaTest.java b/Rukavishnikova/src/test/java/ru/oriflame/tests/MultiMediaTest.java index 6db0216..bb32610 100644 --- a/Rukavishnikova/src/test/java/ru/oriflame/tests/MultiMediaTest.java +++ b/Rukavishnikova/src/test/java/ru/oriflame/tests/MultiMediaTest.java @@ -1,43 +1,35 @@ package ru.oriflame.tests; -import junit.framework.TestCase; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.chrome.ChromeDriver; +import org.openqa.selenium.support.PageFactory; +import ru.oriflame.context.ChromeContext; +import ru.oriflame.context.Context; import ru.oriflame.pages.MultiMedia; -import static java.util.concurrent.TimeUnit.SECONDS; - public class MultiMediaTest { - public static WebDriver driver; - public static MultiMedia multiMedia; + private final static String APP_URL = "http://investors.oriflame.com/"; + private static Context context; @BeforeClass public static void setup() { - System.setProperty("webdriver.chrome.driver", "C:\\chromedriver\\chromedriver.exe"); - driver = new ChromeDriver(); - multiMedia = new MultiMedia(driver); - driver.manage().window().maximize(); - driver.manage().timeouts().implicitlyWait(20, SECONDS); - driver.get("http://investors.oriflame.com/"); + context = new ChromeContext(); + context.start(); + } + + @AfterClass + public static void quit() { + context.close(); } @Test public void checkVideoPlay() { - TestCase.assertTrue("Testing if true holds", true); + context.getDriver().get(APP_URL); + MultiMedia multiMedia = PageFactory.initElements(context.getDriver(), MultiMedia.class); multiMedia.playVideoElement(); - driver.manage().timeouts().implicitlyWait(15, SECONDS); - multiMedia.closeButton(); - String url = driver.getCurrentUrl(); - Assert.assertTrue(url.contains("http://investors.oriflame.com")); - } - - @AfterClass - public static void closeChrome() { - driver.close(); + Assert.assertTrue(multiMedia.assertVideoPlay()); } } -- 2.25.1 From ff9d57a5c69a56310af0a839dc2d08d8e7374c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BA=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=BD=D0=B0?= Date: Sat, 8 Dec 2018 21:21:48 +0000 Subject: [PATCH 16/17] Update MultiMedia.java --- .../src/test/java/ru/oriflame/pages/MultiMedia.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Rukavishnikova/src/test/java/ru/oriflame/pages/MultiMedia.java b/Rukavishnikova/src/test/java/ru/oriflame/pages/MultiMedia.java index 498c4e6..ffa5037 100644 --- a/Rukavishnikova/src/test/java/ru/oriflame/pages/MultiMedia.java +++ b/Rukavishnikova/src/test/java/ru/oriflame/pages/MultiMedia.java @@ -1,31 +1,27 @@ package ru.oriflame.pages; +import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; public class MultiMedia { public WebDriver driver; public MultiMedia(WebDriver driver) { - PageFactory.initElements(driver, this); this.driver = driver; } @FindBy(xpath = "//*[@id=\"block-block-5\"]/p/a") private WebElement playVideo; - @FindBy(css = "body > div.mfp-wrap.mfp-close-btn-in.mfp-auto-cursor.mfp-ready > div > div > div > button") - private WebElement closeButton; - public void playVideoElement() { playVideo.click(); } - public void closeButton() { - closeButton.click(); + public boolean assertVideoPlay() { + return driver.findElement(By.cssSelector("body > div.mfp-wrap.mfp-close-btn-in.mfp-auto-cursor.mfp-ready > div > div > div > button")).isDisplayed(); } } -- 2.25.1 From ecb3703853748b3a8d1052006cfc60c14a7075da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BA=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=BD=D0=B0?= Date: Sat, 8 Dec 2018 21:30:33 +0000 Subject: [PATCH 17/17] Update Context.java --- src/test/java/context/Context.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/java/context/Context.java b/src/test/java/context/Context.java index 928d5dd..e7dc2ea 100644 --- a/src/test/java/context/Context.java +++ b/src/test/java/context/Context.java @@ -1,4 +1,4 @@ -package context; +package ru.oriflame.context; import org.openqa.selenium.WebDriver; @@ -7,6 +7,7 @@ import java.util.concurrent.TimeUnit; public abstract class Context { private final static String DRIVER_LOCATION = "drivers/%s"; protected WebDriver driver; + protected String tmpPath; public WebDriver getDriver() { if (driver != null) { @@ -18,8 +19,8 @@ public abstract class Context { public void start() { System.setProperty(getDriverType(), getDriverExecutablePath()); createDriver(); - // это плохая инструкция для автотестов, т.к. лучше задавать для конкретного элемента или кейса driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS); + driver.manage().window().maximize(); } public void close() { -- 2.25.1