Skip to content

Commit

Permalink
Improve coverage and test names
Browse files Browse the repository at this point in the history
  • Loading branch information
@lukastaegert
lukastaegert committed Mar 29, 2021
1 parent 2c11749 commit e7f6901
Show file tree
Hide file tree
Showing 14 changed files with 100 additions and 63 deletions.
23 changes: 16 additions & 7 deletions ...external-paths/normalize-false/_config.js → ...s-relative/make-relative-false/_config.js
View file
Expand Up @@ -8,7 +8,14 @@ module.exports = {
options: {
makeAbsoluteExternalsRelative: false,
external(id) {
if (['./relativeUnresolved.js', '../relativeUnresolved.js', '/absolute.js'].includes(id))
if (
[
'./relativeUnresolved.js',
'../relativeUnresolved.js',
'/absolute.js',
'/pluginAbsolute.js'
].includes(id)
)
return true;
},
plugins: {
Expand All @@ -19,17 +26,19 @@ module.exports = {
await testExternal('./relativeUnresolved.js', true);
await testExternal('/absolute.js', 'absolute');
await testExternal('./pluginDirect.js', true);
await testExternal('/pluginDifferentAbsolute.js', 'absolute');
await testExternal('./pluginTrue.js', 'absolute');
await testExternal('./pluginAbsolute.js', 'absolute');
await testExternal('./pluginNormalize.js', true);
await testExternal('./pluginForceAbsolute.js', 'absolute');
await testExternal('./pluginForceRelative.js', true);
},
resolveId(source) {
if (source.endsWith('/pluginDirect.js')) return false;
if (source.endsWith('/pluginDifferentAbsolute.js')) return '/pluginAbsolute.js';
if (source.endsWith('/pluginTrue.js')) return { id: '/pluginTrue.js', external: true };
if (source.endsWith('/pluginAbsolute.js'))
return { id: '/pluginAbsolute.js', external: 'absolute' };
if (source.endsWith('/pluginNormalize.js'))
return { id: path.join(__dirname, 'pluginNormalize.js'), external: 'relative' };
if (source.endsWith('/pluginForceAbsolute.js'))
return { id: '/pluginForceAbsolute.js', external: 'absolute' };
if (source.endsWith('/pluginForceRelative.js'))
return { id: path.join(__dirname, 'pluginForceRelative.js'), external: 'relative' };
}
}
}
Expand Down
15 changes: 9 additions & 6 deletions ...ternal-paths/normalize-false/_expected.js → ...relative/make-relative-false/_expected.js
View file
@@ -1,9 +1,10 @@
import { relativeUnresolved as relativeUnresolved$1 } from './relativeUnresolved.js';
import { absolute } from '/absolute.js';
import { pluginDirect as pluginDirect$1 } from './pluginDirect.js';
import { pluginDifferentAbsolute } from '/pluginAbsolute.js';
import { pluginTrue } from '/pluginTrue.js';
import { pluginAbsolute } from '/pluginAbsolute.js';
import { pluginNormalize } from './pluginNormalize.js';
import { pluginForceAbsolute } from '/pluginForceAbsolute.js';
import { pluginForceRelative } from './pluginForceRelative.js';
import { relativeUnresolved } from '../relativeUnresolved.js';
import { pluginDirect } from '../pluginDirect.js';

Expand All @@ -14,9 +15,10 @@ console.log(
relativeExisting,
absolute,
pluginDirect,
pluginDifferentAbsolute,
pluginTrue,
pluginAbsolute,
pluginNormalize
pluginForceAbsolute,
pluginForceRelative
);

console.log(
Expand All @@ -26,7 +28,8 @@ console.log(
relativeExisting,
absolute,
pluginDirect$1,
pluginDifferentAbsolute,
pluginTrue,
pluginAbsolute,
pluginNormalize
pluginForceAbsolute,
pluginForceRelative
);
10 changes: 6 additions & 4 deletions ...ze-external-paths/normalize-false/main.js → ...nals-relative/make-relative-false/main.js
View file
@@ -1,9 +1,10 @@
import { relativeUnresolved } from './relativeUnresolved.js';
import { absolute } from '/absolute.js';
import { pluginDirect } from './pluginDirect.js';
import { pluginDifferentAbsolute } from '/pluginDifferentAbsolute.js';
import { pluginTrue } from './pluginTrue.js';
import { pluginAbsolute } from './pluginAbsolute.js';
import { pluginNormalize } from './pluginNormalize.js';
import { pluginForceAbsolute } from './pluginForceAbsolute.js';
import { pluginForceRelative } from './pluginForceRelative.js';
import './nested/nested.js';

console.log(
Expand All @@ -13,7 +14,8 @@ console.log(
relativeExisting,
absolute,
pluginDirect,
pluginDifferentAbsolute,
pluginTrue,
pluginAbsolute,
pluginNormalize
pluginForceAbsolute,
pluginForceRelative
);
10 changes: 6 additions & 4 deletions ...al-paths/normalize-false/nested/nested.js → ...tive/make-relative-false/nested/nested.js
View file
@@ -1,9 +1,10 @@
import { relativeUnresolved } from '../relativeUnresolved.js';
import { absolute } from '/absolute.js';
import { pluginDirect } from '../pluginDirect.js';
import { pluginDifferentAbsolute } from '/pluginDifferentAbsolute.js';
import { pluginTrue } from '../pluginTrue.js';
import { pluginAbsolute } from '../pluginAbsolute.js';
import { pluginNormalize } from '../pluginNormalize.js';
import { pluginForceAbsolute } from '../pluginForceAbsolute.js';
import { pluginForceRelative } from '../pluginForceRelative.js';

console.log(
'nested',
Expand All @@ -12,7 +13,8 @@ console.log(
relativeExisting,
absolute,
pluginDirect,
pluginDifferentAbsolute,
pluginTrue,
pluginAbsolute,
pluginNormalize
pluginForceAbsolute,
pluginForceRelative
);
17 changes: 10 additions & 7 deletions ...ernal-paths/normalize-relative/_config.js → ...elative/make-relative-relative/_config.js
View file
Expand Up @@ -15,7 +15,8 @@ module.exports = {
'../relativeUnresolved.js',
path.join(__dirname, 'relativeMissing.js'),
path.join(__dirname, 'relativeExisting.js'),
'/absolute.js'
'/absolute.js',
'/pluginAbsolute.js'
].includes(id)
)
return true;
Expand All @@ -30,18 +31,20 @@ module.exports = {
await testExternal('./relativeExisting.js', true);
await testExternal('/absolute.js', 'absolute');
await testExternal('./pluginDirect.js', true);
await testExternal('/pluginDifferentAbsolute.js', 'absolute');
await testExternal('./pluginTrue.js', true);
await testExternal('./pluginAbsolute.js', 'absolute');
await testExternal('./pluginNormalize.js', true);
await testExternal('./pluginForceAbsolute.js', 'absolute');
await testExternal('./pluginForceRelative.js', true);
},
resolveId(source) {
if (source.endsWith('/pluginDirect.js')) return false;
if (source.endsWith('/pluginDifferentAbsolute.js')) return '/pluginAbsolute.js';
if (source.endsWith('/pluginTrue.js'))
return { id: path.join(__dirname, 'pluginTrue.js'), external: true };
if (source.endsWith('/pluginAbsolute.js'))
return { id: '/pluginAbsolute.js', external: 'absolute' };
if (source.endsWith('/pluginNormalize.js'))
return { id: path.join(__dirname, 'pluginNormalize.js'), external: 'relative' };
if (source.endsWith('/pluginForceAbsolute.js'))
return { id: '/pluginForceAbsolute.js', external: 'absolute' };
if (source.endsWith('/pluginForceRelative.js'))
return { id: path.join(__dirname, 'pluginForceRelative.js'), external: 'relative' };
}
}
}
Expand Down
15 changes: 9 additions & 6 deletions ...nal-paths/normalize-relative/_expected.js → ...ative/make-relative-relative/_expected.js
View file
Expand Up @@ -3,9 +3,10 @@ import { relativeMissing } from './relativeMissing.js';
import { relativeExisting } from './relativeExisting.js';
import { absolute } from '/absolute.js';
import { pluginDirect } from './pluginDirect.js';
import { pluginDifferentAbsolute } from '/pluginAbsolute.js';
import { pluginTrue } from './pluginTrue.js';
import { pluginAbsolute } from '/pluginAbsolute.js';
import { pluginNormalize } from './pluginNormalize.js';
import { pluginForceAbsolute } from '/pluginForceAbsolute.js';
import { pluginForceRelative } from './pluginForceRelative.js';

console.log(
'nested',
Expand All @@ -14,9 +15,10 @@ console.log(
relativeExisting,
absolute,
pluginDirect,
pluginDifferentAbsolute,
pluginTrue,
pluginAbsolute,
pluginNormalize
pluginForceAbsolute,
pluginForceRelative
);

console.log(
Expand All @@ -26,7 +28,8 @@ console.log(
relativeExisting,
absolute,
pluginDirect,
pluginDifferentAbsolute,
pluginTrue,
pluginAbsolute,
pluginNormalize
pluginForceAbsolute,
pluginForceRelative
);
10 changes: 6 additions & 4 deletions ...external-paths/normalize-relative/main.js → ...s-relative/make-relative-relative/main.js
View file
Expand Up @@ -3,9 +3,10 @@ import { relativeMissing } from './relativeMissing.js';
import { relativeExisting } from './relativeExisting.js';
import { absolute } from '/absolute.js';
import { pluginDirect } from './pluginDirect.js';
import { pluginDifferentAbsolute } from '/pluginDifferentAbsolute.js';
import { pluginTrue } from './pluginTrue.js';
import { pluginAbsolute } from './pluginAbsolute.js';
import { pluginNormalize } from './pluginNormalize.js';
import { pluginForceAbsolute } from './pluginForceAbsolute.js';
import { pluginForceRelative } from './pluginForceRelative.js';
import './nested/nested.js';

console.log(
Expand All @@ -15,7 +16,8 @@ console.log(
relativeExisting,
absolute,
pluginDirect,
pluginDifferentAbsolute,
pluginTrue,
pluginAbsolute,
pluginNormalize
pluginForceAbsolute,
pluginForceRelative
);
10 changes: 6 additions & 4 deletions ...nal-paths/normalize-true/nested/nested.js → ...e/make-relative-relative/nested/nested.js
View file
Expand Up @@ -3,9 +3,10 @@ import { relativeMissing } from '../relativeMissing.js';
import { relativeExisting } from '../relativeExisting.js';
import { absolute } from '/absolute.js';
import { pluginDirect } from '../pluginDirect.js';
import { pluginDifferentAbsolute } from '/pluginDifferentAbsolute.js';
import { pluginTrue } from '../pluginTrue.js';
import { pluginAbsolute } from '../pluginAbsolute.js';
import { pluginNormalize } from '../pluginNormalize.js';
import { pluginForceAbsolute } from '../pluginForceAbsolute.js';
import { pluginForceRelative } from '../pluginForceRelative.js';

console.log(
'nested',
Expand All @@ -14,7 +15,8 @@ console.log(
relativeExisting,
absolute,
pluginDirect,
pluginDifferentAbsolute,
pluginTrue,
pluginAbsolute,
pluginNormalize
pluginForceAbsolute,
pluginForceRelative
);
0 ...hs/normalize-relative/relativeExisting.js → ...ake-relative-relative/relativeExisting.js
View file
File renamed without changes.
18 changes: 11 additions & 7 deletions ...-external-paths/normalize-true/_config.js → ...ls-relative/make-relative-true/_config.js
View file
Expand Up @@ -14,7 +14,8 @@ module.exports = {
'../relativeUnresolved.js',
path.join(__dirname, 'relativeMissing.js'),
path.join(__dirname, 'relativeExisting.js'),
path.join(__dirname, 'absolute.js')
path.join(__dirname, 'absolute.js'),
path.join(__dirname, 'pluginAbsolute.js')
].includes(id)
)
return true;
Expand All @@ -29,18 +30,21 @@ module.exports = {
await testExternal('./relativeExisting.js', true);
await testExternal('/absolute.js', true);
await testExternal('./pluginDirect.js', true);
await testExternal('/pluginDifferentAbsolute.js', true);
await testExternal('./pluginTrue.js', true);
await testExternal('./pluginAbsolute.js', 'absolute');
await testExternal('./pluginNormalize.js', true);
await testExternal('./pluginForceAbsolute.js', 'absolute');
await testExternal('./pluginForceRelative.js', true);
},
resolveId(source) {
if (source.endsWith('/pluginDirect.js')) return false;
if (source.endsWith('/pluginDifferentAbsolute.js'))
return path.join(__dirname, 'pluginAbsolute.js');
if (source.endsWith('/pluginTrue.js'))
return { id: path.join(__dirname, 'pluginTrue.js'), external: true };
if (source.endsWith('/pluginAbsolute.js'))
return { id: '/pluginAbsolute.js', external: 'absolute' };
if (source.endsWith('/pluginNormalize.js'))
return { id: path.join(__dirname, 'pluginNormalize.js'), external: 'relative' };
if (source.endsWith('/pluginForceAbsolute.js'))
return { id: '/pluginForceAbsolute.js', external: 'absolute' };
if (source.endsWith('/pluginForceRelative.js'))
return { id: path.join(__dirname, 'pluginForceRelative.js'), external: 'relative' };
if (source === '/absolute.js') return path.join(__dirname, 'absolute.js');
}
}
Expand Down
15 changes: 9 additions & 6 deletions ...xternal-paths/normalize-true/_expected.js → ...-relative/make-relative-true/_expected.js
View file
Expand Up @@ -3,9 +3,10 @@ import { relativeMissing } from './relativeMissing.js';
import { relativeExisting } from './relativeExisting.js';
import { absolute } from './absolute.js';
import { pluginDirect } from './pluginDirect.js';
import { pluginDifferentAbsolute } from './pluginAbsolute.js';
import { pluginTrue } from './pluginTrue.js';
import { pluginAbsolute } from '/pluginAbsolute.js';
import { pluginNormalize } from './pluginNormalize.js';
import { pluginForceAbsolute } from '/pluginForceAbsolute.js';
import { pluginForceRelative } from './pluginForceRelative.js';

console.log(
'nested',
Expand All @@ -14,9 +15,10 @@ console.log(
relativeExisting,
absolute,
pluginDirect,
pluginDifferentAbsolute,
pluginTrue,
pluginAbsolute,
pluginNormalize
pluginForceAbsolute,
pluginForceRelative
);

console.log(
Expand All @@ -26,7 +28,8 @@ console.log(
relativeExisting,
absolute,
pluginDirect,
pluginDifferentAbsolute,
pluginTrue,
pluginAbsolute,
pluginNormalize
pluginForceAbsolute,
pluginForceRelative
);
10 changes: 6 additions & 4 deletions ...ize-external-paths/normalize-true/main.js → ...rnals-relative/make-relative-true/main.js
View file
Expand Up @@ -3,9 +3,10 @@ import { relativeMissing } from './relativeMissing.js';
import { relativeExisting } from './relativeExisting.js';
import { absolute } from '/absolute.js';
import { pluginDirect } from './pluginDirect.js';
import { pluginDifferentAbsolute } from '/pluginDifferentAbsolute.js';
import { pluginTrue } from './pluginTrue.js';
import { pluginAbsolute } from './pluginAbsolute.js';
import { pluginNormalize } from './pluginNormalize.js';
import { pluginForceAbsolute } from './pluginForceAbsolute.js';
import { pluginForceRelative } from './pluginForceRelative.js';
import './nested/nested.js';

console.log(
Expand All @@ -15,7 +16,8 @@ console.log(
relativeExisting,
absolute,
pluginDirect,
pluginDifferentAbsolute,
pluginTrue,
pluginAbsolute,
pluginNormalize
pluginForceAbsolute,
pluginForceRelative
);
10 changes: 6 additions & 4 deletions ...paths/normalize-relative/nested/nested.js → ...ative/make-relative-true/nested/nested.js
View file
Expand Up @@ -3,9 +3,10 @@ import { relativeMissing } from '../relativeMissing.js';
import { relativeExisting } from '../relativeExisting.js';
import { absolute } from '/absolute.js';
import { pluginDirect } from '../pluginDirect.js';
import { pluginDifferentAbsolute } from '/pluginDifferentAbsolute.js';
import { pluginTrue } from '../pluginTrue.js';
import { pluginAbsolute } from '../pluginAbsolute.js';
import { pluginNormalize } from '../pluginNormalize.js';
import { pluginForceAbsolute } from '../pluginForceAbsolute.js';
import { pluginForceRelative } from '../pluginForceRelative.js';

console.log(
'nested',
Expand All @@ -14,7 +15,8 @@ console.log(
relativeExisting,
absolute,
pluginDirect,
pluginDifferentAbsolute,
pluginTrue,
pluginAbsolute,
pluginNormalize
pluginForceAbsolute,
pluginForceRelative
);
0 ...-paths/normalize-true/relativeExisting.js → ...ve/make-relative-true/relativeExisting.js
View file
File renamed without changes.

0 comments on commit e7f6901

Please sign in to comment.