Merge pull request #31 from ThePalaceProject/refactoring_ios

changed step to check library on iOS
ThePalaceProject · Feb 9, 2024 · b87e53e · b87e53e
2 parents 72acf24 + caeec73
commit b87e53e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/test/java/screens/pdf/BookmarksPdfScreen.java b/src/test/java/screens/pdf/BookmarksPdfScreen.java
@@ -17,7 +17,7 @@ public class BookmarksPdfScreen extends Screen {
     public BookmarksPdfScreen() {
         super(LocatorUtils.getLocator(
                 new AndroidLocator(By.xpath("")),
-                new IosLocator(By.xpath("//XCUIElementTypeCollectionView"))), "Bookmarks screen");
+                new IosLocator(By.xpath("//XCUIElementTypeStaticText[contains(@name=\"no bookmarks\")]"))), "Bookmarks screen");
     }
 
     public int getCountOfBookmarks() {

diff --git a/src/test/java/screens/pdf/SearchPdfScreen.java b/src/test/java/screens/pdf/SearchPdfScreen.java
@@ -21,7 +21,7 @@ public class SearchPdfScreen extends Screen {
     private final IButton returnKey = getElementFactory().getButton(By.xpath("//XCUIElementTypeButton[@name=\"Return\"]"), "Return key");
 
     private static final String NUMBER_OF_FOUND_TEXT_LOCATOR_IOS = "//XCUIElementTypeCell/XCUIElementTypeStaticText[2]";
-    private static final String FOUND_TEXT_NUMBER_LOCATOR_IOS = "//XCUIElementTypeCell[%d]/XCUIElementTypeOther[2]/XCUIElementTypeOther/XCUIElementTypeOther/XCUIElementTypeStaticText[2]";
+    private static final String FOUND_TEXT_NUMBER_LOCATOR_IOS = "//XCUIElementTypeCell[%d]/XCUIElementTypeOther[2]/XCUIElementTypeOther/XCUIElementTypeOther/XCUIElementTypeOther/XCUIElementTypeStaticText[2]";
     private static final String FOUND_TEXT_LOCATOR_IOS = "//XCUIElementTypeCell/XCUIElementTypeStaticText[1]";
 
     public SearchPdfScreen() {

diff --git a/src/test/java/stepdefinitions/CatalogSteps.java b/src/test/java/stepdefinitions/CatalogSteps.java
@@ -73,6 +73,7 @@ public void isLibraryOpenedInCatalog(String libraryName){
             menuBarScreen.openBottomMenuTab(MenuBar.SETTINGS);
             settingsScreen.openLibraries();
             Assert.assertTrue(libraryName + " is not present on Libraries screen", librariesScreen.isLibraryPresent(libraryName));
+            menuBarScreen.openBottomMenuTab(MenuBar.CATALOG);
         });
     }