diff --git a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-classes.json b/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-classes.json index 28ea62592..8a1d0e0da 100644 --- a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-classes.json +++ b/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-classes.json @@ -4,7 +4,7 @@ "analyzerMeta": { "name": "find-classes", "requiredAst": "babel", - "identifier": "importing-target-project_0.0.2-target-mock__-297820780", + "identifier": "importing-target-project_0.0.2-target-mock__1364353669", "targetProject": { "mainEntry": "./target-src/match-imports/root-level-imports.js", "name": "importing-target-project", diff --git a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-customelements.json b/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-customelements.json index 480035016..e447f8354 100644 --- a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-customelements.json +++ b/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-customelements.json @@ -4,7 +4,7 @@ "analyzerMeta": { "name": "find-customelements", "requiredAst": "babel", - "identifier": "importing-target-project_0.0.2-target-mock__-2006922104", + "identifier": "importing-target-project_0.0.2-target-mock__-1063914889", "targetProject": { "mainEntry": "./target-src/match-imports/root-level-imports.js", "name": "importing-target-project", diff --git a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-exports.json b/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-exports.json index b65494aa8..ac849076b 100644 --- a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-exports.json +++ b/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-exports.json @@ -4,7 +4,7 @@ "analyzerMeta": { "name": "find-exports", "requiredAst": "babel", - "identifier": "exporting-ref-project_1.0.0__-1083884764", + "identifier": "exporting-ref-project_1.0.0__309114983", "targetProject": { "mainEntry": "./index.js", "name": "exporting-ref-project", @@ -12,7 +12,7 @@ "commitHash": "[not-a-git-root]" }, "configuration": { - "metaConfig": null, + "skipFileImports": false, "gatherFilesConfig": {} } } diff --git a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-imports.json b/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-imports.json index f6ac9d3ce..6357a42ff 100644 --- a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-imports.json +++ b/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-imports.json @@ -4,7 +4,7 @@ "analyzerMeta": { "name": "find-imports", "requiredAst": "babel", - "identifier": "importing-target-project_0.0.2-target-mock__139587347", + "identifier": "importing-target-project_0.0.2-target-mock__-1398544254", "targetProject": { "mainEntry": "./target-src/match-imports/root-level-imports.js", "name": "importing-target-project", diff --git a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-imports.json b/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-imports.json index edc2aa1c1..e7713a790 100644 --- a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-imports.json +++ b/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-imports.json @@ -4,7 +4,7 @@ "analyzerMeta": { "name": "match-imports", "requiredAst": "babel", - "identifier": "importing-target-project_0.0.2-target-mock_+_exporting-ref-project_1.0.0__453069400", + "identifier": "importing-target-project_0.0.2-target-mock_+_exporting-ref-project_1.0.0__1498484172", "targetProject": { "mainEntry": "./target-src/match-imports/root-level-imports.js", "name": "importing-target-project", @@ -18,7 +18,9 @@ "commitHash": "[not-a-git-root]" }, "configuration": { - "gatherFilesConfig": {} + "gatherFilesConfig": {}, + "targetProjectResult": null, + "referenceProjectResult": null } } }, diff --git a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-paths.json b/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-paths.json index 3f7500878..5df3fd663 100644 --- a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-paths.json +++ b/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-paths.json @@ -4,7 +4,7 @@ "analyzerMeta": { "name": "match-paths", "requiredAst": "babel", - "identifier": "importing-target-project_0.0.2-target-mock_+_exporting-ref-project_1.0.0__-238486383", + "identifier": "importing-target-project_0.0.2-target-mock_+_exporting-ref-project_1.0.0__1241369081", "targetProject": { "mainEntry": "./target-src/match-imports/root-level-imports.js", "name": "importing-target-project", diff --git a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-subclasses.json b/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-subclasses.json index 28da97b5e..b08e45ed0 100644 --- a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-subclasses.json +++ b/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-subclasses.json @@ -4,7 +4,7 @@ "analyzerMeta": { "name": "match-subclasses", "requiredAst": "babel", - "identifier": "importing-target-project_0.0.2-target-mock_+_exporting-ref-project_1.0.0__453069400", + "identifier": "importing-target-project_0.0.2-target-mock_+_exporting-ref-project_1.0.0__-933483072", "targetProject": { "mainEntry": "./target-src/match-imports/root-level-imports.js", "name": "importing-target-project", diff --git a/packages/providence-analytics/test-helpers/project-mocks/README.md b/packages/providence-analytics/test-helpers/project-mocks/README.md index c0ecc933e..506692057 100644 --- a/packages/providence-analytics/test-helpers/project-mocks/README.md +++ b/packages/providence-analytics/test-helpers/project-mocks/README.md @@ -9,4 +9,4 @@ Whenever new Analyzers are added, please make sure the needed ingredients for a end to end test are added to one of the above projects (or both). Be sure to update 'test-helpers/project-mocks-analyzer-output'. -This can be done by running `npm run test:e2e -- --generate-e2e-mode` once. +This can be done by running `yarn test:node:e2e --generate-e2e-mode` once. diff --git a/packages/providence-analytics/test-node/program/analyzers/e2e/all-analyzers.e2e.js b/packages/providence-analytics/test-node/program/analyzers/e2e/all-analyzers.e2e.js index ff61c3cfd..588aea34e 100644 --- a/packages/providence-analytics/test-node/program/analyzers/e2e/all-analyzers.e2e.js +++ b/packages/providence-analytics/test-node/program/analyzers/e2e/all-analyzers.e2e.js @@ -3,26 +3,13 @@ const { expect } = require('chai'); const { providence } = require('../../../../src/program/providence.js'); const { QueryService } = require('../../../../src/program/services/QueryService.js'); const { ReportService } = require('../../../../src/program/services/ReportService.js'); -const { LogService } = require('../../../../src/program/services/LogService.js'); const { mockWriteToJson, restoreWriteToJson, } = require('../../../../test-helpers/mock-report-service-helpers.js'); -const { - suppressNonCriticalLogs, - restoreSuppressNonCriticalLogs, -} = require('../../../../test-helpers/mock-log-service-helpers.js'); describe('Analyzers file-system integration', () => { - before(() => { - suppressNonCriticalLogs(); - }); - - after(() => { - restoreSuppressNonCriticalLogs(); - }); - const generateE2eMode = process.argv.includes('--generate-e2e-mode'); const queryResults = []; @@ -116,15 +103,16 @@ describe('Analyzers file-system integration', () => { const findExportsQueryConfig = QueryService.getQueryConfigFromAnalyzer(analyzerName); await providence(findExportsQueryConfig, providenceConfig); if (generateE2eMode) { - LogService.info( + console.info( 'Successfully created mocks. Do not forget to rerun tests now without "--generate-e2e-mode"', ); return; } // eslint-disable-next-line import/no-dynamic-require, global-require const expectedOutput = require(`../../../../test-helpers/project-mocks-analyzer-outputs/${analyzerName}.json`); - const queryResult = JSON.parse(JSON.stringify(queryResults[0])).queryOutput; - expect(queryResult).to.eql(expectedOutput.queryOutput); + const { queryOutput } = JSON.parse(JSON.stringify(queryResults[0])); + expect(queryOutput).not.to.eql([]); + expect(queryOutput).to.eql(expectedOutput.queryOutput); }); } });