chore: runInBand for catalog ui tests to avoid flaky (#3782)

--------- Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com> Signed-off-by: Andrea Tabone <andrea.tabone@broadcom.com> Co-authored-by: Pablo Hernán Carle <pablo.carle@broadcom.com> Co-authored-by: Andrea Tabone <andrea.tabone@broadcom.com> Co-authored-by: Andrea Tabone <39694626+taban03@users.noreply.github.com>
zowe · Sep 19, 2024 · 41416b4 · 41416b4
1 parent ce4bc5c
commit 41416b4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/.github/workflows/image-specific-release.yml b/.github/workflows/image-specific-release.yml
@@ -18,7 +18,7 @@ jobs:
             -   uses: ./.github/actions/setup
 
             -   name: Build services
-                run: ./gradlew clean build -x test
+                run: ./gradlew clean build -x test -x npmTest
 
             -   uses: ./.github/actions/teardown
 

diff --git a/api-catalog-ui/frontend/package.json b/api-catalog-ui/frontend/package.json
@@ -57,7 +57,7 @@
         "lint": "eslint \"src/**/*.{js,jsx}\"",
         "build": "react-app-rewired build",
         "postbuild": "rimraf build/**/*.map",
-        "test": "react-app-rewired test --silent --watchAll=false --env=jsdom components/* utils/* reducers/* epics/* actions/* selectors/* ErrorBoundary/* helpers/* --reporters=default --reporters=jest-html-reporter --coverage",
+        "test": "react-app-rewired test --runInBand --silent --watchAll=false --env=jsdom components/* utils/* reducers/* epics/* actions/* selectors/* ErrorBoundary/* helpers/* --reporters=default --reporters=jest-html-reporter --coverage",
         "cy:open": "cypress open",
         "cy:e2e:ci": "cypress run --spec \"cypress/e2e/**/*.cy.js\" --env catalogHomePage=https://gateway-service:10010/apicatalog/ui/v1,gatewayOktaRedirect=https://gateway-service:10010/gateway/oauth2/authorization/okta?returnUrl=https%3A%2F%2Fgateway-service%3A10010%2Fapplication%2Fversion --browser chrome --headless",
         "cy:e2e:localhost": "cypress run --spec \"cypress/e2e/**/*.cy.js\" --browser chrome --headless",

diff --git a/api-catalog-ui/frontend/src/components/Swagger/SwaggerUI.test.jsx b/api-catalog-ui/frontend/src/components/Swagger/SwaggerUI.test.jsx
@@ -254,13 +254,15 @@ describe('>>> Swagger component tests', () => {
             endpoint: '/test',
             language: 'java',
         };
-        const container = document.createElement('div');
-        document.body.appendChild(container);
 
-        await act(async () =>
-            createRoot(container).render(<SwaggerUI selectedService={service1} selectedVersion="0" />, container)
+        const wrapper = shallow(
+            <div>
+                <SwaggerUI selectedService={service1} selectedVersion="0" />
+            </div>
         );
-        expect(container).not.toBeNull();
+        const swaggerDiv = wrapper.find('#swaggerContainer');
+
+        expect(swaggerDiv).toBeDefined();
     });
 
     it('should not create element if api portal disabled and element does not exist', () => {

diff --git a/build.gradle b/build.gradle
@@ -138,12 +138,6 @@ subprojects {
     }
 }
 
-task updateCatalogVersion {
-    ant.replaceregexp(match:'REACT_APP_ZOWE_BUILD_INFO=(.*)', replace:'REACT_APP_ZOWE_BUILD_INFO=' + version, flags:'g', byline:true) {
-        fileset(dir: 'api-catalog-ui/frontend', includes: '.env')
-    }
-}
-
 task buildCore(dependsOn: [':discovery-service:build', ':api-catalog-services:build', ':api-catalog-ui:build',
                            ':discoverable-client:build', ':zaas-client:build', ':apiml-sample-extension:build', ':gateway-service:build']) {
     description "Build core components"