Fix failing test and add unit tests to PR checks (ansible#182)

* root element

* Add unit testing to PR checks

* increased timeout for checking that react has loaded

* updated config

* fix for prepush failure

* update prettierignore

.github/workflows/pull-request.yml

@@ -51,6 +51,27 @@ jobs:
           key: modules-${{ hashFiles('package-lock-copy.json') }}
       - run: npm run cypress
 
+  cypress-unit:
+    name: Cypress Unit Tests
+    runs-on: ubuntu-latest
+    needs: packages
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18'
+      - name: PreCache
+        run: cat package-lock.json | jq '.version = "0.0.0"' | jq '.packages."".version = "0.0.0"' > package-lock-copy.json
+      - name: Cache dependencies
+        id: cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ./node_modules
+            /home/runner/.cache/Cypress
+          key: modules-${{ hashFiles('package-lock-copy.json') }}
+      - run: npm run test:unit
+
   eslint:
     name: ESLint
     runs-on: ubuntu-latest

.prettierignore

@@ -1,2 +1,9 @@
 # Ignore generated interfaces
-frontend/controller/interfaces/generated-from-swagger
+frontend/controller/interfaces/generated-from-swagger
+
+.dockerignore
+.gitignore
+Dockerfile
+*.png
+*.svg
+*.sh

cypress.config.ts

@@ -60,11 +60,6 @@ export default defineConfig({
         },
       },
     },
-    env: {
-      'cypress-react-selector': {
-        root: '#__cy_root',
-      },
-    },
     specPattern: 'frontend/controller/**/*.cy.tsx',
     supportFile: 'cypress/support/component.ts',
   },

frontend/controller/views/jobs/hooks/useJobFilters.cy.tsx

@@ -8,13 +8,17 @@ function TestInner(props: { filters: IToolbarFilter[] }) {
 
 function Test() {
   const jobFilters = useJobsFilters();
-  return <TestInner filters={jobFilters} />;
+  return (
+    <div id="root">
+      <TestInner filters={jobFilters} />
+    </div>
+  );
 }
 
 describe('useJobsFilters', () => {
   it('Returns expected number of filters', () => {
     cy.mount(<Test />);
-    cy.waitForReact();
+    cy.waitForReact(10000, '#root');
     cy.getReact('TestInner').getProps('filters').should('have.length', 7);
   });
 });

package.json

@@ -28,11 +28,11 @@
     "tsc": "tsc -v && tsc --noEmit",
     "eslint": "eslint --max-warnings=0 frontend proxy framework cypress",
     "eslint:fix": "eslint --fix frontend proxy framework cypress",
-    "eslint:changed": "eslint --max-warnings=0 $(git diff --name-only origin/main -- '*.ts' '*.tsx' '*.jsx' '*.js'| xargs)",
+    "eslint:changed": "eslint --max-warnings=0 $(git diff --name-only --diff-filter=M origin/main -- '*.ts' '*.tsx' '*.jsx' '*.js'| xargs)",
     "prettier": "prettier --check !**/*.scss frontend proxy framework cypress",
     "prettier:fix": "prettier --write frontend proxy framework cypress",
-    "prettier:changed": "prettier --check $(git diff --name-only origin/main | xargs)",
-    "prettier:changed:fix": "prettier --write $(git diff --name-only origin/main | xargs)",
+    "prettier:changed": "prettier --check $(git diff --name-only --diff-filter=M origin/main | xargs)",
+    "prettier:changed:fix": "prettier --write $(git diff --name-only --diff-filter=M origin/main | xargs)",
     "upgrade": "npx npm-check-updates '/^@patternfly.*$/' --upgrade --target latest --doctor && npx npm-check-updates '/^(?!@patternfly).*$/' --upgrade --target minor --doctor && npm audit fix || true && npm dedup || true ",
     "docker:build": "docker build --tag ansible/console .",
     "docker:run": "npm run docker:build && docker run --rm -e LOG_LEVEL=debug -p 3001:3001 -e PORT=3001 -v $PWD/certs:/home/node/certs ansible/console| pino-zen",
@@ -169,8 +169,5 @@
       "../frontend/src/**/*.ts",
       "../frontend/src/**/*.tsx"
     ]
-  },
-  "overrides": {
-    "resq": "^1.11.0"
   }
 }