diff --git a/src/packs/pack.rs b/src/packs/pack.rs index 706232d..5ccfae7 100644 --- a/src/packs/pack.rs +++ b/src/packs/pack.rs @@ -17,6 +17,9 @@ use super::{ #[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone)] pub struct Pack { + #[serde(default, skip_serializing_if = "Option::is_none")] + pub owner: Option, + #[serde(skip)] pub yml: PathBuf, @@ -32,7 +35,7 @@ pub struct Pack { serialize_with = "serialize_checker_setting", deserialize_with = "deserialize_checker_setting" )] - pub enforce_dependencies: Option, + pub enforce_folder_privacy: Option, #[serde( default, @@ -58,12 +61,17 @@ pub struct Pack { )] pub enforce_layers: Option, - #[serde(default, skip_serializing_if = "Option::is_none")] - pub owner: Option, - #[serde(default, skip_serializing_if = "Option::is_none")] pub layer: Option, + #[serde( + default, + skip_serializing_if = "Option::is_none", + serialize_with = "serialize_checker_setting", + deserialize_with = "deserialize_checker_setting" + )] + pub enforce_dependencies: Option, + #[serde( default, skip_serializing_if = "HashSet::is_empty", @@ -102,14 +110,6 @@ pub struct Pack { )] pub visible_to: Option>, - #[serde( - default, - skip_serializing_if = "Option::is_none", - serialize_with = "serialize_checker_setting", - deserialize_with = "deserialize_checker_setting" - )] - pub enforce_folder_privacy: Option, - #[serde( default, skip_serializing_if = "Option::is_none", @@ -513,8 +513,8 @@ foobar: true let actual = reserialize_pack(pack_yml); let expected = r#" -enforce_dependencies: strict enforce_privacy: true +enforce_dependencies: strict dependencies: - packs/a - packs/b @@ -626,8 +626,8 @@ enforce_dependencies: true let actual = reserialize_pack(pack_yml); let expected = r#" -enforce_dependencies: true owner: Foobar +enforce_dependencies: true "# .trim_start(); diff --git a/tests/check_unused_dependencies.rs b/tests/check_unused_dependencies.rs index a1d510f..640259e 100644 --- a/tests/check_unused_dependencies.rs +++ b/tests/check_unused_dependencies.rs @@ -61,9 +61,9 @@ fn assert_auto_correct_unused_dependencies( .success(); let expected_autocorrect = [ - "enforce_dependencies: true", "enforce_privacy: true", "layer: technical_services", + "enforce_dependencies: true", "dependencies:", "- packs/bar\n", ] diff --git a/tests/create_test.rs b/tests/create_test.rs index 00daaa3..a2f2f71 100644 --- a/tests/create_test.rs +++ b/tests/create_test.rs @@ -7,6 +7,8 @@ mod common; #[test] fn test_create() -> Result<(), Box> { + common::delete_foobar(); + Command::cargo_bin("pks")? .arg("--project-root") .arg("tests/fixtures/simple_app")