Skip to content

Commit 305ab9b

Browse files
committed
Изменены селекторы и исправлен тест отзыва дружбы
1 parent 1f5bcfa commit 305ab9b

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

src/test/java/pages/FriendsPage.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,11 @@ public FriendsPage(WebDriver driver) {
1111
super(driver);
1212
}
1313

14-
//todo настроить xpath на игнорирование Людей, которых вы можете знать
1514
public List<WebElement> getListOfMyFriends() {
16-
return driver.findElements(By.xpath(".//*[@id=\"hook_Loader_MyFriendsSquareCardsPagingBLoader\"]//li[@class=\"ugrid_i\"]"));
15+
return driver.findElements(By.xpath(".//ul[@class = \"ugrid_cnt\"]//li[@class=\"ugrid_i\"]"));
1716
}
1817

19-
//todo здесь xpath выглядит хреново
2018
public List<WebElement> getListOfFriendsName() {
21-
return driver.findElements(By.xpath(".//*[@class=\"hookBlock\" and contains(@id, \"Friends\")]//*[@class=\"ugrid_i\"]//*[@class=\"ucard-w_t ellip-i\"]"));
19+
return driver.findElements(By.xpath(".//*[@class = \"ugrid_cnt\"]//*[@class=\"ucard-w_t ellip-i\"]"));
2220
}
23-
24-
2521
}

src/test/java/pages/PersonPage.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ public void addToFriends() {
1414
click(friendshipButton);
1515
}
1616

17-
//todo эта штука нормально не работает после отзыва дружбы
1817
public boolean isInvitedToFriends() {
19-
return isElementPresent(friendshipButton);
18+
return isElementPresent(By.xpath(".//*[@data-l='t,invite']//*[contains(@class, 'svg-ico_check')]"));
2019
}
2120

2221
public void revokeInvite() {

src/test/java/tests/OkTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,11 @@ public void checkFriend() {
3030
new PersonPage(driver).goToFriends();
3131
friends = new FriendsPage(driver).getListOfFriendsName();
3232
friends.get(0).click();
33-
PersonPage fFriendPage = new PersonPage(driver);
34-
fFriendPage.addToFriends();
35-
Assertions.assertTrue(fFriendPage.isInvitedToFriends());
33+
PersonPage friendPage = new PersonPage(driver);
34+
friendPage.addToFriends();
35+
Assertions.assertTrue(friendPage.isInvitedToFriends());
3636
}
3737

38-
//todo понять в чём проблема! Инвайт отзывается, но проверка неверная
3938
@Test
4039
public void revokeFriendship() {
4140
driver.navigate().refresh();

0 commit comments

Comments
 (0)