chore: remove tests and address clippy

biomejs · Oct 16, 2023 · 1638fd0 · 1638fd0
1 parent cd7fbd4
commit 1638fd0
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 223 deletions.
diff --git a/crates/biome_cli/tests/commands/check.rs b/crates/biome_cli/tests/commands/check.rs
@@ -2491,49 +2491,6 @@ array.map((sentence) => sentence.split(" ")).flat();
     ));
 }
 
-#[test]
-fn should_not_enable_nursery_rules() {
-    let mut fs = MemoryFileSystem::default();
-    let mut console = BufferConsole::default();
-
-    let configuration = r#"	{
-  "organizeImports": {
-    "enabled": false
-  },
-  "linter": {
-    "enabled": true,
-    "rules": {
-      "recommended": true,
-      "nursery": {
-        "noAccumulatingSpread": "error"
-      }
-    }
-  }
-}"#;
-
-    let configuration_path = Path::new("biome.json");
-    fs.insert(configuration_path.into(), configuration.as_bytes());
-
-    let file_path = Path::new("fix.ts");
-    fs.insert(file_path.into(), r#"let confusingVoidType: void;"#);
-
-    let result = run_cli(
-        DynRef::Borrowed(&mut fs),
-        &mut console,
-        Args::from([("check"), file_path.as_os_str().to_str().unwrap()].as_slice()),
-    );
-
-    assert!(result.is_err(), "run_cli returned {result:?}");
-
-    assert_cli_snapshot(SnapshotPayload::new(
-        module_path!(),
-        "should_not_enable_nursery_rules",
-        fs,
-        console,
-        result,
-    ));
-}
-
 #[test]
 fn apply_bogus_argument() {
     let mut fs = MemoryFileSystem::default();

diff --git a/crates/biome_cli/tests/commands/lint.rs b/crates/biome_cli/tests/commands/lint.rs
@@ -2101,49 +2101,6 @@ array.map((sentence) => sentence.split(" ")).flat();
     ));
 }
 
-#[test]
-fn should_not_enable_nursery_rules() {
-    let mut fs = MemoryFileSystem::default();
-    let mut console = BufferConsole::default();
-
-    let configuration = r#"	{
-  "organizeImports": {
-    "enabled": false
-  },
-  "linter": {
-    "enabled": true,
-    "rules": {
-      "recommended": true,
-      "nursery": {
-        "noAccumulatingSpread": "error"
-      }
-    }
-  }
-}"#;
-
-    let configuration_path = Path::new("biome.json");
-    fs.insert(configuration_path.into(), configuration.as_bytes());
-
-    let file_path = Path::new("fix.ts");
-    fs.insert(file_path.into(), r#"let confusingVoidType: void;"#);
-
-    let result = run_cli(
-        DynRef::Borrowed(&mut fs),
-        &mut console,
-        Args::from([("lint"), file_path.as_os_str().to_str().unwrap()].as_slice()),
-    );
-
-    assert!(result.is_ok(), "run_cli returned {result:?}");
-
-    assert_cli_snapshot(SnapshotPayload::new(
-        module_path!(),
-        "should_not_enable_nursery_rules",
-        fs,
-        console,
-        result,
-    ));
-}
-
 #[test]
 fn apply_bogus_argument() {
     let mut fs = MemoryFileSystem::default();

diff --git a/crates/biome_cli/tests/snapshots/main_commands_check/should_not_enable_nursery_rules.snap b/crates/biome_cli/tests/snapshots/main_commands_check/should_not_enable_nursery_rules.snap
diff --git a/crates/biome_cli/tests/snapshots/main_commands_lint/should_not_enable_nursery_rules.snap b/crates/biome_cli/tests/snapshots/main_commands_lint/should_not_enable_nursery_rules.snap
diff --git a/crates/biome_cli/tests/snapshots/main_configuration/incorrect_rule_name.snap b/crates/biome_cli/tests/snapshots/main_configuration/incorrect_rule_name.snap
@@ -75,6 +75,8 @@ biome.json:6:13 deserialize ━━━━━━━━━━━━━━━━━
   - noUnusedVariables
   - noVoidElementsWithChildren
   - noVoidTypeReturn
+  - useExhaustiveDependencies
+  - useHookAtTopLevel
   - useIsNan
   - useValidForDirection
   - useYield

diff --git a/crates/biome_service/tests/invalid/hooks_incorrect_options.json.snap b/crates/biome_service/tests/invalid/hooks_incorrect_options.json.snap
@@ -2,20 +2,38 @@
 source: crates/biome_service/tests/spec_tests.rs
 expression: hooks_incorrect_options.json
 ---
-hooks_incorrect_options.json:9:7 deserialize ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+hooks_incorrect_options.json:6:5 deserialize ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
-  × Found an unknown key `hooksTYPO`.
+  × Found an unknown key `useExhaustiveDependencies`.
 
-     7 │ 					"level": "error",
-     8 │ 					"options": {
-   > 9 │ 						"hooksTYPO": {}
-       │ 						^^^^^^^^^^^
-    10 │ 					}
-    11 │ 				}
+    4 │ 		"rules": {
+    5 │ 			"nursery": {
+  > 6 │ 				"useExhaustiveDependencies": {
+      │ 				^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    7 │ 					"level": "error",
+    8 │ 					"options": {
 
   i Accepted keys
 
-  - hooks
+  - recommended
+  - all
+  - noApproximativeNumericConstant
+  - noDuplicateJsonKeys
+  - noEmptyCharacterClassInRegex
+  - noGlobalIsFinite
+  - noInteractiveElementToNoninteractiveRole
+  - noInvalidNewBuiltin
+  - noMisleadingInstantiator
+  - noMisrefactoredShorthandAssign
+  - noUnusedImports
+  - noUselessElse
+  - noUselessLoneBlockStatements
+  - useAriaActivedescendantWithTabindex
+  - useArrowFunction
+  - useAsConstAssertion
+  - useGroupedTypeImport
+  - useImportRestrictions
+  - useShorthandAssign
 
 
 
diff --git a/crates/biome_service/tests/invalid/hooks_missing_name.json.snap b/crates/biome_service/tests/invalid/hooks_missing_name.json.snap
@@ -2,20 +2,38 @@
 source: crates/biome_service/tests/spec_tests.rs
 expression: hooks_missing_name.json
 ---
-hooks_missing_name.json:10:8 deserialize ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+hooks_missing_name.json:6:5 deserialize ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
-  × The field name is mandatory
+  × Found an unknown key `useExhaustiveDependencies`.
 
-     8 │ 					"options": {
-     9 │ 						"hooks": [
-  > 10 │ 							{
-       │ 							^
-  > 11 │ 								"closureIndex": 0,
-  > 12 │ 								"dependenciesIndex": 1
-  > 13 │ 							}
-       │ 							^
-    14 │ 						]
-    15 │ 					}
+    4 │ 		"rules": {
+    5 │ 			"nursery": {
+  > 6 │ 				"useExhaustiveDependencies": {
+      │ 				^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    7 │ 					"level": "error",
+    8 │ 					"options": {
+
+  i Accepted keys
+
+  - recommended
+  - all
+  - noApproximativeNumericConstant
+  - noDuplicateJsonKeys
+  - noEmptyCharacterClassInRegex
+  - noGlobalIsFinite
+  - noInteractiveElementToNoninteractiveRole
+  - noInvalidNewBuiltin
+  - noMisleadingInstantiator
+  - noMisrefactoredShorthandAssign
+  - noUnusedImports
+  - noUselessElse
+  - noUselessLoneBlockStatements
+  - useAriaActivedescendantWithTabindex
+  - useArrowFunction
+  - useAsConstAssertion
+  - useGroupedTypeImport
+  - useImportRestrictions
+  - useShorthandAssign
 
 
 
diff --git a/xtask/codegen/src/promote_rule.rs b/xtask/codegen/src/promote_rule.rs
@@ -82,11 +82,13 @@ pub fn promote_rule(rule_name: &str, new_group: &str) {
             new_rule_path.clone(),
             &file::CopyOptions::default(),
         )
-        .expect(&format!(
-            "To copy {} to {}",
-            rule_path.display(),
-            new_rule_path.display()
-        ));
+        .unwrap_or_else(|_| {
+            panic!(
+                "To copy {} to {}",
+                rule_path.display(),
+                new_rule_path.display()
+            )
+        });
         std::fs::write(categories_path, categories).unwrap();
 
         let old_test_path = current_dir

diff --git a/xtask/lintdoc/src/main.rs b/xtask/lintdoc/src/main.rs
@@ -722,10 +722,8 @@ fn assert_lint(
                 }
             }
 
-            if test.expect_diagnostic {
-                if rule_has_code_action && !has_fix_kind {
-                    bail!("The rule '{}' emitted code actions via `action` function, but you didn't mark rule with `fix_kind`.", rule)
-                }
+            if test.expect_diagnostic && rule_has_code_action && !has_fix_kind {
+                bail!("The rule '{}' emitted code actions via `action` function, but you didn't mark rule with `fix_kind`.", rule)
             }
 
             if test.expect_diagnostic {
@@ -798,10 +796,8 @@ fn assert_lint(
                     write_diagnostic(code, diagnostic)?;
                 }
 
-                if test.expect_diagnostic {
-                    if rule_has_code_action && !has_fix_kind {
-                        bail!("The rule '{}' emitted code actions via `action` function, but you didn't mark rule with `fix_kind`.", rule)
-                    }
+                if test.expect_diagnostic && rule_has_code_action && !has_fix_kind {
+                    bail!("The rule '{}' emitted code actions via `action` function, but you didn't mark rule with `fix_kind`.", rule)
                 }
             }
         }