From 68f82166afd20887461412c8773e6924441d8353 Mon Sep 17 00:00:00 2001 From: Aidan Gordon Date: Fri, 6 Dec 2024 12:16:21 -0800 Subject: [PATCH] updates based on review feedback --- .github/workflows/test.yml | 2 +- client/wfprev-war/src/main/angular/.github/test.yml | 8 ++++---- .../bc/gov/nrs/wfprev/ProjectBoundaryControllerTest.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9f6e24188..9799365f9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,7 +34,7 @@ jobs: - name: Change directory to Angular app run: cd client/wfprev-war/src/main/angular - # Use the NPMRC secret to set up npm authenticationq + # Use the NPMRC secret to set up npm authentication - name: Add .npmrc file run: echo -e $NPMRC > ~/.npmrc diff --git a/client/wfprev-war/src/main/angular/.github/test.yml b/client/wfprev-war/src/main/angular/.github/test.yml index 08d2e3831..b0ffa7b05 100644 --- a/client/wfprev-war/src/main/angular/.github/test.yml +++ b/client/wfprev-war/src/main/angular/.github/test.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: node-version: [20.x] - + steps: - uses: actions/checkout@v4 @@ -21,8 +21,8 @@ jobs: with: node-version: ${{ matrix.node-version }} - - run: npm install --legacy-peer-deps - + - run: npm install + - run: npm run test -- --watch=false --code-coverage # Ensure coverage meets the required threshold @@ -33,4 +33,4 @@ jobs: else echo "Code coverage is less than 80%!"; exit 1; - fi \ No newline at end of file + fi diff --git a/server/wfprev-api/src/test/java/ca/bc/gov/nrs/wfprev/ProjectBoundaryControllerTest.java b/server/wfprev-api/src/test/java/ca/bc/gov/nrs/wfprev/ProjectBoundaryControllerTest.java index 0b80b6101..709e792fd 100644 --- a/server/wfprev-api/src/test/java/ca/bc/gov/nrs/wfprev/ProjectBoundaryControllerTest.java +++ b/server/wfprev-api/src/test/java/ca/bc/gov/nrs/wfprev/ProjectBoundaryControllerTest.java @@ -252,13 +252,13 @@ void testUpdateProjectBoundary_BadRequest() throws Exception { String json = mapper.writeValueAsString(project); // Test update - ResultActions resuult = mockMvc.perform(put("/projectBoundaries/{id}", "unmatched-id") + ResultActions result = mockMvc.perform(put("/projectBoundaries/{id}", "unmatched-id") .content(json) .contentType(MediaType.APPLICATION_JSON) .header("Authorization", "Bearer admin-token") .header("If-Match", "\"1\"")) .andExpect(status().isBadRequest()); - assertEquals(400, resuult.andReturn().getResponse().getStatus()); + assertEquals(400, result.andReturn().getResponse().getStatus()); } @Test