Skip to content

Commit 3946453

Browse files
authored
chore(deps)!: upgrade 'minimatch' (#4865)
1 parent 592905b commit 3946453

5 files changed

Lines changed: 43 additions & 18 deletions

File tree

docs/index.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,11 +1084,12 @@ Files specified in this way should contain one or more suites, tests or hooks. I
10841084

10851085
### `--ignore <file|directory|glob>, --exclude <file|directory|glob>,`
10861086

1087-
Explicitly ignore (exclude) one or more test files, directories or globs (e.g., `some/**/files*`) that would otherwise be loaded.
1087+
Explicitly ignore one or more test files, directories or globs (e.g., `some/**/files*`) that would otherwise be loaded.<br>
1088+
Can be specified multiple times.
10881089

1089-
Files specified using `--file` _are not affected_ by this option.
1090+
> _New in v10.0.0:_ In Windows always use forward-slashes `/` as path separator.
10901091
1091-
Can be specified multiple times.
1092+
Files specified using `--file` _are not affected_ by this option.
10921093

10931094
### `--recursive`
10941095

package-lock.json

Lines changed: 28 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"he": "1.2.0",
6868
"js-yaml": "4.1.0",
6969
"log-symbols": "4.1.0",
70-
"minimatch": "4.2.1",
70+
"minimatch": "5.0.1",
7171
"ms": "2.1.3",
7272
"nanoid": "3.3.1",
7373
"serialize-javascript": "6.0.0",

scripts/karma-rollup-plugin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function framework(fileConfigs, pluginConfig, basePath, preprocessors) {
5353
.map(fileConfig => fileConfig.pattern)
5454
.filter(filePath =>
5555
includePatterns.some(includePattern =>
56-
minimatch(filePath, includePattern)
56+
minimatch(filePath, includePattern.replace(/\\/g, '/'))
5757
)
5858
);
5959

test/integration/options/ignore.spec.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ describe('--ignore', function () {
3030
var fixtures = path.join('options', 'ignore', '*');
3131
runMochaTest(
3232
fixtures,
33-
['--ignore', resolvePath(path.join('options', 'ignore', 'fail'))],
33+
[
34+
'--ignore',
35+
resolvePath(path.join('options', 'ignore', 'fail')).replace(/\\/g, '/')
36+
],
3437
function (res) {
3538
expect(res, 'to have passed')
3639
.and('to have run test', 'should find this test')
@@ -60,9 +63,12 @@ describe('--ignore', function () {
6063
fixtures,
6164
[
6265
'--ignore',
63-
resolvePath(path.join('options', 'ignore', 'fail')),
66+
resolvePath(path.join('options', 'ignore', 'fail')).replace(/\\/g, '/'),
6467
'--ignore',
65-
resolvePath(path.join('options', 'ignore', 'nested', 'fail'))
68+
resolvePath(path.join('options', 'ignore', 'nested', 'fail')).replace(
69+
/\\/g,
70+
'/'
71+
)
6672
],
6773
function (res) {
6874
expect(res, 'to have passed')

0 commit comments

Comments
 (0)