Skip to content

Commit

Permalink
Merge pull request #33 from ThePalaceProject/refactoring
Browse files Browse the repository at this point in the history 
Refactoring
  • Loading branch information
@AEkaterina
AEkaterina authored Mar 4, 2024
2 parents 9ef5d70 + 78815c6 commit 0a02567
Show file tree
Hide file tree
Showing 12 changed files with 236 additions and 327 deletions.
47 changes: 4 additions & 43 deletions .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
bs_app_link:
description: 'app_url of uploaded to BS link'
required: true
default: 'bs://0b0718a5fc1dc8444a6f437e2790299b731e38ef'
default: 'bs://c18a7bd4186aa3384596153ab08de6e3f157d350'
build_name:
description: 'build name of given application'
required: true
Expand All @@ -35,7 +35,7 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up JDK 11
uses: actions/setup-java@v3
Expand All @@ -62,44 +62,5 @@ jobs:
name: allure-report
path: target/site/allure-maven-plugin

# - name: Get Allure history
# uses: actions/checkout@v3
# if: always()
# continue-on-error: true
# with:
# ref: gh-pages
# path: gh-pages
#
# - name: Allure Report action from marketplace
# uses: PavanMudigonda/[email protected]
# if: always()
# id: allure-report
# with:
# token: ${{ secrets.PERSONAL_TOKEN }}
# WORKFLOW_ID: maven.yml
# allure_results: allure-results
# gh_pages: gh-pages
# allure_report: allure-report
# allure_history: allure-history
#
# - name: Deploy report to GitHub Pages
# if: always()
# uses: peaceiris/actions-gh-pages@v2
# env:
# PERSONAL_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
# PUBLISH_BRANCH: gh-pages
# PUBLISH_DIR: allure-history
# keep_files: true
#
# - name: Post the link to the report
# if: always()
# uses: Sibz/github-status-action@v1
# with:
# authToken: ${{secrets.PERSONAL_TOKEN}}
# context: 'Test report'
# state: 'success'
# sha: ${{ github.event.pull_request.head.sha || github.sha }}
# target_url: https://thepalaceproject.github.io/allure-html-reporter-github-pages/${{ github.run_number }}
#
# - name: Debug Allure Results
# run: ls -R allure-results
- name: Clean Up
run: rm -rf allure-results
78 changes: 0 additions & 78 deletions .github/workflows/sonarqube.yml
View file

This file was deleted.

24 changes: 0 additions & 24 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@
</configuration>
</plugin>

<!-- <plugin>-->
<!-- <groupId>io.qameta.allure</groupId>-->
<!-- <artifactId>allure-maven</artifactId>-->
<!-- <version>2.10.0</version>-->
<!-- </plugin>-->

<plugin>
<groupId>io.qameta.allure</groupId>
<artifactId>allure-maven</artifactId>
Expand Down Expand Up @@ -157,29 +151,11 @@
<version>2.2.11</version>
</dependency>

<dependency>
<groupId>com.github.aquality-automation</groupId>
<artifactId>aquality-tracking-cucumber5-jvm</artifactId>
<version>1.3.1</version>
</dependency>

<dependency>
<groupId>net.masterthought</groupId>
<artifactId>cucumber-reporting</artifactId>
<version>5.7.6</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.github.aquality-automation</groupId>
<artifactId>aquality-tracking-cucumber5-jvm</artifactId>
<version>1.3.1</version>
</dependency>

<!-- <dependency>-->
<!-- <groupId>com.github.aquality-automation</groupId>-->
<!-- <artifactId>aquality-tracking-integrations-core</artifactId>-->
<!-- <version>1.3.1</version>-->
<!-- </dependency>-->
</dependencies>
</project>
126 changes: 7 additions & 119 deletions src/test/java/features/BookDetailView.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ Feature: Book detail view screen
And Book format in Information section is '<format>' on Book details screen
Scenarios:
| distributor | bookType | tabName | format |
| Bibliotheca | EBOOK | eBooks | eBook |
| Bibliotheca | EBOOK | eBooks | ePub |
| Bibliotheca | AUDIOBOOK | Audiobooks | Audiobook |
| Axis 360 | EBOOK | eBooks | eBook |
| Axis 360 | EBOOK | eBooks | ePub |
| Axis 360 | AUDIOBOOK | Audiobooks | Audiobook |
| Palace Marketplace | EBOOK | eBooks | eBook |
| Palace Marketplace | EBOOK | eBooks | ePub |
| Palace Marketplace | AUDIOBOOK | Audiobooks | Audiobook |
| Biblioboard | EBOOK | eBooks | PDF |
| Biblioboard | AUDIOBOOK | Audiobooks | Audiobook |
Expand Down Expand Up @@ -83,7 +83,6 @@ Feature: Book detail view screen
And Switch to '<tabName>' catalog tab
And Open <bookType> book with GET action button and 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Then Book 'bookInfo' is opened on book details screen
And Publisher and Categories in Information section are displayed on book details screen
And Publisher and Categories in Information section are correct on book details screen
And Distributor is equal to '<distributor>' on book details screen

Expand Down Expand Up @@ -123,51 +122,6 @@ Feature: Book detail view screen
| Biblioboard | EBOOK | eBooks |
| Biblioboard | AUDIOBOOK | Audiobooks |

@tier2
Scenario: Check of a book title and author in Palace Bookshelf
When Add library "Palace Bookshelf" on Add library screen
Then Library "Palace Bookshelf" is opened on Catalog screen
When Open search modal
And Search for "Persuasion" and save bookName as 'bookNameInfo'
And Open EBOOK book with GET action button and 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Then Book 'bookInfo' is opened on book details screen
And Book 'bookInfo' has correct title and author name on Book details screen
And The book cover is displayed on Book details screen

@tier2
Scenario: Check of a "More..." button in Description section in Palace Bookshelf
When Add library "Palace Bookshelf" on Add library screen
Then Library "Palace Bookshelf" is opened on Catalog screen
When Open search modal
And Search for "Persuasion" and save bookName as 'bookNameInfo'
And Open EBOOK book with GET action button and 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Then Book 'bookInfo' is opened on book details screen
And Description exists on Book details screen
And Button More in Description is available on Book details screen

@tier2
Scenario: Check fields in Information section in Palace Bookshelf
When Add library "Palace Bookshelf" on Add library screen
Then Library "Palace Bookshelf" is opened on Catalog screen
When Open search modal
And Search for "The Covid Archive" and save bookName as 'bookNameInfo'
And Open EBOOK book with GET action button and 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Then Book 'bookInfo' is opened on book details screen
And Publisher and Categories in Information section are correct on book details screen

@tier2
Scenario: Check related books section in Palace Bookshelf
When Add library "Palace Bookshelf" on Add library screen
Then Library "Palace Bookshelf" is opened on Catalog screen
When Open search modal
And Search for "The Picture of Dorian Gray" and save bookName as 'bookNameInfo'
And Open EBOOK book with GET action button and 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Then Book 'bookInfo' is opened on book details screen
When Swipe down
Then Related books section of 'bookInfo' book is displayed on book details screen
And There is a list of related books on book details screen
And More button in related books section is available on book details screen

@tier2
Scenario: Check of a book title and author in Overdrive
When Add library "Palace Bookshelf" on Add library screen
Expand Down Expand Up @@ -216,24 +170,6 @@ Feature: Book detail view screen
And Publisher and Categories in Information section are correct on book details screen
And Distributor is equal to 'Overdrive' on book details screen

@tier2
Scenario: Check related books section in Overdrive
When Add library "Palace Bookshelf" on Add library screen
Then Library "Palace Bookshelf" is opened on Catalog screen
When Turn on test mode
And Enable hidden libraries
And Open Catalog
And Add "A1QA Test Library" account by the logo
Then Library "A1QA Test Library" is opened on Catalog screen
When Open search modal
And Search for "Little Women" and save bookName as 'bookNameInfo'
And Open EBOOK book with GET action button and 'bookNameInfo' bookName on Catalog books screen and save book as 'bookInfo'
Then Book 'bookInfo' is opened on book details screen
When Swipe down
Then Related books section of 'bookInfo' book is displayed on book details screen
And There is a list of related books on book details screen
And More button in related books section is available on book details screen

@tier2
Scenario: Get button: Check of availability of required interface elements
When Add library "LYRASIS Reads" on Add library screen
Expand Down Expand Up @@ -316,7 +252,7 @@ Feature: Book detail view screen
When Enter a Library card with <numbers> numbers and save it as 'libraryCard' on Sign in screen
And Enter a valid Password for "LYRASIS Reads" library on Sign in screen
And Tap the Sign in button on Sign in screen
Then There is an alert "Invalid credentials" on Sign in screen
Then There is an alert "Invalid Credentials" on Sign in screen

Scenarios:
| numbers |
Expand All @@ -335,9 +271,9 @@ Feature: Book detail view screen
When Enter a Library card with 14 latin letters and save it as 'libraryCard' on Sign in screen
And Enter a valid Password for "LYRASIS Reads" library on Sign in screen
And Tap the Sign in button on Sign in screen
Then There is an alert "Invalid credentials" on Sign in screen
Then There is an alert "Invalid Credentials" on Sign in screen

@report
@tier2
Scenario: Book detail view: Perform check of Get button before log in from the Settings tab
When Add library "LYRASIS Reads" on Add library screen
Then Library "LYRASIS Reads" is opened on Catalog screen
Expand Down Expand Up @@ -369,52 +305,4 @@ Feature: Book detail view screen
Then Sing in screen is opened
When Save library "LYRASIS Reads" for log out
And Enter valid credentials fot "LYRASIS Reads" library on Sign in screen
Then Check that book contains READ action button on Book details screen

# sorting doesn't work correctly
# @tier1
# Scenario: Check of sorting books in related books in Palace
# When I add "Palace Bookshelf" account from welcomeScreen
# And I open Catalog
# And I open search modal
# And I search for "Persuasion" and save bookName as 'bookNameInfo'
# And Open EBOOK book with GET action button and 'bookNameInfo' bookName on catalog books screen and save book as 'bookInfo'
# Then Book 'bookInfo' is opened on book details screen
# When Tap More... button in related books on book details view
# And I sort books by AUTHOR
# Then Books are sorted by Author ascending
# When I save list of books as 'listOfBooks'
# And I sort books by RECENTLY_ADDED
# Then List of books on subcategory screen is not equal to list of books saved as 'listOfBooks'
# When I sort books by TITLE
# Then Books are sorted by Title ascending

# sorting doesn't work correctly
# @tier1
# Scenario Outline: Check of sorting books in related books in LYRASIS
# When I add "LYRASIS Reads" account from welcomeScreen
# And I open Catalog
# And I open search modal
# And I search 'available' book of distributor '<distributor>' and bookType '<bookType>' and save as 'bookNameInfo'
# And I switch to '<tabName>' catalog tab
# And Open <bookType> book with GET action button and 'bookNameInfo' bookName on catalog books screen and save book as 'bookInfo'
# Then Book 'bookInfo' is opened on book details screen
# When Tap More... button in related books on book details view
# And I sort books by AUTHOR
# Then Books are sorted by Author ascending
# When I save list of books as 'listOfBooks'
# And I sort books by RECENTLY_ADDED
# Then List of books on subcategory screen is not equal to list of books saved as 'listOfBooks'
# When I sort books by TITLE
# Then Books are sorted by Title ascending
#
# Scenarios:
# | distributor | bookType | tabName |
# | Bibliotheca | EBOOK | eBooks |
# | Bibliotheca | AUDIOBOOK | Audiobooks |
# | Axis 360 | EBOOK | eBooks |
# | Axis 360 | AUDIOBOOK | Audiobooks |
# | Palace Marketplace | EBOOK | eBooks |
# | Palace Marketplace | AUDIOBOOK | Audiobooks |
# | Biblioboard | EBOOK | eBooks |
# | Biblioboard | AUDIOBOOK | Audiobooks |
Then Check that book contains READ action button on Book details screen
Loading

0 comments on commit 0a02567

Please sign in to comment.