Merge branch 'develop' into fix-1102-implment-wysiwyg-to-see-article-…

…exactly
codu-code · Oct 20, 2024 · 917d78e · 917d78e
2 parents 37a91d2 + 77aa243
commit 917d78e
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 20 deletions.
diff --git a/components/ArticlePreview/ArticleLoading.tsx b/components/ArticlePreview/ArticleLoading.tsx
@@ -1,5 +1,8 @@
 const ArticleLoading = () => (
-  <div className="my-4 w-full border-l-4 border-l-pink-600 bg-white p-4 shadow dark:bg-neutral-900">
+  <div
+    className="my-4 w-full border-l-4 border-l-pink-600 bg-white p-4 shadow dark:bg-neutral-900"
+    data-testid="article-loading-indicator"
+  >
     <div className="animate-pulse">
       <div className="flex space-x-4">
         <div className="h-10 w-10 rounded-full bg-neutral-300 dark:bg-neutral-800"></div>

diff --git a/e2e/articles.spec.ts b/e2e/articles.spec.ts
@@ -1,4 +1,5 @@
 import { test, expect } from "playwright/test";
+import { randomUUID } from "crypto";
 
 test.describe("Unauthenticated Articles Page", () => {
   test.beforeEach(async ({ page }) => {
@@ -16,7 +17,7 @@ test.describe("Unauthenticated Articles Page", () => {
     );
   });
 
-  test("Should not show bookmark article icon", async ({ page }) => {
+  test("Should show bookmark article icon", async ({ page }) => {
     await page.goto("http://localhost:3000/articles");
 
     await expect(
@@ -25,7 +26,7 @@ test.describe("Unauthenticated Articles Page", () => {
 
     await expect(
       page.locator("article").first().getByLabel("Bookmark this post"),
-    ).toBeHidden();
+    ).toBeVisible();
   });
   test("Should load more articles when scrolling to the end of the page", async ({
     page,
@@ -57,6 +58,24 @@ test.describe("Unauthenticated Articles Page", () => {
     await expect(page.getByText("Sponsorship")).toBeVisible();
     await expect(page.getByText("Code Of Conduct")).toBeVisible();
   });
+
+  test("Should not be able to post a comment on an article", async ({
+    page,
+  }) => {
+    await page.goto("http://localhost:3000");
+    // Waits for articles to be loaded
+    await expect(page.getByText("Read Full Article").first()).toBeVisible();
+    await page.getByText("Read Full Article").first().click();
+    await page.waitForURL(/^http:\/\/localhost:3000\/articles\/.*$/);
+
+    await expect(page.getByPlaceholder("What do you think?")).toBeHidden();
+
+    await expect(page.getByText("Hey! 👋")).toBeVisible();
+    await expect(page.getByText("Got something to say?")).toBeVisible();
+    await expect(
+      page.getByText("Sign in or sign up to leave a comment"),
+    ).toBeVisible();
+  });
 });
 
 test.describe("Authenticated Articles Page", () => {
@@ -102,27 +121,36 @@ test.describe("Authenticated Articles Page", () => {
     // Waits for articles to be loaded
     await page.waitForSelector("article");
 
-    const initialArticleCount = await page.$$eval(
-      "article",
-      (articles) => articles.length,
-    );
+    // This delays the requests by 100ms.
+    // This is needed as the load more article request was resolving too fast
+    await page.route("**/*", async (route) => {
+      await new Promise((f) => setTimeout(f, 100));
+      await route.continue();
+    });
 
     if (!isMobile) {
-      await page.getByText("Code Of Conduct").scrollIntoViewIfNeeded();
-      await page.waitForTimeout(5000);
-      const finalArticleCount = await page.$$eval(
-        "article",
-        (articles) => articles.length,
-      );
-      expect(finalArticleCount).toBeGreaterThan(initialArticleCount);
+      const articleLocator = page.locator("article");
+      const initialArticleCount = await articleLocator.count();
+
+      await page
+        .getByRole("link", { name: "Code Of Conduct" })
+        .scrollIntoViewIfNeeded();
+
+      // We expect to see the loading indicator become visible why loading and then hidden when more articles are loaded
+      await expect(page.getByTestId("article-loading-indicator")).toBeVisible();
+      await expect(page.getByTestId("article-loading-indicator")).toBeHidden();
+
+      expect(await articleLocator.count()).toBeGreaterThan(initialArticleCount);
     }
 
-    await expect(page.getByText("Home")).toBeVisible();
+    await expect(page.getByRole("link", { name: "Home" })).toBeVisible();
     await expect(
       page.getByLabel("Footer").getByRole("link", { name: "Events" }),
     ).toBeVisible();
-    await expect(page.getByText("Sponsorship")).toBeVisible();
-    await expect(page.getByText("Code Of Conduct")).toBeVisible();
+    await expect(page.getByRole("link", { name: "Sponsorship" })).toBeVisible();
+    await expect(
+      page.getByRole("link", { name: "Code Of Conduct" }),
+    ).toBeVisible();
   });
 
   test("Should write and publish an article", async ({ page, isMobile }) => {
@@ -155,6 +183,7 @@ test.describe("Authenticated Articles Page", () => {
 
     await expect(page.getByRole("button", { name: "Next" })).toBeVisible();
     await page.getByRole("button", { name: "Next" }).click();
+
     await expect(
       page.getByRole("button", { name: "Publish now" }),
     ).toBeVisible();
@@ -176,4 +205,19 @@ test.describe("Authenticated Articles Page", () => {
     await expect(page.getByLabel("like-trigger")).toBeVisible();
     await expect(page.getByLabel("bookmark-trigger")).toBeVisible();
   });
+
+  test("Should post a comment on an article", async ({ page }, workerInfo) => {
+    const commentContent = `This is a great read. Thanks for posting! Sent from ${workerInfo.project.name} + ${randomUUID()}`;
+    await page.goto("http://localhost:3000");
+    // Waits for articles to be loaded
+    await expect(page.getByText("Read Full Article").first()).toBeVisible();
+    await page.getByText("Read Full Article").first().click();
+    await page.waitForURL(/^http:\/\/localhost:3000\/articles\/.*$/);
+
+    await expect(page.getByPlaceholder("What do you think?")).toBeVisible();
+    await page.getByPlaceholder("What do you think?").fill(commentContent);
+    await page.getByRole("button", { name: "Submit" }).click();
+
+    await expect(page.getByText(commentContent)).toBeVisible();
+  });
 });
diff --git a/playwright.config.ts b/playwright.config.ts
@@ -29,22 +29,24 @@ export default defineConfig({
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
     trace: "on-first-retry",
   },
+  expect: {
+    timeout: 10000,
+  },
 
   /* Configure projects for major browsers */
   projects: [
     { name: "setup", testMatch: /auth.setup\.ts/ },
     {
-      name: "chromium",
+      name: "Desktop Chrome",
       use: {
-        ...devices["Desktop Chrome"],
         storageState: "playwright/.auth/browser.json",
       },
       dependencies: ["setup"],
     },
 
     // Example other browsers
     {
-      name: "firefox",
+      name: "Desktop Firefox",
       use: {
         ...devices["Desktop Firefox"],
         storageState: "playwright/.auth/browser.json",