romanov73/tis-2017
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Skalkin #6

Closed
antonskalkin73 wants to merge 9 commits from Skalkin into master
pull from: Skalkin
merge into: romanov73:master
Conversation 20 Commits 9 Files Changed 34 +6 -70
12 changed files with 6 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 96d2bb769c - Show all commits

16
Skalkin/src/test/java/AutorizationTests.java
View File

@ -5,10 +5,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.openqa.selenium.Dimension;
import org.openqa.selenium.Keys;
import org.openqa.selenium.support.PageFactory;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import page.*;
public class AutorizationTests {
@ -26,30 +23,24 @@ public class AutorizationTests {
@AfterAll
public static void quit() {
//context.close();
context.close();
}
@Test
public void testLoginSocial() throws InterruptedException {
public void testLoginSocial(){
context.getDriver().get(APP_URL);//Открыта страница фильма
MainPage page = PageFactory.initElements(context.getDriver(), MainPage.class);//Выбрать пункт меню
page.clickButtonLogin();
//Thread.sleep(5000);
page.isFrameLogin();
page.frameLogin();
page.isButtonVK();
page.clickButtonVK();
page.frameDefault();
page.switchToSocial();
VKPage pageTo = PageFactory.initElements(context.getDriver(), VKPage.class);
Assertions.assertTrue(pageTo.isUserPresent());
}
@Test
@ -62,7 +53,6 @@ public class AutorizationTests {
page.frameLogin();
page.insertEmail("sefyijupsi@tutye.com");
page.insertPassword("q1w2e3r4t5y6");
//page.isRestartPage();
Thread.sleep(500);
page.insertSignInEnter();
page.frameDefault();
@ -71,7 +61,7 @@ public class AutorizationTests {
}
@Test
public void testLike() throws InterruptedException {
public void testLike(){
context.getDriver().get(APP_URL_MOVIE);//Открыта страница фильма
MoviePage page = PageFactory.initElements(context.getDriver(), MoviePage.class);//Выбрать пункт меню

9
Skalkin/src/test/java/NavigationTests.java
View File

@ -8,7 +8,6 @@ import org.openqa.selenium.Dimension;
import org.openqa.selenium.support.PageFactory;
import page.*;
public class NavigationTests {
private final static String APP_URL = "https://www.kinopoisk.ru/";
private final static String APP_URL_MOVIE = "https://www.kinopoisk.ru/film/koma-2018-933208/";
@ -25,7 +24,7 @@ public class NavigationTests {
@AfterAll
public static void quit() {
//context.close();
context.close();
}
@Test
@ -33,11 +32,9 @@ public class NavigationTests {
context.getDriver().get(APP_URL);//Открыта любая страница сайта, кроме специальных
MainPage page = PageFactory.initElements(context.getDriver(), MainPage.class);
//Выбрать пункт меню
page.clickSubMenu();
AfishaPage pageTo = PageFactory.initElements(context.getDriver(), AfishaPage.class);
Assertions.assertTrue(pageTo.isUserPresent());//Корректно отображена выбранная страница
}
@ -101,12 +98,10 @@ public class NavigationTests {
MoviePage page = PageFactory.initElements(context.getDriver(), MoviePage.class);//Выбрать пункт меню
page.clickSocial();
page.switchToSocial();
VKPage pageVk = PageFactory.initElements(context.getDriver(), VKPage.class);
Assertions.assertTrue(pageVk.isUserPresent());
}
@Test
@ -115,11 +110,9 @@ public class NavigationTests {
ActorPage page = PageFactory.initElements(context.getDriver(), ActorPage.class);//Выбрать пункт меню
page.clickSocial();
page.switchToSocial();
VKPage pageVk = PageFactory.initElements(context.getDriver(), VKPage.class);
Assertions.assertTrue(pageVk.isUserPresent());
}
}

6
Skalkin/src/test/java/SearchTests.java
View File

@ -9,7 +9,6 @@ import org.openqa.selenium.support.PageFactory;
import page.*;
import page.search.*;
public class SearchTests {
private final static String APP_URL = "https://www.kinopoisk.ru/";
private final static String APP_URL_SEARCH = "https://www.kinopoisk.ru/s/";
@ -25,7 +24,7 @@ public class SearchTests {
@AfterAll
public static void quit() {
//context.close();
context.close();
}
@Test
@ -119,7 +118,7 @@ public class SearchTests {
}
@Test
public void testSearchMovieByWord() throws InterruptedException {
public void testSearchMovieByWord(){
context.getDriver().get(APP_URL_SEARCH);//Открыта любая страница сайта, кроме специальных
SearchMovieByWordPage page = PageFactory.initElements(context.getDriver(), SearchMovieByWordPage.class);//Выбрать пункт меню
@ -127,7 +126,6 @@ public class SearchTests {
page.clickDown();
page.clickDown();
page.clickEnter();
//Thread.sleep(500);
page.enterSearch();
SearchByCreatorsResultPage pageTo = PageFactory.initElements(context.getDriver(), SearchByCreatorsResultPage.class);//Корректно отображена выбранная страница

3
Skalkin/src/test/java/page/ActorPage.java
View File

@ -15,16 +15,13 @@ public class ActorPage {
public void clickInfo() {
infoElement.click();
}
public void clickSocial() {
socialElement.click();
}
public void switchToSocial(){
for (String winHandle : driver.getWindowHandles()) {
driver.switchTo().window(winHandle);
}

22
Skalkin/src/test/java/page/MainPage.java
View File

@ -59,13 +59,11 @@ public class MainPage {
public MainPage(WebDriver driver) {
this.driver = driver;
//this.driver.manage().timeouts().implicitlyWait(15, TimeUnit.SECONDS);
}
public void clickSubMenu() {
Actions builder = new Actions(driver);
builder.moveToElement(mainElement).perform();
menuElement.sendKeys(Keys.RETURN);
}
@ -110,56 +108,36 @@ public class MainPage {
}
public void isButtonVK() {
// WebElement dynamicElement = (new WebDriverWait(driver, 30))
// .until(ExpectedConditions.frameToBeAvailableAndSwitchToIt("kp2-authapi-iframe"));
// .until(ExpectedConditions.presenceOfElementLocated(By.cssSelector(".social-auth__item.social-auth__item_code_vk")));
// dynamicElement.click();
// (new WebDriverWait(driver, 10))
// .until(ExpectedConditions.frameToBeAvailableAndSwitchToIt(By.name("kp2-authapi-iframe")));
int i = 1;
while(true){
try{
if(driver.findElement(By.cssSelector(".social-auth__item.social-auth__item_code_vk")).isDisplayed()){
return;
} else {
Thread.sleep(500);
System.out.println(i++);
}
}catch(Exception ex){ }
}
//driver.switchTo().frame(driver.findElement(By.cssSelector(".kp2-authapi-iframe")));*
// driver.switchTo().frame(signInFrame);
//
// //driver.findElement(By.cssSelector(".social-auth__item_code_vk")).click();
// buttonVK.click();
// driver.switchTo().defaultContent();
}
public void isFrameLogin() {
int i = 1;
while(true){
try{
if(driver.findElement(By.name("kp2-authapi-iframe")).isDisplayed()){
return;
} else {
Thread.sleep(500);
System.out.println(i++);
}
}catch(Exception ex){ }
}
}
public void isButtonLogin() {
int i = 1;
while(true){
try{
if(driver.findElement(By.name("kp2-authapi-iframe")).isDisplayed()){
return;
} else {
Thread.sleep(500);
System.out.println(i++);
}
}catch(Exception ex){ }
}

5
Skalkin/src/test/java/page/MoviePage.java
View File

@ -25,27 +25,22 @@ public class MoviePage {
public void clickInfo() {
infoElement.click();
}
public void clickSocial() {
socialElement.click();
}
public void clickLike() {
buttonLike.click();
}
public void switchToSocial(){
for (String winHandle : driver.getWindowHandles()) {
driver.switchTo().window(winHandle);
}
}
public boolean isErrorLike() {
return infoError.isDisplayed();
}

5
Skalkin/src/test/java/page/search/SearchByPeoplePage.java
View File

@ -1,6 +1,5 @@
package page.search;
import org.openqa.selenium.Keys;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;
@ -25,8 +24,4 @@ public class SearchByPeoplePage {
public void enterSearch() {
buttonElement.click();
}
// public boolean isUserPresent() {
// return topBaners.isDisplayed();
// }
}

1
Skalkin/src/test/java/page/search/SearchByStudioPage.java
View File

@ -24,5 +24,4 @@ public class SearchByStudioPage {
public void enterSearch() {
buttonElement.click();
}
}

1
Skalkin/src/test/java/page/search/SearchByUsersPage.java
View File

@ -24,5 +24,4 @@ public class SearchByUsersPage {
public void enterSearch() {
buttonElement.click();
}
}

6
Skalkin/src/test/java/page/search/SearchExtendedPage.java
View File

@ -1,9 +1,7 @@
package page.search;
import org.openqa.selenium.Keys;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
import org.openqa.selenium.support.FindBy;
import java.util.List;
@ -42,8 +40,4 @@ public class SearchExtendedPage {
public void enterSearch() {
buttonElement.click();
}
// public boolean isUserPresent() {
// return topBaners.isDisplayed();
// }
}

1
Skalkin/src/test/java/page/search/SearchInTextPage.java
View File

@ -24,5 +24,4 @@ public class SearchInTextPage {
public void enterSearch() {
buttonElement.click();
}
}

1
Skalkin/src/test/java/page/search/SearchMovieByWordPage.java
View File

@ -33,5 +33,4 @@ public class SearchMovieByWordPage {
public void enterSearch() {
buttonElement.click();
}
}