Merge pull request #1686 from GSA/dev

v0.6.0.beta.1 (Sprint 38)

.githooks/pre-commit

@@ -91,14 +91,26 @@ $TRUFFLEHOG3_PATH --no-history --no-entropy --severity MEDIUM -vv -r rules.yml -
 
 # Prepare for result checking
 # Check for secrets in the results
-CONTENT=$($JQ_PATH 'length' $ROOT_DIR/truffleHogResults.json)
-if [ "$CONTENT" -eq 0 ]; then
-    rm $ROOT_DIR/truffleHogResults.json
+
+
+# Check if the results JSON file exists and is not empty
+if [ -f "$ROOT_DIR/truffleHogResults.json" ]; then
+    # Use jq to get the length of the content, assuming it might return a count of items or entries
+    CONTENT=$($JQ_PATH 'length' "$ROOT_DIR/truffleHogResults.json")
+else
+    # Set CONTENT to 0 if the file does not exist or is empty to indicate no findings
+    CONTENT=0
+fi
+
+# Now, use the CONTENT to determine the next steps
+if [[ "$CONTENT" -eq 0 ]]; then
+    # If no content is found, remove the JSON file and output that no secrets were found
+    rm "$ROOT_DIR/truffleHogResults.json"
     echo "No secrets found. Commit is safe."
     exit 0
 else
+    # If CONTENT is not zero, indicate that secrets were detected and block the commit
     echo "Secrets detected! Commit blocked."
     echo "Please review and resolve issues."
     exit 1
 fi
-

.github/workflows/integration-test.yml

@@ -0,0 +1,218 @@
+name: Integration Test
+
+on:
+  workflow_dispatch:
+
+jobs:
+  test-frontend:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the release branch
+        uses: actions/checkout@v4
+        with:
+          repository: "GSA/px-benefit-finder"
+          ref: "release" # Specify the branch name here
+
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: "./benefit-finder/package.json"
+
+      - name: Install Submodule
+        run: |
+          cd benefit-finder
+          git submodule init && git submodule update
+
+      - name: Install Dependencies
+        run: |
+          cd benefit-finder
+          npm ic
+
+      - name: Test Frontend
+        run: |
+          cd benefit-finder
+          npm run test:coverage
+
+  tests-chrome:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the release branch
+        uses: actions/checkout@v4
+        with:
+          repository: "GSA/px-benefit-finder"
+          ref: "release" # Specify the branch name here
+
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: "./benefit-finder/package.json"
+
+      - name: Install Submodule
+        run: |
+          cd benefit-finder
+          git submodule init && git submodule update
+
+      - name: Cypress run (Chrome)
+        uses: cypress-io/github-action@v6
+        with:
+          working-directory: ./benefit-finder
+          browser: chrome
+          env: NODE_ENV=test
+          build: "npm run cy:build:storybook"
+          start: "npm run cy:run:pipeline"
+
+      - name: Chrome Artifact(s)
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: Chrome cypress screenshots
+          path: ./benefit-finder/cypress/screenshots
+
+  tests-firefox:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the release branch
+        uses: actions/checkout@v4
+        with:
+          repository: "GSA/px-benefit-finder"
+          ref: "release" # Specify the branch name here
+
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: "./benefit-finder/package.json"
+
+      - name: Install Submodule
+        run: |
+          cd benefit-finder
+          git submodule init && git submodule update
+
+      - name: Cypress run (Firefox)
+        uses: cypress-io/github-action@v6
+        with:
+          working-directory: ./benefit-finder
+          browser: firefox
+          env: NODE_ENV=test
+          build: "npm run cy:build:storybook"
+          start: "npm run cy:run:pipeline"
+
+      - name: Firefox Artifact(s)
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: Firefox cypress screenshots
+          path: ./benefit-finder/cypress/screenshots
+
+  tests-edge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the release branch
+        uses: actions/checkout@v4
+        with:
+          repository: "GSA/px-benefit-finder"
+          ref: "release" # Specify the branch name here
+
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: "./benefit-finder/package.json"
+
+      - name: Install Submodule
+        run: |
+          cd benefit-finder
+          git submodule init && git submodule update
+
+      - name: Cypress run (Edge)
+        uses: cypress-io/github-action@v6
+        with:
+          working-directory: ./benefit-finder
+          browser: edge
+          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 the release branch
+        uses: actions/checkout@v4
+        with:
+          repository: "GSA/px-benefit-finder"
+          ref: "release" # Specify the branch name here
+
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: "./benefit-finder/package.json"
+
+      - name: Install Submodule
+        run: |
+          cd benefit-finder
+          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
+
+  tests-components:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the release branch
+        uses: actions/checkout@v4
+        with:
+          repository: "GSA/px-benefit-finder"
+          ref: "release" # Specify the branch name here
+
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: "./benefit-finder/package.json"
+
+      - name: Install Submodule
+        run: |
+          cd benefit-finder
+          git submodule init && git submodule update
+
+      - name: Cypress run (Chrome)
+        uses: cypress-io/github-action@v6
+        with:
+          # working-directory: ./benefit-finder
+          working-directory: ./benefit-finder
+          component: true
+          browser: chrome
+          env: NODE_ENV=test
+          build: "npm run cy:prebuild:storybook"
+
+      - name: Component Artifact(s)
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: Component cypress screenshots
+          path: ./benefit-finder/cypress/screenshots