fix(ci): format codeql workflow and fix flaky one.gov.sg test

.github/workflows/codeql.yml

@@ -1,50 +1,50 @@
-name: 'OGP CodeQL'
+name: "OGP CodeQL"
 
 on:
- push:
-   branches: [ 'master' ]
- pull_request: 
-   branches: [ 'master' ]
- schedule:
-   - cron: '0 10 * * *'
+  push:
+    branches: ["master"]
+  pull_request:
+    branches: ["master"]
+  schedule:
+    - cron: "0 10 * * *"
 
 jobs:
- analyze:
-   name: Analyze (${{matrix.language}})
-   runs-on: ${{(matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest'}}
-   timeout-minutes: ${{(matrix.language == 'swift' && 120) || 360}}
-   permissions:
-     # Required for all workflows
-     security-events: write
-
-     # Required to fetch internal or private CodeQL packs
-     packages: read
-
-     # Only required for workflows in private repositories
-     actions: read
-     contents: read
-
-   strategy:
-     fail-fast: false
-     matrix:
-       include:
-         - language: javascript-typescript
-           build-mode: none
-   steps:
-     - name: Checkout repository
-       uses: actions/checkout@v4
-
-     # Initializes the CodeQL tools for scanning.
-     - name: Initialize CodeQL
-       uses: github/codeql-action/init@v3
-       with:
-         languages: ${{matrix.language}}
-         build-mode: ${{matrix.build-mode}}
-
-         # Pull config from https://github.com/opengovsg/codeql-config/blob/prod/codeql-config.yml
-         config-file: opengovsg/codeql-config/codeql-config.yml@prod
-
-     - name: Perform CodeQL Analysis
-       uses: github/codeql-action/analyze@v3
-       with:
-         category: '/language:${{matrix.language}}'
+  analyze:
+    name: Analyze (${{matrix.language}})
+    runs-on: ${{(matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest'}}
+    timeout-minutes: ${{(matrix.language == 'swift' && 120) || 360}}
+    permissions:
+      # Required for all workflows
+      security-events: write
+
+      # Required to fetch internal or private CodeQL packs
+      packages: read
+
+      # Only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - language: javascript-typescript
+            build-mode: none
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{matrix.language}}
+          build-mode: ${{matrix.build-mode}}
+
+          # Pull config from https://github.com/opengovsg/codeql-config/blob/prod/codeql-config.yml
+          config-file: opengovsg/codeql-config/codeql-config.yml@prod
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:${{matrix.language}}"

frontend/src/components/login/tests/one-gov-sg-navigation.test.tsx

@@ -64,9 +64,14 @@ test('exchanges captured params and replaces the callback history entry', async
   })
   expect(window.location.search).toBe('')
 
-  fireEvent.click(
-    await screen.findByRole('button', { name: 'Back from campaigns' })
-  )
-  expect(await screen.findByText('Prior page')).toBeInTheDocument()
+  const back = await screen.findByRole('button', {
+    name: 'Back from campaigns',
+  })
+  // react-router 6.3 ignores navigate() until the component's useEffect runs,
+  // which can be after the button is already in the DOM.
+  await waitFor(() => {
+    fireEvent.click(back)
+    expect(screen.getByText('Prior page')).toBeInTheDocument()
+  })
   window.history.replaceState(null, '', '/')
 })