adding logging to debug e2e action

HHS · Feb 6, 2025 · 23ca70c · 23ca70c
1 parent 309b04a
commit 23ca70c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/ci-frontend-e2e.yml b/.github/workflows/ci-frontend-e2e.yml
@@ -46,9 +46,11 @@ jobs:
       - name: Start API Server for e2e tests
         run: |
           cd ../api
-          make init db-seed-local populate-search-opportunities start
+          make setup-env-override-file
           echo "LOGIN_FINAL_DESTINATION=http://localhost:3000/api/auth/callback" >> override.env
           echo "ENABLE_OPPORTUNITY_ATTACHMENT_PIPELINE=false" >> override.env
+          cat override.env
+          make init db-seed-local populate-search-opportunities start
           cd ../frontend
           # Ensure the API wait script is executable
           chmod +x ../api/bin/wait-for-api.sh

diff --git a/api/src/auth/auth_utils.py b/api/src/auth/auth_utils.py
@@ -62,7 +62,7 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> flask.Response:
                     )
 
                 return response.redirect_response(
-                    get_final_redirect_uri("error", error_description=message)
+                    get_final_redirect_uri("error", error_description=e.message)
                 )
             except Exception:
                 # Any other exception, we'll just use a generic error message to be safe

diff --git a/frontend/src/app/api/auth/callback/route.ts b/frontend/src/app/api/auth/callback/route.ts
@@ -6,6 +6,7 @@ import { NextRequest } from "next/server";
 export async function GET(request: NextRequest) {
   const token = request.nextUrl.searchParams.get("token");
   if (!token) {
+    console.error("No token provided to auth callback", request.url);
     return redirect("/unauthorized");
   }
   try {

diff --git a/frontend/tests/e2e/playwrightUtils.ts b/frontend/tests/e2e/playwrightUtils.ts
@@ -50,8 +50,13 @@ export async function waitForUrl(
   page: Page,
   url: string,
   timeout = 30000, // query params get set after a debounce period
+  debug = false,
 ) {
   const changeCheck = (pageUrl: string): boolean => {
+    if (debug) {
+      // eslint-disable-next-line
+      console.log(`~~ checking url for change: ${pageUrl} ~~`);
+    }
     return pageUrl === url;
   };
   await waitForURLChange(page, changeCheck, timeout);
@@ -122,7 +127,8 @@ export const performSignIn = async (page: Page, project: FullProject) => {
   await requiredInput.fill(randomUserName);
   await submitButton.click();
 
-  await waitForUrl(page, "http://localhost:3000/");
+  await waitForUrl(page, "http://localhost:3000/", 30000, true);
+  // await waitForUrl(page, "http://localhost:3000");
 
   if (project.name.match(/[Mm]obile/)) {
     const userDropdown = page.locator(

diff --git a/frontend/tests/e2e/saved-grants.spec.ts b/frontend/tests/e2e/saved-grants.spec.ts
@@ -16,7 +16,9 @@ test("redirects if not logged in", async ({ page }) => {
   await expect(page).toHaveTitle("Unauthenticated | Simpler.Grants.gov");
 });
 
-test("shows save / search cta if logged in", async ({ page }, { project }) => {
+test.only("shows save / search cta if logged in", async ({ page }, {
+  project,
+}) => {
   await page.goto("http://localhost:3000/?_ff=authOn:true");
   await performSignIn(page, project);
 

diff --git a/frontend/tests/playwright.config.ts b/frontend/tests/playwright.config.ts
@@ -15,7 +15,7 @@ export default defineConfig({
   /* Run tests in files in parallel */
   fullyParallel: true,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
+  forbidOnly: false,
   /* Retry on CI only */
   retries: process.env.CI ? 2 : 0,
   /* Opt out of parallel tests on CI. */