Skip to content

Commit 29d4a39

Browse files
committed
Fix failing unit tests in CI
1 parent d3a5bd6 commit 29d4a39

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

Diff for: test/parse/ClassFinder.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ describe('ClassFinder', () => {
5656
unnamed: [
5757
{
5858
packageName: 'other-package',
59-
fileName: Path.normalize('/some-dir/index'),
59+
fileName: '/some-dir/index',
6060
},
6161
],
6262
});

Diff for: test/parse/ClassIndexer.test.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import * as Path from 'path';
21
import { ClassFinder } from '../../lib/parse/ClassFinder';
32
import { ClassIndexer } from '../../lib/parse/ClassIndexer';
43
import { ClassLoader } from '../../lib/parse/ClassLoader';
@@ -292,7 +291,7 @@ export { X as B } from 'other-package'
292291
superClass: {
293292
packageName: 'other-package',
294293
localName: 'X',
295-
fileName: Path.normalize('/some-dir/index'),
294+
fileName: '/some-dir/index',
296295
declaration: {
297296
id: { name: 'X' },
298297
type: 'ClassDeclaration',

Diff for: test/parse/ClassLoader.test.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ declare interface A{}
820820
describe('importTargetToAbsolutePath', () => {
821821
it('for a local file', () => {
822822
expect(loader.importTargetToAbsolutePath('package', 'dir/lib/fileA', './subdir/fileB'))
823-
.toEqual({ packageName: 'package', fileName: 'dir/lib/subdir/fileB' });
823+
.toEqual({ packageName: 'package', fileName: Path.normalize('dir/lib/subdir/fileB') });
824824
});
825825

826826
it('for a package', () => {
@@ -835,13 +835,13 @@ declare interface A{}
835835
});
836836

837837
it('for a file in a package', () => {
838-
resolutionContext.packageNameIndexOverrides['other-package'] = '/some-dir/index.js';
838+
resolutionContext.packageNameIndexOverrides['other-package'] = Path.normalize('/some-dir/index.js');
839839
expect(loader.importTargetToAbsolutePath('package', 'dir/lib/fileA', 'other-package/lib/bla'))
840-
.toEqual({ packageName: 'other-package', fileName: '/some-dir/lib/bla' });
840+
.toEqual({ packageName: 'other-package', fileName: Path.normalize('/some-dir/lib/bla') });
841841
});
842842

843843
it('for a scoped package', () => {
844-
resolutionContext.packageNameIndexOverrides['@rubensworks/other-package'] = '/some-dir/index.js';
844+
resolutionContext.packageNameIndexOverrides['@rubensworks/other-package'] = Path.normalize('/some-dir/index.js');
845845
expect(loader.importTargetToAbsolutePath('package', 'dir/lib/fileA', '@rubensworks/other-package'))
846846
.toEqual({ packageName: '@rubensworks/other-package', fileName: '/some-dir/index' });
847847
});
@@ -852,9 +852,9 @@ declare interface A{}
852852
});
853853

854854
it('for a file in a scoped package', () => {
855-
resolutionContext.packageNameIndexOverrides['@rubensworks/other-package'] = '/some-dir/index.js';
855+
resolutionContext.packageNameIndexOverrides['@rubensworks/other-package'] = Path.normalize('/some-dir/index.js');
856856
expect(loader.importTargetToAbsolutePath('package', 'dir/lib/fileA', '@rubensworks/other-package/lib/bla'))
857-
.toEqual({ packageName: '@rubensworks/other-package', fileName: '/some-dir/lib/bla' });
857+
.toEqual({ packageName: '@rubensworks/other-package', fileName: Path.normalize('/some-dir/lib/bla') });
858858
});
859859
});
860860

@@ -1000,7 +1000,7 @@ declare interface A{}
10001000
expect(loader.getClassElements('package', fileName, resolutionContext.parseTypescriptContents(`export * from 'other-package'`)))
10011001
.toMatchObject({
10021002
exportedImportedAll: [
1003-
{ packageName: 'other-package', fileName: Path.normalize('/some-dir/index') },
1003+
{ packageName: 'other-package', fileName: '/some-dir/index' },
10041004
],
10051005
});
10061006
});

Diff for: test/parse/ParameterResolver.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ export interface MyInterface extends IgnoredInterface{};
337337
});
338338

339339
describe('resolveRangeInterface', () => {
340-
const classReference: ClassReference = { packageName: 'P', localName: 'A', fileName: 'A' };
340+
const classReference: ClassReferenceLoaded = <any> { packageName: 'P', localName: 'A', fileName: 'A' };
341341

342342
it('should error on a non-existing interface', async() => {
343343
resolutionContext.contentsOverrides = {

0 commit comments

Comments
 (0)