summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2021-10-04 18:16:49 +0200
committerGitHub <noreply@github.com>2021-10-04 18:16:49 +0200
commitc6ae41fd8701b0fc5735ae4a6fa288f5cb35f03a (patch)
tree158b603227f66638c99b776d70a45e5eb3c7c40d
parent5f41f822e7ac64ebef41feaebc15c17b6d080958 (diff)
test: refactor lint tests into directories (#12317)
Just reorganizing lint tests in such a way that adding new file in a directory doesn't change result of other tests.
-rw-r--r--cli/tests/integration/lint_tests.rs30
-rw-r--r--cli/tests/testdata/lint/Deno.jsonc4
-rw-r--r--cli/tests/testdata/lint/Deno.malformed.jsonc4
-rw-r--r--cli/tests/testdata/lint/Deno.malformed2.jsonc4
-rw-r--r--cli/tests/testdata/lint/with_config.out (renamed from cli/tests/testdata/lint/lint_with_config.out)0
-rw-r--r--cli/tests/testdata/lint/with_config/a.ts (renamed from cli/tests/testdata/lint/lint_with_config/a.ts)0
-rw-r--r--cli/tests/testdata/lint/with_config/b.ts (renamed from cli/tests/testdata/lint/lint_with_config/b.ts)0
-rw-r--r--cli/tests/testdata/lint/with_config_and_flags.out (renamed from cli/tests/testdata/lint/lint_with_config_and_flags.out)0
-rw-r--r--cli/tests/testdata/lint/with_malformed_config.out (renamed from cli/tests/testdata/lint/lint_with_malformed_config.out)0
-rw-r--r--cli/tests/testdata/lint/with_malformed_config2.out (renamed from cli/tests/testdata/lint/lint_with_malformed_config2.out)0
-rw-r--r--cli/tests/testdata/lint/without_config/file1.js (renamed from cli/tests/testdata/lint/file1.js)0
-rw-r--r--cli/tests/testdata/lint/without_config/file2.ts (renamed from cli/tests/testdata/lint/file2.ts)0
-rw-r--r--cli/tests/testdata/lint/without_config/ignored_file.ts (renamed from cli/tests/testdata/lint/ignored_file.ts)0
-rw-r--r--cli/tests/testdata/lint/without_config/malformed.js (renamed from cli/tests/testdata/lint/malformed.js)0
14 files changed, 21 insertions, 21 deletions
diff --git a/cli/tests/integration/lint_tests.rs b/cli/tests/integration/lint_tests.rs
index b11cc5b9a..4f4cf1984 100644
--- a/cli/tests/integration/lint_tests.rs
+++ b/cli/tests/integration/lint_tests.rs
@@ -24,33 +24,33 @@ fn ignore_unexplicit_files() {
}
itest!(all {
- args: "lint lint/file1.js lint/file2.ts lint/ignored_file.ts",
+ args: "lint lint/without_config/file1.js lint/without_config/file2.ts lint/without_config/ignored_file.ts",
output: "lint/expected.out",
exit_code: 1,
});
itest!(quiet {
- args: "lint --quiet lint/file1.js",
+ args: "lint --quiet lint/without_config/file1.js",
output: "lint/expected_quiet.out",
exit_code: 1,
});
itest!(json {
- args:
- "lint --json lint/file1.js lint/file2.ts lint/ignored_file.ts lint/malformed.js",
- output: "lint/expected_json.out",
- exit_code: 1,
- });
+ args:
+ "lint --json lint/without_config/file1.js lint/without_config/file2.ts lint/without_config/ignored_file.ts lint/without_config/malformed.js",
+ output: "lint/expected_json.out",
+ exit_code: 1,
+});
itest!(ignore {
args:
- "lint --ignore=lint/file1.js,lint/malformed.js,lint/lint_with_config/ lint/",
+ "lint --ignore=lint/without_config/file1.js,lint/without_config/malformed.js,lint/without_config/lint_with_config/ lint/without_config/",
output: "lint/expected_ignore.out",
exit_code: 1,
});
itest!(glob {
- args: "lint --ignore=lint/malformed.js,lint/lint_with_config/ lint/",
+ args: "lint --ignore=lint/without_config/malformed.js,lint/with_config/ lint/without_config/",
output: "lint/expected_glob.out",
exit_code: 1,
});
@@ -83,26 +83,26 @@ itest!(rules_quiet {
});
itest!(lint_with_config {
- args: "lint --config lint/Deno.jsonc lint/lint_with_config/",
- output: "lint/lint_with_config.out",
+ args: "lint --config lint/Deno.jsonc lint/with_config/",
+ output: "lint/with_config.out",
exit_code: 1,
});
// Check if CLI flags take precedence
itest!(lint_with_config_and_flags {
- args: "lint --config lint/Deno.jsonc --ignore=lint/lint_with_config/a.ts",
- output: "lint/lint_with_config_and_flags.out",
+ args: "lint --config lint/Deno.jsonc --ignore=lint/with_config/a.ts",
+ output: "lint/with_config_and_flags.out",
exit_code: 1,
});
itest!(lint_with_malformed_config {
args: "lint --config lint/Deno.malformed.jsonc",
- output: "lint/lint_with_malformed_config.out",
+ output: "lint/with_malformed_config.out",
exit_code: 1,
});
itest!(lint_with_malformed_config2 {
args: "lint --config lint/Deno.malformed2.jsonc",
- output: "lint/lint_with_malformed_config2.out",
+ output: "lint/with_malformed_config2.out",
exit_code: 1,
});
diff --git a/cli/tests/testdata/lint/Deno.jsonc b/cli/tests/testdata/lint/Deno.jsonc
index dc0a12eab..9cd521592 100644
--- a/cli/tests/testdata/lint/Deno.jsonc
+++ b/cli/tests/testdata/lint/Deno.jsonc
@@ -1,8 +1,8 @@
{
"lint": {
"files": {
- "include": ["lint/lint_with_config/"],
- "exclude": ["lint/lint_with_config/b.ts"]
+ "include": ["lint/with_config/"],
+ "exclude": ["lint/with_config/b.ts"]
},
"rules": {
"tags": ["recommended"],
diff --git a/cli/tests/testdata/lint/Deno.malformed.jsonc b/cli/tests/testdata/lint/Deno.malformed.jsonc
index c6225d6a9..f0d654114 100644
--- a/cli/tests/testdata/lint/Deno.malformed.jsonc
+++ b/cli/tests/testdata/lint/Deno.malformed.jsonc
@@ -1,8 +1,8 @@
{
"lint": {
"files": {
- "include": ["lint/lint_with_config/"],
- "exclude": ["lint/lint_with_config/b.ts"]
+ "include": ["lint/with_config/"],
+ "exclude": ["lint/with_config/b.ts"]
},
"dont_know_this_field": {},
"rules": {
diff --git a/cli/tests/testdata/lint/Deno.malformed2.jsonc b/cli/tests/testdata/lint/Deno.malformed2.jsonc
index 473dafc4b..741e0321b 100644
--- a/cli/tests/testdata/lint/Deno.malformed2.jsonc
+++ b/cli/tests/testdata/lint/Deno.malformed2.jsonc
@@ -1,8 +1,8 @@
{
"lint": {
"files": {
- "include": ["lint/lint_with_config/"],
- "exclude": ["lint/lint_with_config/b.ts"],
+ "include": ["lint/with_config/"],
+ "exclude": ["lint/with_config/b.ts"],
"dont_know_this_field": {}
},
"rules": {
diff --git a/cli/tests/testdata/lint/lint_with_config.out b/cli/tests/testdata/lint/with_config.out
index ea4581af8..ea4581af8 100644
--- a/cli/tests/testdata/lint/lint_with_config.out
+++ b/cli/tests/testdata/lint/with_config.out
diff --git a/cli/tests/testdata/lint/lint_with_config/a.ts b/cli/tests/testdata/lint/with_config/a.ts
index c378218a3..c378218a3 100644
--- a/cli/tests/testdata/lint/lint_with_config/a.ts
+++ b/cli/tests/testdata/lint/with_config/a.ts
diff --git a/cli/tests/testdata/lint/lint_with_config/b.ts b/cli/tests/testdata/lint/with_config/b.ts
index d5647067e..d5647067e 100644
--- a/cli/tests/testdata/lint/lint_with_config/b.ts
+++ b/cli/tests/testdata/lint/with_config/b.ts
diff --git a/cli/tests/testdata/lint/lint_with_config_and_flags.out b/cli/tests/testdata/lint/with_config_and_flags.out
index 0a409343e..0a409343e 100644
--- a/cli/tests/testdata/lint/lint_with_config_and_flags.out
+++ b/cli/tests/testdata/lint/with_config_and_flags.out
diff --git a/cli/tests/testdata/lint/lint_with_malformed_config.out b/cli/tests/testdata/lint/with_malformed_config.out
index 88fb8c457..88fb8c457 100644
--- a/cli/tests/testdata/lint/lint_with_malformed_config.out
+++ b/cli/tests/testdata/lint/with_malformed_config.out
diff --git a/cli/tests/testdata/lint/lint_with_malformed_config2.out b/cli/tests/testdata/lint/with_malformed_config2.out
index 11e878f00..11e878f00 100644
--- a/cli/tests/testdata/lint/lint_with_malformed_config2.out
+++ b/cli/tests/testdata/lint/with_malformed_config2.out
diff --git a/cli/tests/testdata/lint/file1.js b/cli/tests/testdata/lint/without_config/file1.js
index 737f26818..737f26818 100644
--- a/cli/tests/testdata/lint/file1.js
+++ b/cli/tests/testdata/lint/without_config/file1.js
diff --git a/cli/tests/testdata/lint/file2.ts b/cli/tests/testdata/lint/without_config/file2.ts
index 73c612c35..73c612c35 100644
--- a/cli/tests/testdata/lint/file2.ts
+++ b/cli/tests/testdata/lint/without_config/file2.ts
diff --git a/cli/tests/testdata/lint/ignored_file.ts b/cli/tests/testdata/lint/without_config/ignored_file.ts
index 97befafa3..97befafa3 100644
--- a/cli/tests/testdata/lint/ignored_file.ts
+++ b/cli/tests/testdata/lint/without_config/ignored_file.ts
diff --git a/cli/tests/testdata/lint/malformed.js b/cli/tests/testdata/lint/without_config/malformed.js
index 5ad4650d6..5ad4650d6 100644
--- a/cli/tests/testdata/lint/malformed.js
+++ b/cli/tests/testdata/lint/without_config/malformed.js