Skip to content

Commit

Permalink
[Fixes # 4533] Replaced cpx2 with local test module (#5077)
Browse files Browse the repository at this point in the history
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
Co-authored-by: Raphaël Thériault <113933910+raphael-theriault-swi@users.noreply.github.com>
Co-authored-by: Jakub Ziółkowski <jakub@rho.co>
Co-authored-by: David Luna <david.luna@elastic.co>
Co-authored-by: Trent Mick <trentm@gmail.com>
Co-authored-by: Marylia Gutierrez <marylia.gutierrez@grafana.com>
Co-authored-by: Mend Renovate <bot@renovateapp.com>
Co-authored-by: Mercy Bassey <57226464+mercybassey@users.noreply.github.com>
Co-authored-by: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com>
  • Loading branch information
10 people authored Nov 4, 2024
1 parent eb3ca4f commit 2b73d37
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"babel-loader": "8.4.1",
"babel-plugin-istanbul": "7.0.0",
"codecov": "3.8.3",
"cpx2": "2.0.0",

"cross-var": "1.1.0",
"karma": "6.4.4",
"karma-chrome-launcher": "3.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ describe('RequireInTheMiddleSingleton', () => {
const onRequireFsPromisesStub = makeOnRequiresStub('fs-promises');
const onRequireCodecovStub = makeOnRequiresStub('codecov');
const onRequireCodecovLibStub = makeOnRequiresStub('codecov-lib');
const onRequireCpxStub = makeOnRequiresStub('cpx2');
const onRequireCpxLibStub = makeOnRequiresStub('cpx2-lib');
const onRequireCpxStub = makeOnRequiresStub('test-non-core-module');
const onRequireCpxLibStub = makeOnRequiresStub('test-non-core-module-lib');

before(() => {
requireInTheMiddleSingleton.register('fs', onRequireFsStub);
Expand All @@ -53,9 +53,12 @@ describe('RequireInTheMiddleSingleton', () => {
'codecov/lib/codecov.js',
onRequireCodecovLibStub
);
requireInTheMiddleSingleton.register('cpx2', onRequireCpxStub);
requireInTheMiddleSingleton.register(
'cpx2/lib/copy-sync.js',
'test-non-core-module',
onRequireCpxStub
);
requireInTheMiddleSingleton.register(
'test-non-core-module/lib/copy-sync.js',
onRequireCpxLibStub
);
});
Expand Down Expand Up @@ -120,8 +123,12 @@ describe('RequireInTheMiddleSingleton', () => {

describe('non-core module', () => {
describe('AND module name matches', () => {
const baseDir = path.dirname(require.resolve('codecov'));
const modulePath = path.join('codecov', 'lib', 'codecov.js');
const baseDir = path.normalize(
path.dirname(require.resolve('codecov'))
);
const modulePath = path.normalize(
path.join('codecov', 'lib', 'codecov.js')
);
it('should call `onRequire`', () => {
const exports = require('codecov');
assert.deepStrictEqual(exports.__ritmOnRequires, ['codecov']);
Expand Down Expand Up @@ -149,20 +156,29 @@ describe('RequireInTheMiddleSingleton', () => {

describe('non-core module with sub-path', () => {
describe('AND module name matches', () => {
const baseDir = path.resolve(
path.dirname(require.resolve('cpx2')),
'..'
const baseDir = path.normalize(
path.resolve(
path.dirname(require.resolve('test-non-core-module')),
'..'
)
);
const modulePath = path.normalize(
path.join('test-non-core-module', 'lib', 'copy-sync.js')
);
const modulePath = path.join('cpx2', 'lib', 'copy-sync.js');
it('should call `onRequire`', () => {
const exports = require('cpx2/lib/copy-sync');
const exports = require('test-non-core-module/lib/copy-sync');
assert.deepStrictEqual(exports.__ritmOnRequires, [
'cpx2',
'cpx2-lib',
'test-non-core-module',
'test-non-core-module-lib',
]);
sinon.assert.calledWithMatch(
onRequireCpxStub,
{ __ritmOnRequires: ['cpx2', 'cpx2-lib'] },
{
__ritmOnRequires: [
'test-non-core-module',
'test-non-core-module-lib',
],
},
modulePath,
baseDir
);
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2b73d37

Please sign in to comment.