[SPRINT] Polish result & OK24 (#71)

aion-dk · Jan 18, 2024 · c23119c · c23119c
2 parents 9f3ab5e + 21e3cc1
commit c23119c
Show file tree

Hide file tree

Showing 25 changed files with 216 additions and 221 deletions.
diff --git a/client/e2e/locales.spec.ts b/client/e2e/locales.spec.ts
@@ -7,7 +7,7 @@ test("changing locale", async ({ page, isMobile }) => {
     const url = route.request().url();
 
     // Intercept DBB latest config calls
-    if (url.indexOf("us3/configuration/latest_config") > 0) {
+    if (url.indexOf("board_slug/configuration/latest_config") > 0) {
       return route.fulfill({
         status: 200,
         contentType: "application/json",
@@ -27,7 +27,7 @@ test("changing locale", async ({ page, isMobile }) => {
     return route.continue();
   });
 
-  await page.goto("/en/us3");
+  await page.goto("/en/organisation_slug/election_slug");
 
   if (isMobile) {
     await page.locator(".Header__Hamburger_Btn").click();

diff --git a/client/e2e/logs.spec.ts b/client/e2e/logs.spec.ts
@@ -12,7 +12,7 @@ test("downloading logs", async ({ page, isMobile }) => {
     const url = route.request().url();
 
     // Intercept DBB latest config calls
-    if (url.indexOf("us3/configuration/latest_config") > 0) {
+    if (url.indexOf("board_slug/configuration/latest_config") > 0) {
       return route.fulfill({
         status: 200,
         contentType: "application/json",
@@ -21,7 +21,7 @@ test("downloading logs", async ({ page, isMobile }) => {
     }
 
     // Intercept download request
-    if (url.indexOf("us3/download_log") > 0) {
+    if (url.indexOf("board_slug/download_log") > 0) {
       return route.fulfill({
         status: 200,
         contentType: "application/octet-stream",
@@ -41,7 +41,7 @@ test("downloading logs", async ({ page, isMobile }) => {
     return route.continue();
   });
 
-  await page.goto("/en/us3");
+  await page.goto("/en/organisation_slug/election_slug");
   if (isMobile) {
     await page.locator(".Header__Hamburger_Btn").click();
   }
@@ -65,7 +65,7 @@ test("traversing board items", async ({ page, isMobile }) => {
     const url = route.request().url();
 
     // Intercept DBB latest config calls
-    if (url.indexOf("us3/configuration/latest_config") > 0) {
+    if (url.indexOf("board_slug/configuration/latest_config") > 0) {
       return route.fulfill({
         status: 200,
         contentType: "application/json",
@@ -74,7 +74,7 @@ test("traversing board items", async ({ page, isMobile }) => {
     }
 
     // Intercept page 1 of the board
-    if (url.indexOf("us3/board?page=1") > 0) {
+    if (url.indexOf("board_slug/board?page=1") > 0) {
       return route.fulfill({
         status: 200,
         contentType: "application/octet-stream",
@@ -83,7 +83,7 @@ test("traversing board items", async ({ page, isMobile }) => {
     }
 
     // Intercept page 2 of the board
-    if (url.indexOf("us3/board?page=2") > 0) {
+    if (url.indexOf("board_slug/board?page=2") > 0) {
       return route.fulfill({
         status: 200,
         contentType: "application/octet-stream",
@@ -103,7 +103,7 @@ test("traversing board items", async ({ page, isMobile }) => {
     return route.continue();
   });
 
-  await page.goto("/en/us3");
+  await page.goto("/en/organisation_slug/election_slug");
   if (isMobile) {
     await page.locator(".Header__Hamburger_Btn").click();
   }

diff --git a/client/e2e/mocks.ts b/client/e2e/mocks.ts
@@ -77,7 +77,8 @@ export const boardItemsPage2 = {
 export const status = {
   election: {
     id: 2,
-    slug: "93b0d474",
+    slug: "election_slug",
+    organisation_slug: "organisation_slug",
     title: {
       en: "Funny Election",
       es: "Elección divertida",
@@ -92,11 +93,13 @@ export const status = {
     trustMode: "verifiable",
     enabledLocales: ["en", "da", "de", "es"],
     readyForVoting: true,
-    boardSlug: "voting_93b0d474",
-    boardUrl: "http://dbb:3003/voting_93b0d474",
+    boardSlug: "board_slug",
+    boardUrl: "http://dbb:3003/board_slug",
     dbasUrl: "http://localhost:3010",
-    electionClientUrl: "http://localhost:9080/#/e/voting/93b0d474",
-    statisticsClientUrl: "http://localhost:5173/voting/93b0d474",
+    electionClientUrl:
+      "http://localhost:9080/e/organisation_slug/election_slug",
+    statisticsClientUrl:
+      "http://localhost:5173/organisation_slug/election_slug",
     hide_dbas: false,
     hideBenaloh: false,
   },

diff --git a/client/e2e/trackBallot.spec.ts b/client/e2e/trackBallot.spec.ts
@@ -7,7 +7,7 @@ test("tracking a ballot", async ({ page }) => {
     const url = route.request().url();
 
     // Intercept DBB latest config calls
-    if (url.indexOf("us3/configuration/latest_config") > 0) {
+    if (url.indexOf("board_slug/configuration/latest_config") > 0) {
       return route.fulfill({
         status: 200,
         contentType: "application/json",
@@ -16,7 +16,7 @@ test("tracking a ballot", async ({ page }) => {
     }
 
     // Intercept DBB ballot status calls
-    if (url.indexOf("us3/ballot_status") > 0) {
+    if (url.indexOf("board_slug/ballot_status") > 0) {
       return route.fulfill({
         status: 200,
         contentType: "application/json",
@@ -36,7 +36,7 @@ test("tracking a ballot", async ({ page }) => {
     return route.continue();
   });
 
-  await page.goto("/en/us3/track");
+  await page.goto("/en/organisation_slug/election_slug/track");
   await expect(page.locator("h3")).toHaveText("Ballot Tracker");
   await page.getByPlaceholder("Tracking code").fill("5ksv8Ee");
   await page.getByRole("button", { name: "Track my ballot" }).click();
@@ -51,7 +51,7 @@ test("tracking a non-existing ballot shows an error", async ({ page }) => {
     const url = route.request().url();
 
     // Intercept DBB latest config calls
-    if (url.indexOf("us3/configuration/latest_config") > 0) {
+    if (url.indexOf("board_slug/configuration/latest_config") > 0) {
       return route.fulfill({
         status: 200,
         contentType: "application/json",
@@ -60,7 +60,7 @@ test("tracking a non-existing ballot shows an error", async ({ page }) => {
     }
 
     // Intercept DBB ballot status calls
-    if (url.indexOf("us3/ballot_status") > 0) {
+    if (url.indexOf("board_slug/ballot_status") > 0) {
       return route.fulfill({
         status: 404,
         contentType: "application/json",
@@ -80,7 +80,7 @@ test("tracking a non-existing ballot shows an error", async ({ page }) => {
     return route.continue();
   });
 
-  await page.goto("/en/us3/track");
+  await page.goto("/en/organisation_slug/election_slug/track");
   await expect(page.locator("h3")).toHaveText("Ballot Tracker");
   await page.getByPlaceholder("Tracking code").fill("abcdef");
   await page.getByRole("button", { name: "Track my ballot" }).click();

diff --git a/client/e2e/verifyBallot.spec.ts b/client/e2e/verifyBallot.spec.ts
@@ -7,7 +7,7 @@ test("verifying a ballot", async ({ page }) => {
     const url = route.request().url();
 
     // Intercept DBB latest config calls
-    if (url.indexOf("us3/configuration/latest_config") > 0) {
+    if (url.indexOf("board_slug/configuration/latest_config") > 0) {
       return route.fulfill({
         status: 200,
         contentType: "application/json",
@@ -27,7 +27,7 @@ test("verifying a ballot", async ({ page }) => {
     return route.continue();
   });
 
-  await page.goto("/en/us3/verify");
+  await page.goto("/en/organisation_slug/election_slug/verify");
   await expect(page.locator("h3")).toHaveText("Ballot Tester");
   await page.getByPlaceholder("Testing code").fill("5ksv8Ee");
   await page.getByRole("button", { name: "Start the Test" }).click();
@@ -39,7 +39,7 @@ test("verifying with an invalid verification code", async ({ page }) => {
     const url = route.request().url();
 
     // Intercept DBB latest config calls
-    if (url.indexOf("us3/configuration/latest_config") > 0) {
+    if (url.indexOf("board_slug/configuration/latest_config") > 0) {
       return route.fulfill({
         status: 200,
         contentType: "application/json",
@@ -48,7 +48,9 @@ test("verifying with an invalid verification code", async ({ page }) => {
     }
 
     // Intercept DBB verification lookup call
-    if (url.indexOf("us3/verification/vote_track") > 0) {
+    if (
+      url.indexOf("organisation_slug/election_slug/verification/vote_track") > 0
+    ) {
       return route.fulfill({
         status: 404,
         contentType: "application/json",
@@ -68,7 +70,7 @@ test("verifying with an invalid verification code", async ({ page }) => {
     return route.continue();
   });
 
-  await page.goto("/en/us3/verify");
+  await page.goto("/en/organisation_slug/election_slug/verify");
   await expect(page.locator("h3")).toHaveText("Ballot Tester");
   await page.getByPlaceholder("Testing code").fill("invalid-code");
   await page.getByRole("button", { name: "Start the Test" }).click();

diff --git a/client/index.html b/client/index.html
@@ -8,7 +8,7 @@
     />
     <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>DBAS</title>
+    <title>Election Verification Site</title>
 
     <!-- Start Google fonts -->
     <link rel="preconnect" href="https://fonts.googleapis.com" />