Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ACMS-3473: Fix failing cypress taxonomy test. #1725

Merged
merged 6 commits into from
Jan 24, 2024
Merged

ACMS-3473: Fix failing cypress taxonomy test. #1725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e74f0f2
ACMS-3473: Fix failing cypress taxonomy test.
rajeshreeputra Jan 18, 2024
29d7fd0
ACMS-3473: Verify cypress test in CI.
rajeshreeputra Jan 18, 2024
0f1a99c
ACMS-3473: Update cypress test in cron.
rajeshreeputra Jan 18, 2024
ad68b85
ACMS-3473: Add cypress test in CI.
rajeshreeputra Jan 23, 2024
4e4bf63
ACMS-3473: Update metrix to execute cypress test.
rajeshreeputra Jan 23, 2024
540c367
ACMS-3473: Remove cypress test form CI.
rajeshreeputra Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 10 additions & 29 deletions .github/workflows/acquia_cms_cron.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ jobs:
env:
ORCA_SUT_NAME: acquia/acquia_cms
ORCA_SUT_BRANCH: develop
ORCA_VERSION: ${{ matrix.orca-version }}
ORCA_VERSION: ^4
ORCA_PACKAGES_CONFIG_ALTER: ../acquia_cms/tests/packages_alter.yml
ORCA_FIXTURE_PROJECT_TEMPLATE: acquia/drupal-recommended-project
ORCA_ENABLE_NIGHTWATCH: "FALSE"
Expand All @@ -321,36 +321,10 @@ jobs:
matrix:
orca-job:
- ISOLATED_TEST_ON_CURRENT
- INTEGRATED_TEST_ON_LATEST_LTS
- INTEGRATED_TEST_ON_PREVIOUS_MINOR
php-version:
- 7.4
- 8.1
- 8.2
orca-version:
- ^3
- ^4
exclude:
- orca-job: ISOLATED_TEST_ON_CURRENT
orca-version: ^3
php-version: 7.4
- orca-job: ISOLATED_TEST_ON_CURRENT
orca-version: ^3
php-version: 8.1
- orca-job: ISOLATED_TEST_ON_CURRENT
orca-version: ^3
php-version: 8.2
- orca-job: ISOLATED_TEST_ON_CURRENT
orca-version: ^4
php-version: 7.4
- orca-job: INTEGRATED_TEST_ON_LATEST_LTS
orca-version: ^3
php-version: 8.1
- orca-job: INTEGRATED_TEST_ON_LATEST_LTS
orca-version: ^3
php-version: 8.2
- orca-job: INTEGRATED_TEST_ON_LATEST_LTS
orca-version: ^4
php-version: 7.4
steps:
- uses: actions/checkout@v3
- name: Use Node.js 12.13.1
Expand Down Expand Up @@ -386,8 +360,9 @@ jobs:

# Remove drupal/core patch as it's needed for latest Drupal Core only.
composer config extra.patches.drupal/core {} --json
sed -i 's/2598.patch",/2599.patch"/' modules/acquia_cms_common/composer.json
sed -i 's/2598.patch",/2598.patch"/' modules/acquia_cms_common/composer.json
sed -i '/3356894-mr_3896.patch/d' modules/acquia_cms_common/composer.json
sed -i '/3370946-page-title-backport-10-2-2_0.patch/d' modules/acquia_cms_common/composer.json
# Change requireSameDimensions to true in backstop settings.
sed -i '54s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js
sed -i '111s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js
Expand All @@ -396,6 +371,12 @@ jobs:
sed -i '168s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js
sed -i '187s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js
fi

if [ "${ORCA_JOB}" = "INTEGRATED_TEST_ON_PREVIOUS_MINOR" ]; then
# Update drupal/core patch as per Drupal Core version.
sed -i 's/2024-01-18\/3370946-page-title-backport-10-2-2_0.patch/2024-01-18\/3370946-page-title-backport-10-1-8.patch/g' modules/acquia_cms_common/composer.json
fi

../orca/bin/ci/before_install.sh
chromedriver --disable-dev-shm-usage --disable-extensions --disable-gpu --headless --no-sandbox --port=4444 &
CHROMEDRIVER_PID=$!
Expand Down
6 changes: 3 additions & 3 deletions tests/cypress/cypress/pages/Taxonomy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ class Taxonomy{

// Get delete link for the term.
get deleteTermLink(){
return cy.get("#taxonomy > tbody > tr > td:nth-child(2) > div > div > ul > li.delete.dropbutton__item.dropbutton-action.secondary-action > a")
return cy.get("#taxonomy-overview-terms #taxonomy li.delete > a")
}

// Get newly added term to vocab.
get newlyAddedTerm(){
return cy.get('[id*="edit-terms-"]')
return cy.get('[id*="edit-terms-"]').first()
}

// Delete button to delete term.
Expand Down Expand Up @@ -95,7 +95,7 @@ class Taxonomy{
// Validate term added to vocabulary.
validateAddedTerm(){
this.newlyAddedVocab.click({force:true})
this.newlyAddedTerm.should('have.text',testData.$term_name+"-101")
this.newlyAddedTerm.should('have.text',testData.$term_name)
}

// Delete tem from vocabulary.
Expand Down