Fixing the data helpers

Author: perfetti

.github/workflows/test.yml

@@ -48,7 +48,7 @@ jobs:
           submodules: false
 
       - name: Build and start Docker Compose services
-        run: bash ./setup_github.sh && docker compose up --build -d
+        run: bash ./build_github.sh
 
       - name: check dns is working
         run: cat /etc/hosts; netstat -tulpn # Use -tulpn to show TCP/UDP listeners
@@ -65,9 +65,9 @@ jobs:
           config: pageLoadTimeout=100000,baseUrl=http://localhost:8089
           working-directory: test/
 
-      - name: Check if tests failed
-        if: ${{ failure() }}
-        uses: mxschmitt/action-tmate@v3
+      # - name: Check if tests failed
+      #   if: ${{ failure() }}
+      #   uses: mxschmitt/action-tmate@v3
 
       - name: Save artifact
         uses: actions/upload-artifact@v4

build_github.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-source ./setup_github.sh
+source .env
 
 # Run Docker Compose without local volumes
-docker-compose -f docker-compose.yaml up --build --no-deps
+docker-compose up --build --no-deps -d

build_local.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
-
 source ./setup_local.sh
 
 # Run Docker Compose
-docker-compose up --build
+docker-compose up --build -d

repo_refs/rails-app

@@ -1 +1 @@
-Subproject commit a99a8fe5362a1541a58059e0c03ae3a5fd392802
+Subproject commit 6479f9e9a4a8041809a3b3f1ef1ac8359c8f665b

setup_github.sh

@@ -12,6 +12,12 @@ describe("Books Flow", () => {
     // Propose a new book
     cy.contains("button", "Propose New Book").click();
     cy.get('input[placeholder="Enter book title"]').type("Test Book Title");
+    cy.get('input[placeholder="Enter book publisher"]').type(
+      "Test Author Name"
+    );
+    cy.get('input[placeholder="Enter book author"]').type(
+      "Test Publisher Name"
+    );
     cy.contains("button", "Submit").click();
 
     // Visit React2 app (/backend path)
@@ -43,6 +49,12 @@ describe("Books Flow", () => {
     // Propose a new book
     cy.contains("button", "Propose New Book").click();
     cy.get('input[placeholder="Enter book title"]').type("Book To Deny");
+    cy.get('input[placeholder="Enter book publisher"]').type(
+      "Test Author Name"
+    );
+    cy.get('input[placeholder="Enter book author"]').type(
+      "Test Publisher Name"
+    );
     cy.contains("button", "Submit").click();
 
     // Visit React2 app and deny the book

test/cypress/e2e/books_flow.cy.js

@@ -1,22 +1,44 @@
 // This test suite is designed to verify the functionality of Cypress data helpers.
 // It should be run before other test suites to ensure data helpers are working correctly.
 
-describe("Cypress Data Helpers", () => {
-  it("should verify the data helper for creating test data", () => {
-    cy.request("POST", "/api/test_data/setup", {
-      /* payload */
-    }).then((response) => {
-      expect(response.status).to.eq(200);
-      // Add more assertions based on the expected response
-    });
+describe("Cypress Data Helpers", async () => {
+  beforeEach(() => {
+    cy.resetTestData();
   });
 
-  it("should verify the data helper for resetting test data", () => {
-    cy.request("POST", "/api/test_data/reset").then((response) => {
-      expect(response.status).to.eq(200);
-      // Add more assertions based on the expected response
+  it("should verify the data helper for creating test data", async () => {
+    cy.setupApprovedBook("Book1", "Author1", "Publisher1");
+    cy.setupApprovedBook("Book2", "Author2", "Publisher2");
+    cy.setupApprovedBook("Book3", "Author3", "Publisher3");
+
+    // Perform a GET request to verify data creation
+    cy.request("GET", "/api/books").then((getResponse) => {
+      expect(getResponse.status).to.eq(200);
+      expect(getResponse.body).to.have.lengthOf(3);
     });
   });
 
-  // Add more tests for other data helpers as needed
+  it("should verify the data helper for resetting test data", async () => {
+    // Create books first
+    cy.setupApprovedBook("Book1", "Author1", "Publisher1");
+    cy.setupApprovedBook("Book2", "Author2", "Publisher2");
+    cy.setupApprovedBook("Book3", "Author3", "Publisher3");
+
+    // Verify books are created
+    cy.request("GET", "/api/books").then(async (getResponse) => {
+      expect(getResponse.status).to.eq(200);
+      expect(getResponse.body).to.have.lengthOf(3);
+
+      // Reset the database
+      cy.request("POST", "/api/test_data/reset").then((resetResponse) => {
+        expect(resetResponse.status).to.eq(200);
+
+        // Verify books are removed
+        cy.request("GET", "/api/books").then((finalGetResponse) => {
+          expect(finalGetResponse.status).to.eq(200);
+          expect(finalGetResponse.body).to.have.lengthOf(0);
+        });
+      });
+    });
+  });
 });

test/cypress/e2e/data_helpers.cy.js

@@ -38,22 +38,35 @@ Cypress.Commands.add("setupProvisionalBook", (title = "Test Book") => {
   ]);
 });
 
-Cypress.Commands.add("setupApprovedBook", (title = "Approved Book") => {
-  cy.createTestData([
-    {
-      factory: "book",
-      attributes: {
-        title,
-        status: "approved",
+Cypress.Commands.add(
+  "setupApprovedBook",
+  (
+    title = "Approved Book",
+    author_name = "Test Author",
+    publisher_name = "Test Publisher"
+  ) => {
+    cy.createTestData([
+      {
+        factory: "book",
+        attributes: {
+          title,
+          author_attributes: {
+            name: author_name,
+          },
+          publisher_attributes: {
+            name: publisher_name,
+          },
+          status: "approved",
+        },
       },
-    },
-  ]);
-});
+    ]);
+  }
+);
 
 Cypress.Commands.add(
   "setupBookWithAuthorAndPublisher",
   ({
-    bookTitle = "Test Book",
+    title = "Test Book",
     authorName = "Test Author",
     publisherName = "Test Publisher",
     status = "approved",
@@ -62,7 +75,7 @@ Cypress.Commands.add(
       {
         factory: "book",
         attributes: {
-          title: bookTitle,
+          title,
           status,
           author_attributes: {
             name: authorName,