Attempt to fix functional tests

intuitem · Dec 3, 2024 · e79c87c · e79c87c
1 parent 61edd8b
commit e79c87c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/enterprise/frontend/src/routes/+layout.svelte b/enterprise/frontend/src/routes/+layout.svelte
@@ -101,8 +101,7 @@
 
 	$: if (browser && $page.url.searchParams.has('refresh')) {
 		$page.url.searchParams.delete('refresh');
-		console.error(`[DEBUG2] ${window.location.href}`); // Just to test if the playwright JS console stderr would actually be outputed in the logs
-		// window.location.href = $page.url.href;
+		window.location.href = $page.url.href;
 	}
 </script>
 

diff --git a/frontend/src/routes/(app)/+page.server.ts b/frontend/src/routes/(app)/+page.server.ts
@@ -1,9 +1,7 @@
 import { redirect } from '@sveltejs/kit';
 import type { PageServerLoad } from './$types';
-import { CI_TEST } from '$lib/utils/env_constants';
 
-const redirectURL = CI_TEST ? '/analytics' : '/analytics?refresh=1';
-
-export const load: PageServerLoad = async () => {
-	redirect(301, redirectURL);
+export const load: PageServerLoad = async ({ url }) => {
+	const queryParams = url.searchParams.has("refresh") ? "?refresh=1" : "";
+	redirect(301, `/analytics${queryParams}`);
 };
diff --git a/frontend/src/routes/(authentication)/login/+page.server.ts b/frontend/src/routes/(authentication)/login/+page.server.ts
@@ -30,7 +30,6 @@ interface AuthenticationFlow {
 function makeRedirectURL(currentLang: string, preferedLang: string, url: URL): string {
 	const next = url.searchParams.get('next');
 	const secureNext = getSecureRedirect(next) || '/';
-	console.error(`[DEBUG] '${currentLang}' === '${preferedLang}'`);
 	if (currentLang === preferedLang) {
 		return secureNext;
 	}