Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deps: upgrade 'minimatch' #4865

Merged
merged 2 commits into from Apr 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions docs/index.md
Expand Up @@ -1084,11 +1084,12 @@ Files specified in this way should contain one or more suites, tests or hooks. I

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

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

Files specified using `--file` _are not affected_ by this option.
> _New in v10.0.0:_ In Windows always use forward-slashes `/` as path separator.

Can be specified multiple times.
Files specified using `--file` _are not affected_ by this option.

### `--recursive`

Expand Down
38 changes: 28 additions & 10 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -67,7 +67,7 @@
"he": "1.2.0",
"js-yaml": "4.1.0",
"log-symbols": "4.1.0",
"minimatch": "4.2.1",
"minimatch": "5.0.1",
"ms": "2.1.3",
"nanoid": "3.3.1",
"serialize-javascript": "6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion scripts/karma-rollup-plugin.js
Expand Up @@ -53,7 +53,7 @@ function framework(fileConfigs, pluginConfig, basePath, preprocessors) {
.map(fileConfig => fileConfig.pattern)
.filter(filePath =>
includePatterns.some(includePattern =>
minimatch(filePath, includePattern)
minimatch(filePath, includePattern.replace(/\\/g, '/'))
)
);

Expand Down
12 changes: 9 additions & 3 deletions test/integration/options/ignore.spec.js
Expand Up @@ -30,7 +30,10 @@ describe('--ignore', function () {
var fixtures = path.join('options', 'ignore', '*');
runMochaTest(
fixtures,
['--ignore', resolvePath(path.join('options', 'ignore', 'fail'))],
[
'--ignore',
resolvePath(path.join('options', 'ignore', 'fail')).replace(/\\/g, '/')
],
function (res) {
expect(res, 'to have passed')
.and('to have run test', 'should find this test')
Expand Down Expand Up @@ -60,9 +63,12 @@ describe('--ignore', function () {
fixtures,
[
'--ignore',
resolvePath(path.join('options', 'ignore', 'fail')),
resolvePath(path.join('options', 'ignore', 'fail')).replace(/\\/g, '/'),
'--ignore',
resolvePath(path.join('options', 'ignore', 'nested', 'fail'))
resolvePath(path.join('options', 'ignore', 'nested', 'fail')).replace(
/\\/g,
'/'
)
],
function (res) {
expect(res, 'to have passed')
Expand Down