PXBF v0.9.0 (Sprint 46)

.github/workflows/build-and-deploy-main-waf.yml

@@ -5,8 +5,8 @@ on:
     - cron: "0 5 * * 4"
 
 # on:
-#   workflow_dispatch:
-#
+# workflow_dispatch:
+
 jobs:
   checkVersion:
     name: Check versions

.github/workflows/build-and-deploy.yml

@@ -212,6 +212,7 @@ jobs:
           CR_PAT: "${{ secrets.CR_PAT }}"
           CR_USERNAME: "${{ secrets.CR_USERNAME }}"
           PROJECT: "${{ secrets.PROJECT }}"
+          TEST_USER_PASS: "${{ secrets.TEST_USER_PASS }}"
         run: |
           source ./scripts/pipeline/cloud-gov-login.sh
           cd usagov-2021
@@ -221,4 +222,6 @@ jobs:
           cf add-network-policy ${PROJECT}-waf-${BRANCH} ${PROJECT}-cms-${BRANCH} -s ${PROJECT}-${BRANCH} -o ${CF_ORG} --protocol tcp --port 61443
           cf map-route benefit-finder-cms-${BRANCH} apps.internal --hostname benefit-finder-cms-${BRANCH} --app-protocol http1
           cd ..
+          ## sed -i "s#TU_PASS#${TEST_USER_PASS}#g" ./scripts/drush-post-deploy.sh
+          ## cat ./scripts/drush-post-deploy.sh
           source ./scripts/pipeline/cloud-gov-post-deploy.sh

.github/workflows/database-restore.yml

@@ -47,6 +47,7 @@ jobs:
           CF_ORG: "${{ secrets.CF_ORG }}"
           PROJECT: "${{ secrets.PROJECT }}"
           DATABASE_BACKUP_BASTION_NAME: "${{ secrets.DATABASE_BACKUP_BASTION_NAME }}"
+          TEST_USER_PASS: "{{ secrets.TEST_USER_PASS }}"
         run: |
           export S3_FILE_PATH=${{ github.event.inputs.database_file_override }}
           source ./scripts/pipeline/s3-backup-download.sh

.github/workflows/increment_sub_hash.yml

@@ -12,51 +12,55 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: false # Do not checkout submodules initially
-          fetch-depth: 0 # Necessary to fetch all history for branch creation
+          fetch-depth: 0 # Fetch all history
 
-      # Set up GitHub CLI
-      - name: Set up GitHub CLI
-        run: sudo apt-get install gh -y
-
-      - name: Initialize and update submodule
-        continue-on-error: true # This step won't fail the workflow if an error occurs
+      - name: Set up Git
         run: |
-          git submodule update --init --recursive usagov-2021
+          git config --global user.name "Xavier Metichecchia"
+          git config --global user.email "[email protected]"
+          git config --global pull.rebase false  # Ensure merge strategy
+          git remote set-url origin https://${{ secrets.HASH_PAT }}@github.com/GSA/px-benefit-finder.git
 
-      - name: Update submodule to latest commit and capture latest_commit
-        id: update-submodule
-        run: |
-          cd usagov-2021/
-          git config --global user.name "Hash Pipeline"
-          git config --global user.email "[email protected]"
-          git fetch origin
-          latest_commit=$(git rev-parse origin/prod)  # Get latest commit hash of the submodule
-          git checkout $latest_commit
-          cd ..
-          git add usagov-2021
-          git commit --allow-empty -m "Updated submodule to latest commit $latest_commit"
-          echo "::set-output name=latest_commit::$latest_commit"  # Set the output variable
-
-      - name: Make PR Branch using submodule's SHA
+      - name: Update submodules on release branch
+        continue-on-error: true
         run: |
-          git checkout -b update-submodule-hash-$(echo ${{ steps.update-submodule.outputs.latest_commit }} | cut -c1-7)
+          # Checkout the release branch
+          git checkout release
+
+          # Update and initialize submodules
+          git submodule update --init
+          git submodule set-branch --branch prod usagov-2021
+          git submodule update --remote || echo "Expected error: Failed to update all submodules."
+
+          # Check Git Status
+          git add .
+          git commit --allow-empty -m "Updated submodule to the latest commit on release branch"
+
+          # Commit the changes
+          git status
+          git --no-pager diff
 
-      - name: Push the updated branch
+          # Push changes to release branch
+          git push origin release
+
+      - name: Sync release to main
         run: |
-          git push origin HEAD:update-submodule-hash-$(echo ${{ steps.update-submodule.outputs.latest_commit }} | cut -c1-7)
+          # Switch to the main branch
+          git checkout main
+
+          # Pull changes from release into main
+          git pull origin release
+
+          # Push updated main branch
+          git push origin main
 
-      - name: Create Pull Request
-        env:
-          GITHUB_TOKEN: ${{ secrets.ADD_TO_PROJECT_PAT }}
+      - name: Sync release to dev
         run: |
-          gh pr create \
-          --title "Automated PR from update-submodule-hash-$(echo ${{ steps.update-submodule.outputs.latest_commit }} | cut -c1-7) to ${{ github.ref_name }}" \
-          --body "This PR is to update the hash on the usagov-2021 submodule to ${{ steps.update-submodule.outputs.latest_commit }} on branch ${{ github.ref_name }}." \
-          --base ${{ github.ref_name }} \
-          --head "update-submodule-hash-$(echo ${{ steps.update-submodule.outputs.latest_commit }} | cut -c1-7)" \
-          --repo ${{ github.repository }} \
-          --assignee scottqueen-bixal \
-          --reviewer scottqueen-bixal \
-          --label "stale" \
-          --label "maintenance" \
-          --project "PX Benefit Finder"
+          # Switch to the dev branch
+          git checkout dev
+
+          # Pull changes from release into dev
+          git pull origin release
+
+          # Push updated dev branch
+          git push origin dev

.github/workflows/test-cypress.yml

@@ -14,7 +14,6 @@ defaults:
     working-directory: ./benefit-finder
 
 jobs:
-
   tests-chrome:
     runs-on: ubuntu-latest
     steps:
@@ -45,7 +44,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: Chrome cypress screenshots
-          path: ./benefit-finder/cypress/screenshots    
+          path: ./benefit-finder/cypress/screenshots
 
   tests-firefox:
     runs-on: ubuntu-latest
@@ -77,7 +76,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: Firefox cypress screenshots
-          path: ./benefit-finder/cypress/screenshots  
+          path: ./benefit-finder/cypress/screenshots
 
   tests-edge:
     runs-on: ubuntu-latest
@@ -103,50 +102,10 @@ jobs:
           env: NODE_ENV=test
           build: "npm run cy:build:storybook"
           start: "npm run cy:run:pipeline"
-          
+
       - name: Edge Artifact(s)
         if: failure()
         uses: actions/upload-artifact@v4
         with:
           name: Edge cypress screenshots
           path: ./benefit-finder/cypress/screenshots
-
-  tests-webkit:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Install Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: "./benefit-finder/package.json"
-
-      - name: Install Submodule
-        run: |
-          cd ..
-          git submodule init
-          git submodule update
-
-      - name: Install dependencies
-        uses: cypress-io/github-action@v6
-        with:
-          working-directory: ./benefit-finder
-          build: npx playwright-webkit install-deps
-          runTests: false
-
-      - name: Cypress run (WebKit)
-        uses: cypress-io/github-action@v6
-        with:
-          working-directory: ./benefit-finder
-          install: false
-          browser: webkit
-          env: NODE_ENV=test
-          build: "npm run cy:build:storybook"
-          start: "npm run cy:run:pipeline"
-
-      - name: Webkit Artifact(s)
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: Webkit cypress screenshots
-          path: ./benefit-finder/cypress/screenshots

benefit-finder/.gitignore

@@ -30,5 +30,8 @@ yarn-error.log*
 # generated files
 .jest-test-results.json
 storybook-static
+.stylelintcache
+.eslintcache
+
 # cloned
 themes

benefit-finder/.stylelintrc.json

@@ -5,17 +5,6 @@
     "scss/load-no-partial-leading-underscore": null,
     "no-descending-specificity": null,
     "no-duplicate-selectors": null,
-    "selector-class-pattern": null,
-    "font-family-no-missing-generic-family-keyword": [
-      true,
-      {
-        "ignoreFontFamilies": [
-          "PublicSans-ExtraBold",
-          "PublicSans-Bold",
-          "PublicSans-Regular",
-          "PublicSans-ExtraLight"
-        ]
-      }
-    ]
+    "selector-class-pattern": null
   }
 }

benefit-finder/cypress.config.js

@@ -1,4 +1,4 @@
-/* eslint-disable no-console */
+ 
 const { defineConfig } = require('cypress')
 
 module.exports = defineConfig({
@@ -10,7 +10,7 @@ module.exports = defineConfig({
   e2e: {
     baseUrl: 'http://localhost:6006',
     excludeSpecPattern: 'cypress/e2e/usagov-public-site/*.cy.js',
-    setupNodeEvents(on, config) {
+    setupNodeEvents(on) {
       on('task', {
         log(message) {
           console.log(message)

benefit-finder/cypress/e2e/storybook/axe-a11y.cy.js

@@ -1,4 +1,4 @@
-/// <reference types="cypress" />
+/// <reference types="Cypress" />
 
 import * as utils from '../../support/utils.js'
 import * as BENEFITS_ELIBILITY_DATA from '../../fixtures/benefits-eligibility.json'

benefit-finder/cypress/e2e/storybook/benefitAccordionGroup.cy.js

@@ -1,10 +1,12 @@
 import * as utils from '../../support/utils'
 import * as BENEFITS_ELIBILITY_DATA from '../../fixtures/benefits-eligibility.json'
+import { pageObjects } from '../../support/pageObjects'
 
 beforeEach(() => {
   const selectedData = BENEFITS_ELIBILITY_DATA.scenario_1_covid.en.param
   const scenario = utils.encodeURIFromObject(selectedData)
   cy.visit(`${utils.storybookUri}${scenario}`)
+  pageObjects.accordionHeading().should('exist')
 })
 
 describe('BenefitAccordionGroup component tests', () => {
@@ -17,33 +19,26 @@ describe('BenefitAccordionGroup component tests', () => {
   })
 
   it('Validate opening individual accordion expands the clicked accordion and clicking it again closes it', () => {
-    // eslint-disable-next-line cypress/no-unnecessary-waiting
-    cy.wait(2500).then(() => {
-      // get the first visible accordion and check if it is expanded
-      cy.get('.bf-usa-accordion:visible .bf-usa-accordion__button')
-        .eq(0)
-        .should('have.attr', 'aria-expanded', 'false')
-      // get the first visible accordion and click it
-      cy.get('.bf-usa-accordion:visible .bf-usa-accordion__button')
-        .eq(0)
-        .click()
-      // get the first visible accordion and check if it is expanded
-      cy.get('.bf-usa-accordion:visible .bf-usa-accordion__button')
-        .eq(0)
-        .should('have.attr', 'aria-expanded', 'true')
-      // get the second visible accordion and check if it is expanded
-      cy.get('.bf-usa-accordion:visible .bf-usa-accordion__button')
-        .eq(1)
-        .should('have.attr', 'aria-expanded', 'false')
-      // get the first visible accordion and click it
-      cy.get('.bf-usa-accordion:visible .bf-usa-accordion__button')
-        .eq(0)
-        .click()
-      // get the first visible accordion and check if it is expanded
-      cy.get('.bf-usa-accordion:visible .bf-usa-accordion__button')
-        .eq(0)
-        .should('have.attr', 'aria-expanded', 'false')
-    })
+    // get the first visible accordion and check if it is expanded
+    cy.get('.bf-usa-accordion:visible .bf-usa-accordion__button')
+      .eq(0)
+      .should('have.attr', 'aria-expanded', 'false')
+    // get the first visible accordion and click it
+    cy.get('.bf-usa-accordion:visible .bf-usa-accordion__button').eq(0).click()
+    // get the first visible accordion and check if it is expanded
+    cy.get('.bf-usa-accordion:visible .bf-usa-accordion__button')
+      .eq(0)
+      .should('have.attr', 'aria-expanded', 'true')
+    // get the second visible accordion and check if it is expanded
+    cy.get('.bf-usa-accordion:visible .bf-usa-accordion__button')
+      .eq(1)
+      .should('have.attr', 'aria-expanded', 'false')
+    // get the first visible accordion and click it
+    cy.get('.bf-usa-accordion:visible .bf-usa-accordion__button').eq(0).click()
+    // get the first visible accordion and check if it is expanded
+    cy.get('.bf-usa-accordion:visible .bf-usa-accordion__button')
+      .eq(0)
+      .should('have.attr', 'aria-expanded', 'false')
   })
 
   it('Validate clicking Expand all opens all accordions', () => {