Merge pull request #26 from secure-dashboards/test/refactor

OpenPathfinder · Dec 5, 2024 · d23033b · d23033b
2 parents 191615f + 921a89a
commit d23033b
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 14 deletions.
diff --git a/__tests__/fixtures/index.js → __fixtures__/index.js b/__tests__/fixtures/index.js → __fixtures__/index.js
diff --git a/__tests__/cli/project.test.js b/__tests__/cli/project.test.js
@@ -2,7 +2,7 @@ const inquirer = require('inquirer').default
 const knexInit = require('knex')
 const { getConfig } = require('../../src/config')
 const { runAddProjectCommand } = require('../../src/cli')
-const { resetDatabase, getAllProjects, getAllGithubOrgs } = require('../utils')
+const { resetDatabase, getAllProjects, getAllGithubOrgs } = require('../../__utils__')
 
 const { dbSettings } = getConfig('test')
 

diff --git a/__tests__/cli/workflows.test.js b/__tests__/cli/workflows.test.js
@@ -2,9 +2,9 @@ const inquirer = require('inquirer').default
 const knexInit = require('knex')
 const { getConfig } = require('../../src/config')
 const { runWorkflowCommand, listWorkflowCommand } = require('../../src/cli')
-const { resetDatabase, getAllProjects, getAllGithubOrgs, addGithubOrg, addProject } = require('../utils')
+const { resetDatabase, getAllProjects, getAllGithubOrgs, addGithubOrg, addProject } = require('../../__utils__')
 const { github } = require('../../src/providers')
-const { sampleGithubOrg } = require('../fixtures')
+const { sampleGithubOrg } = require('../../__fixtures__')
 
 const { dbSettings } = getConfig('test')
 

diff --git a/__tests__/index.test.js b/__tests__/index.test.js
diff --git a/__tests__/schemas.test.js b/__tests__/schemas.test.js
@@ -1,4 +1,4 @@
-const { sampleGithubOrg } = require('./fixtures')
+const { sampleGithubOrg } = require('../__fixtures__')
 const { validateGithubOrg } = require('../src/schemas')
 
 describe('schemas', () => {

diff --git a/__tests__/utils/index.js → __utils__/index.js b/__tests__/utils/index.js → __utils__/index.js
diff --git a/jest.config.js b/jest.config.js
@@ -3,16 +3,13 @@ export default {
     'src/**/*.js'
   ],
   coveragePathIgnorePatterns: [
+    '<rootDir>/__fixtures__/',
     '<rootDir>/__tests__/',
+    '<rootDir>/__utils__/',
     '<rootDir>/src/database/migrations/',
     '<rootDir>/src/config/'
   ],
   transformIgnorePatterns: [
     '/node_modules/(?!octokit).+\\.js$'
-  ],
-  modulePathIgnorePatterns: [
-    '<rootDir>/__tests__/utils/',
-    '<rootDir>/__tests__/fixtures/'
-
   ]
 }