Skip to content

Commit

Permalink
Merge pull request #28 from ThePalaceProject/refactoring
Browse files Browse the repository at this point in the history
Refactoring
  • Loading branch information
AEkaterina authored Jan 24, 2024
2 parents 93427de + 6082e1e commit 054afae
Show file tree
Hide file tree
Showing 12 changed files with 219 additions and 198 deletions.
35 changes: 24 additions & 11 deletions src/test/java/features/AudiobookLyrasis.feature
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,19 @@ Feature: Audiobooks in LYRASIS Reads
| Bibliotheca |
| Palace Marketplace |
| Axis 360 |
| BiblioBoard |

@logout @returnBooks @tier1
Scenario Outline: Navigate by Audiobook
When Search 'available' book of distributor '<distributor>' and bookType 'AUDIOBOOK' and save as 'bookNameInfo'
And Switch to 'Audiobooks' catalog tab
And Switch to 'Audiobooks' catalog tab
And Open AUDIOBOOK 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
Then Check that book contains LISTEN action button on Book details screen
When Click LISTEN action button on Book details screen
Then Audio player screen of book 'bookInfo' is opened
When Tap play button on audio player screen
When Save chapter time as 'chapterTimeKeyForBehind' on audio player screen
And Tap play button on audio player screen
And Tap pause button on audio player screen
And Save book play time as 'timeAhead' on audio player screen
And Save chapter time as 'chapterTimeKey' on audio player screen
Expand All @@ -79,17 +81,18 @@ Feature: Audiobooks in LYRASIS Reads
When Save book play time as 'timeBehind' on audio player screen
And Skip behind 30 seconds on audio player screen
Then Play button is present on audio player screen
And Playback has been moved behind by 30 seconds from 'timeBehind' and 'chapterTimeKey' seconds on audio player screen
And Playback has been moved behind by 30 seconds from 'timeBehind' and 'chapterTimeKeyForBehind' seconds on audio player screen

Scenarios:
| distributor |
| Bibliotheca |
| Palace Marketplace |
| Axis 360 |
| BiblioBoard |

@logout @returnBooks @tier1
Scenario Outline: Check end of chapter sleep timer
When Search 'available' book of distributor '<distributor>' and bookType 'AUDIOBOOK' and save as 'bookNameInfo'
When Search for '<bookName>' and save bookName as 'bookNameInfo'
And Switch to 'Audiobooks' catalog tab
And Open AUDIOBOOK 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
Expand All @@ -110,10 +113,11 @@ Feature: Audiobooks in LYRASIS Reads
Then Chapter name next to 'chapterNumber' chapter on toc audiobook screen is equal to 'nextChapter' saved chapter name

Scenarios:
| distributor |
| Bibliotheca |
| Palace Marketplace |
| Axis 360 |
| bookName |
| The Sentence |
| Smart Brevity |
| The Beasts of Tarzan |
| Two in the Bush |

@logout @returnBooks @tier1 @exclude_android
Scenario Outline: Check of line for time remaining
Expand All @@ -131,6 +135,7 @@ Feature: Audiobooks in LYRASIS Reads
| Bibliotheca |
| Palace Marketplace |
| Axis 360 |
| BiblioBoard |

@logout @returnBooks @tier1
Scenario Outline: Check of switching to the next time
Expand All @@ -152,6 +157,7 @@ Feature: Audiobooks in LYRASIS Reads
| Bibliotheca |
| Palace Marketplace |
| Axis 360 |
| BiblioBoard |

@logout @returnBooks @tier1
Scenario Outline: Check playback speed and sleep timer
Expand Down Expand Up @@ -180,6 +186,7 @@ Feature: Audiobooks in LYRASIS Reads
| Bibliotheca |
| Palace Marketplace |
| Axis 360 |
| BiblioBoard |

@logout @returnBooks @tier1 @exlude_ios
Scenario Outline: Check time tracking line
Expand Down Expand Up @@ -208,6 +215,7 @@ Feature: Audiobooks in LYRASIS Reads
| Bibliotheca |
| Palace Marketplace |
| Axis 360 |
| BiblioBoard |

@logout @returnBooks @tier1 @exclude_ios
Scenario Outline: Check of not rewinding forward and back by tapping on time bar
Expand Down Expand Up @@ -237,6 +245,7 @@ Feature: Audiobooks in LYRASIS Reads
| Palace Marketplace |
| Axis 360 |
| Bibliotheca |
| BiblioBoard |

@logout @returnBooks @tier1
Scenario Outline: Playback speed: Check of playback speed
Expand Down Expand Up @@ -275,10 +284,14 @@ Feature: Audiobooks in LYRASIS Reads
| Axis 360 | 1.25 | 8 | 10 |
| Axis 360 | 1.50 | 6 | 9 |
| Axis 360 | 2.0 | 5 | 10 |
| Bibliotheca | 0.75 | 8 | 6 |
| Bibliotheca | 1.25 | 8 | 10 |
| Bibliotheca | 1.50 | 6 | 9 |
| Bibliotheca | 2.0 | 5 | 10 |
| Bibliotheca | 2.0 | 5 | 10 |
| Bibliotheca | 2.0 | 5 | 10 |
| Bibliotheca | 2.0 | 5 | 10 |
| BiblioBoard | 0.75 | 8 | 6 |
| BiblioBoard | 1.25 | 8 | 10 |
| BiblioBoard | 1.50 | 6 | 9 |
| BiblioBoard | 2.0 | 5 | 10 |

@logout @returnBooks @tier1
Scenario: TOC: Check of table of contents
Expand Down
3 changes: 0 additions & 3 deletions src/test/java/features/EpubLyrasis.feature
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ Feature: Read EPUB in Lyrasis Reads
| Bibliotheca |
| Palace Marketplace |
| Axis 360 |
| BiblioBoard |

@logout @returnBooks @tier1
Scenario Outline: Navigate by bookmarks
Expand Down Expand Up @@ -204,7 +203,6 @@ Feature: Read EPUB in Lyrasis Reads
| Bibliotheca |
| Palace Marketplace |
| Axis 360 |
| BiblioBoard |

@logout @returnBooks @tier1
Scenario Outline: Delete bookmarks
Expand Down Expand Up @@ -234,7 +232,6 @@ Feature: Read EPUB in Lyrasis Reads
| Bibliotheca |
| Palace Marketplace |
| Axis 360 |
| BiblioBoard |

@logout @returnBooks @tier1
Scenario: Read ebooks: Search: Perform check of the placeholder
Expand Down
64 changes: 32 additions & 32 deletions src/test/java/features/PdfLyrasisAndroid.feature
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ Feature: Read PDF in LYRASIS Reads on Android
When Save the number of the last page as 'lastPageInfo' on pdf reader screen
And Open pdf settings screen on pdf reader screen
When Tap Go to last page button on pdf settings screen
Then Page number is equal to 'lastPageInfo' on pdf reader screen
Then Page number is equal to 'lastPageInfo' on pdf reader screen in "LYRASIS Reads"
When Open pdf settings screen on pdf reader screen
Then PDF settings screen is opened
When Tap Go to first page button on pdf settings screen
Then The first page is opened on pdf reader screen
Then The first page is opened on pdf reader screen in "LYRASIS Reads"

@logout @returnBooks @tier1 @exclude_ios
Scenario: Settings: Check of Vertical scrolling in Lyrasis
Expand All @@ -57,12 +57,12 @@ Feature: Read PDF in LYRASIS Reads on Android
Then Vertical scrolling is chosen on settings screen
And Spreads options are available on settings screen
When Open pdf settings screen on pdf reader screen
And Save page number as 'pageInfo' on pdf reader screen
And Save page number as 'pageInfo' on pdf reader screen in "LYRASIS Reads"
And Scroll page down on pdf reader screen
Then Page number is not equal to 'pageInfo' on pdf reader screen
When Save page number as 'pageInfo2' on pdf reader screen
Then Page number is not equal to 'pageInfo' on pdf reader screen in "LYRASIS Reads"
When Save page number as 'pageInfo2' on pdf reader screen in "LYRASIS Reads"
And Scroll page up on pdf reader screen
Then Page number is not equal to 'pageInfo2' on pdf reader screen
Then Page number is not equal to 'pageInfo2' on pdf reader screen in "LYRASIS Reads"

@logout @returnBooks @tier1 @exclude_ios
Scenario: Settings: Check of Horizontal scrolling in Lyrasis
Expand All @@ -79,12 +79,12 @@ Feature: Read PDF in LYRASIS Reads on Android
Then Horizontal scrolling is chosen on settings screen
And Spreads options are not available on settings screen
When Open pdf settings screen on pdf reader screen
And Save page number as 'pageInfo' on pdf reader screen
And Save page number as 'pageInfo' on pdf reader screen in "LYRASIS Reads"
And Go to next page on reader pdf screen
Then Page number is not equal to 'pageInfo' on pdf reader screen
When Save page number as 'pageInfo2' on pdf reader screen
Then Page number is not equal to 'pageInfo' on pdf reader screen in "LYRASIS Reads"
When Save page number as 'pageInfo2' on pdf reader screen in "LYRASIS Reads"
And Go to previous page on reader pdf screen
Then Page number is not equal to 'pageInfo2' on pdf reader screen
Then Page number is not equal to 'pageInfo2' on pdf reader screen in "LYRASIS Reads"

@logout @returnBooks @tier1 @exclude_ios
Scenario: Settings: Check of Wrapped scrolling in Lyrasis
Expand All @@ -101,12 +101,12 @@ Feature: Read PDF in LYRASIS Reads on Android
Then Wrapped scrolling is chosen on settings screen
And Spreads options are available on settings screen
When Open pdf settings screen on pdf reader screen
And Save page number as 'pageInfo' on pdf reader screen
And Save page number as 'pageInfo' on pdf reader screen in "LYRASIS Reads"
And Go to next page on reader pdf screen
Then Page number is not equal to 'pageInfo' on pdf reader screen
When Save page number as 'pageInfo2' on pdf reader screen
Then Page number is not equal to 'pageInfo' on pdf reader screen in "LYRASIS Reads"
When Save page number as 'pageInfo2' on pdf reader screen in "LYRASIS Reads"
And Go to previous page on reader pdf screen
Then Page number is not equal to 'pageInfo2' on pdf reader screen
Then Page number is not equal to 'pageInfo2' on pdf reader screen in "LYRASIS Reads"

@ignore @logout @returnBooks @tier1 @exclude_ios
Scenario: Open book to last page read in Lyrasis
Expand All @@ -118,23 +118,23 @@ Feature: Read PDF in LYRASIS Reads on Android
And Click READ action button on Book details screen
Then Reader pdf screen is opened
When Swipe pdf page down from 7 to 10 times on reader pdf screen
And Save page number as 'pageNumber' on pdf reader screen
And Save page number as 'pageNumber' on pdf reader screen in "LYRASIS Reads"
And Return to previous screen for epub and pdf
And Click READ action button on Book details screen
Then Reader pdf screen is opened
And Page number is equal to 'pageNumber' on pdf reader screen
And Page number is equal to 'pageNumber' on pdf reader screen in "LYRASIS Reads"
When Restart app
And Open Books
Then EBOOK book with READ action button and 'bookInfo' bookInfo is present on books screen
When Open EBOOK book with READ action button and 'bookInfo' bookInfo on books screen
And Click READ action button on Book details screen
Then Reader pdf screen is opened
And Page number is equal to 'pageNumber' on pdf reader screen
And Page number is equal to 'pageNumber' on pdf reader screen in "LYRASIS Reads"

@smoke @logout @returnBooks @exclude_ios
Scenario: Android: Read pdfs: Table of contents: Perform check of navigation of TOC button
When Open search modal
And Search for "A Queen From the North" and save bookName as 'bookNameInfo'
And Search 'available' book of distributor 'Biblioboard' and bookType 'EBOOK' and save as 'bookNameInfo'
And Click GET action button on EBOOK book with 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Then EBOOK book with READ action button and 'bookInfo' bookInfo is present on Catalog books screen
When Open EBOOK book with READ action button and 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Expand All @@ -154,7 +154,7 @@ Feature: Read PDF in LYRASIS Reads on Android
@smoke @logout @returnBooks @exclude_ios
Scenario: Android: Read pdfs: Perform check of Settings
When Open search modal
And Search for "Being Plumville" and save bookName as 'bookNameInfo'
And Search 'available' book of distributor 'Biblioboard' and bookType 'EBOOK' and save as 'bookNameInfo'
And Click GET action button on EBOOK book with 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Then EBOOK book with READ action button and 'bookInfo' bookInfo is present on Catalog books screen
When Open EBOOK book with READ action button and 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Expand All @@ -166,7 +166,7 @@ Feature: Read PDF in LYRASIS Reads on Android
@smoke @logout @returnBooks @exclude_ios
Scenario: Android: Read pdfs: Perform check of scrolling by default (down and up)
When Open search modal
And Search for "The Art of Three" and save bookName as 'bookNameInfo'
And Search 'available' book of distributor 'Biblioboard' and bookType 'EBOOK' and save as 'bookNameInfo'
And Click GET action button on EBOOK book with 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Then EBOOK book with READ action button and 'bookInfo' bookInfo is present on Catalog books screen
When Open EBOOK book with READ action button and 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Expand All @@ -176,17 +176,17 @@ Feature: Read PDF in LYRASIS Reads on Android
Then Vertical scrolling is chosen by default on settings screen
When Open pdf settings screen on pdf reader screen
And Scroll page down on pdf reader screen
And Save page number as 'pageInfo' on pdf reader screen
And Save page number as 'pageInfo' on pdf reader screen in "LYRASIS Reads"
And Scroll page down on pdf reader screen
Then Page number is not equal to 'pageInfo' on pdf reader screen
When Save page number as 'pageInfo2' on pdf reader screen
Then Page number is not equal to 'pageInfo' on pdf reader screen in "LYRASIS Reads"
When Save page number as 'pageInfo2' on pdf reader screen in "LYRASIS Reads"
And Scroll page up on pdf reader screen
Then Page number is not equal to 'pageInfo2' on pdf reader screen
Then Page number is not equal to 'pageInfo2' on pdf reader screen in "LYRASIS Reads"

@smoke @logout @returnBooks @exclude_ios
Scenario: Android: Read pdfs: Table of contents: Perform check of navigation
When Open search modal
And Search for "The Art of Three" and save bookName as 'bookNameInfo'
And Search 'available' book of distributor 'Biblioboard' and bookType 'EBOOK' and save as 'bookNameInfo'
And Click GET action button on EBOOK book with 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Then EBOOK book with READ action button and 'bookInfo' bookInfo is present on Catalog books screen
When Open EBOOK book with READ action button and 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Expand All @@ -202,7 +202,7 @@ Feature: Read PDF in LYRASIS Reads on Android
@smoke @logout @returnBooks @exclude_ios
Scenario: Android: Read pdfs: Perform check of back button
When Open search modal
And Search for "Being Plumville" and save bookName as 'bookNameInfo'
And Search 'available' book of distributor 'Biblioboard' and bookType 'EBOOK' and save as 'bookNameInfo'
And Click GET action button on EBOOK book with 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Then EBOOK book with READ action button and 'bookInfo' bookInfo is present on Catalog books screen
When Open EBOOK book with READ action button and 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Expand All @@ -214,7 +214,7 @@ Feature: Read PDF in LYRASIS Reads on Android
@smoke @logout @returnBooks @exclude_ios
Scenario: Android: Read pdfs: Table of contents: Contents with thumbnails: Perform check of navigation
When Open search modal
And Search for "A Queen From the North" and save bookName as 'bookNameInfo'
And Search 'available' book of distributor 'Biblioboard' and bookType 'EBOOK' and save as 'bookNameInfo'
And Click GET action button on EBOOK book with 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Then EBOOK book with READ action button and 'bookInfo' bookInfo is present on Catalog books screen
When Open EBOOK book with READ action button and 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Expand All @@ -223,14 +223,14 @@ Feature: Read PDF in LYRASIS Reads on Android
When Open TOC on pdf reader screen
And Open content with thumbnails on pdf toc screen
Then Thumbnails of the book pages are displayed
When Open random thumbnail and save the number as 'pageInfo' on pdf toc screen
When Open random thumbnail and save the number as 'pageInfo' on pdf toc screen in "LYRASIS Reads"
And Return to pdf reader screen from pdf toc screen
Then Page number is equal to 'pageInfo' on pdf reader screen
Then Page number is equal to 'pageInfo' on pdf reader screen in "LYRASIS Reads"

@smoke @logout @returnBooks @exclude_ios
Scenario: Android: Read pdfs: Table of contents: Chapter content: Perform check of navigation
When Open search modal
And Search for "A Queen From the North" and save bookName as 'bookNameInfo'
And Search 'available' book of distributor 'Biblioboard' and bookType 'EBOOK' and save as 'bookNameInfo'
And Click GET action button on EBOOK book with 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Then EBOOK book with READ action button and 'bookInfo' bookInfo is present on Catalog books screen
When Open EBOOK book with READ action button and 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Expand All @@ -239,6 +239,6 @@ Feature: Read PDF in LYRASIS Reads on Android
When Open TOC on pdf reader screen
And Open text chapter content on pdf toc screen
Then Text chapter content is opened on pdf toc screen
When Open random chapter and save the number as 'pageInfo' on pdf toc screen
When Open random chapter and save the number as 'pageInfo' on pdf toc screen in "LYRASIS Reads"
And Return to pdf reader screen from pdf toc screen
Then Page number is equal to 'pageInfo' on pdf reader screen
Then Page number is equal to 'pageInfo' on pdf reader screen in "LYRASIS Reads"
Loading

0 comments on commit 054afae

Please sign in to comment.