Merge pull request #22 from ThePalaceProject/refactoring_ios

My Books and devices
ThePalaceProject · Nov 24, 2023 · 552131d · 552131d
2 parents 7b48483 + 628b182
commit 552131d
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 36 deletions.
diff --git a/src/test/java/features/MyBooks.feature b/src/test/java/features/MyBooks.feature
@@ -1,13 +1,11 @@
 Feature: My books module
 
-  Background:
-    Given Close tutorial screen
+  @tier2
+  Scenario: Check of added books in Palace Bookshelf
+    When Close tutorial screen
     Then Welcome screen is opened
     When Close welcome screen
     Then Add library screen is opened
-
-  @tier2
-  Scenario: Check of added books in Palace Bookshelf
     When Add library "Palace Bookshelf" on Add library screen
     Then Library "Palace Bookshelf" is opened on Libraries screen
     When Open Catalog
@@ -23,6 +21,10 @@ Feature: My books module
 
   @tier2
   Scenario: Check of sorting in Palace Bookshelf
+    When Close tutorial screen
+    Then Welcome screen is opened
+    When Close welcome screen
+    Then Add library screen is opened
     When Add library "Palace Bookshelf" on Add library screen
     Then Library "Palace Bookshelf" is opened on Libraries screen
     When Open Catalog
@@ -40,8 +42,12 @@ Feature: My books module
 
   @logout @returnBooks @tier1
   Scenario: Return book from My Books in LYRASIS Reads
+    When Close tutorial screen
+    Then Welcome screen is opened
+    When Close welcome screen
+    Then Add library screen is opened
     When Add library "LYRASIS Reads" on Add library screen
-    Then Library "Palace Bookshelf" is opened on Libraries screen
+    Then Library "LYRASIS Reads" is opened on Libraries screen
     When Enter credentials for 'LYRASIS Reads' library
     Then Login is performed successfully
     When Activate sync bookmarks on Sign in screen
@@ -59,6 +65,10 @@ Feature: My books module
 
   @logout @returnBooks @tier1
   Scenario: Get a book from Book Detail View and Return from Books in LYRASIS Reads
+    When Close tutorial screen
+    Then Welcome screen is opened
+    When Close welcome screen
+    Then Add library screen is opened
     When Add library "LYRASIS Reads" on Add library screen
     Then Library "LYRASIS Reads" is opened on Libraries screen
     When Enter credentials for 'LYRASIS Reads' library
@@ -68,7 +78,7 @@ Feature: My books module
       And Open search modal
       And Search 'available' book of distributor 'Bibliotheca' and bookType 'EBOOK' and save as 'bookNameInfo'
       And Switch to 'eBooks' catalog tab
-    When Open EBOOK book with GET action button and 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
+      And Open EBOOK book with GET action button and 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
       And Click GET action button on Book details screen
       And Open Books
     Then EBOOK book with READ action button and 'bookInfo' bookInfo is present on books screen
@@ -80,6 +90,10 @@ Feature: My books module
 
   @logout @returnBooks @tier1
   Scenario: Get a book from Subcategory List View and Return from Books in LYRASIS Reads
+    When Close tutorial screen
+    Then Welcome screen is opened
+    When Close welcome screen
+    Then Add library screen is opened
     When Add library "LYRASIS Reads" on Add library screen
     Then Library "LYRASIS Reads" is opened on Libraries screen
     When Enter credentials for 'LYRASIS Reads' library
@@ -105,6 +119,10 @@ Feature: My books module
 
   @logout @returnBooks @tier1 @exclude_android
   Scenario: Get a book from Subcategory List View and Return from Subcategory List View in LYRASIS Reads
+    When Close tutorial screen
+    Then Welcome screen is opened
+    When Close welcome screen
+    Then Add library screen is opened
     When Add library "LYRASIS Reads" on Add library screen
     Then Library "LYRASIS Reads" is opened on Libraries screen
     When Enter credentials for 'LYRASIS Reads' library
@@ -120,6 +138,10 @@ Feature: My books module
 
   @logout @returnBooks @tier1
   Scenario: Get a book from Subcategory List View and Read from Books in LYRASIS Reads
+    When Close tutorial screen
+    Then Welcome screen is opened
+    When Close welcome screen
+    Then Add library screen is opened
     When Add library "LYRASIS Reads" on Add library screen
     Then Library "LYRASIS Reads" is opened on Libraries screen
     When Enter credentials for 'LYRASIS Reads' library

diff --git a/src/test/resources/devices.json b/src/test/resources/devices.json
@@ -1,8 +1,8 @@
 {
-  "iPhone13ProMax_15": {
+  "iPhone15ProMax_17": {
     "capabilities": {
-      "deviceName": "iPhone 13 Pro Max",
-      "platformVersion": "15"
+      "deviceName": "iPhone 15 Pro Max",
+      "platformVersion": "17"
     }
   },
   "iPhone14ProMax_16": {
@@ -11,63 +11,69 @@
       "platformVersion": "16"
     }
   },
-  "iPhoneXR_15": {
+  "iPhone13ProMax_15": {
     "capabilities": {
-      "deviceName": "iPhone XR",
+      "deviceName": "iPhone 13 Pro Max",
       "platformVersion": "15"
     }
   },
-  "iPhone15ProMax_17": {
+  "iPadPro12.92022_16": {
     "capabilities": {
-      "deviceName": "iPhone 15 Pro Max",
-      "platformVersion": "17"
+      "deviceName": "iPad Pro 12.9 2022",
+      "platformVersion": "16"
     }
   },
-  "iPhone12Mini_14": {
+  "iPhoneXR_15": {
     "capabilities": {
-      "deviceName": "iPhone 12 Mini",
-      "platformVersion": "14"
+      "deviceName": "iPhone XR",
+      "platformVersion": "15"
     }
   },
-  "iPadPro112022_16": {
+  "iPhoneSE2020_16": {
     "capabilities": {
-      "deviceName": "iPad Pro 11 2022",
+      "deviceName": "iPhone SE 2020",
       "platformVersion": "16"
     }
   },
-  "SamsungGalaxyS8Plus_9": {
+  "iPhone8_15": {
     "capabilities": {
-      "deviceName": "Samsung Galaxy S8 Plus",
-      "platformVersion": "9.0"
+      "deviceName": "iPhone 8",
+      "platformVersion": "15"
     }
   },
-  "SamsungGalaxyTabS8_12": {
+  "SamsungGalaxyS23Ultra_13": {
     "capabilities": {
-      "deviceName": "Samsung Galaxy Tab S8",
-      "platformVersion": "12.0"
+      "deviceName": "Samsung Galaxy S23 Ultra",
+      "platformVersion": "13.0"
     }
   },
-  "SamsungGalaxyS21Ultra_11": {
+  "SamsungGalaxyS22Ultra_12": {
     "capabilities": {
-      "deviceName": "Samsung Galaxy S21 Ultra",
-      "platformVersion": "11.0"
+      "deviceName": "Samsung Galaxy S22 Ultra",
+      "platformVersion": "12.0"
     }
   },
-  "SamsungGalaxyS22Ultra_12": {
+  "SamsungGalaxyS21_12": {
     "capabilities": {
-      "deviceName": "Samsung Galaxy S22 Ultra",
+      "deviceName": "Samsung Galaxy S21",
       "platformVersion": "12.0"
     }
   },
-  "SamsungGalaxyS20Ultra_10": {
+  "SamsungGalaxyTabS9_13": {
+    "capabilities": {
+      "deviceName": "Samsung Galaxy Tab S9",
+      "platformVersion": "13.0"
+    }
+  },
+  "GooglePixel8Pro_14": {
     "capabilities": {
-      "deviceName": "Samsung Galaxy S20 Ultra",
-      "platformVersion": "10.0"
+      "deviceName": "Google Pixel 8 Pro",
+      "platformVersion": "14.0"
     }
   },
-  "GooglePixel6Pro_13": {
+  "GooglePixel7Pro_13": {
     "capabilities": {
-      "deviceName": "Google Pixel 6 Pro",
+      "deviceName": "Google Pixel 7 Pro",
       "platformVersion": "13.0"
     }
   }