@@ -3,13 +3,12 @@ use predicates::prelude::*;
33use std:: { error:: Error , fs, process:: Command } ;
44mod common;
55
6- #[ test]
7- fn test_check_unnecessary_dependencies ( ) -> Result < ( ) , Box < dyn Error > > {
6+ fn assert_check_unused_dependencies ( cmd : & str ) -> Result < ( ) , Box < dyn Error > > {
87 Command :: cargo_bin ( "pks" ) ?
98 . arg ( "--project-root" )
109 . arg ( "tests/fixtures/app_with_dependency_cycles" )
1110 . arg ( "--debug" )
12- . arg ( "check-unnecessary-dependencies" )
11+ . arg ( cmd )
1312 . assert ( )
1413 . failure ( )
1514 . stdout ( predicate:: str:: contains (
@@ -19,19 +18,45 @@ fn test_check_unnecessary_dependencies() -> Result<(), Box<dyn Error>> {
1918 "packs/foo depends on packs/bar but does not use it" ,
2019 ) )
2120 . stderr ( predicate:: str:: contains (
22- "Error: Found 3 unnecessary dependencies. Run command with ` --auto-correct` to remove them." ,
23- ) ) ;
21+ "Error: Found 3 unused dependencies. Run `packs check-unused-dependencies --auto-correct` to remove them." )
22+ ) ;
2423 Ok ( ( ) )
2524}
2625
2726#[ test]
28- fn test_auto_correct_unnecessary_dependencies ( ) -> Result < ( ) , Box < dyn Error > > {
27+ fn test_check_unnecessary_dependencies ( ) -> Result < ( ) , Box < dyn Error > > {
28+ assert_check_unused_dependencies ( "check-unnecessary-dependencies" )
29+ }
30+
31+ #[ test]
32+ fn test_check_unused_dependencies ( ) -> Result < ( ) , Box < dyn Error > > {
33+ assert_check_unused_dependencies ( "check-unused-dependencies" )
34+ }
35+
36+ fn assert_auto_correct_unused_dependencies (
37+ cmd : & str ,
38+ flag : & str ,
39+ ) -> Result < ( ) , Box < dyn Error > > {
40+ common:: set_up_fixtures ( ) ;
41+
42+ let expected_before_autocorrect = [
43+ "enforce_dependencies: true" ,
44+ "enforce_privacy: true" ,
45+ "layer: technical_services" ,
46+ "dependencies:" ,
47+ "- packs/bar" ,
48+ "- packs/baz\n " ,
49+ ]
50+ . join ( "\n " ) ;
51+ let foo_package_yml = fs:: read_to_string ( "tests/fixtures/app_with_unnecessary_dependencies/packs/foo/package.yml" ) . unwrap ( ) ;
52+ assert_eq ! ( foo_package_yml, expected_before_autocorrect) ;
53+
2954 Command :: cargo_bin ( "pks" ) ?
3055 . arg ( "--project-root" )
3156 . arg ( "tests/fixtures/app_with_unnecessary_dependencies" )
3257 . arg ( "--debug" )
33- . arg ( "check-unnecessary-dependencies" )
34- . arg ( "--auto-correct" )
58+ . arg ( cmd )
59+ . arg ( flag )
3560 . assert ( )
3661 . success ( ) ;
3762
@@ -49,14 +74,31 @@ fn test_auto_correct_unnecessary_dependencies() -> Result<(), Box<dyn Error>> {
4974 Ok ( ( ) )
5075}
5176
77+ #[ test]
78+ fn test_auto_correct_unnecessary_dependencies ( ) -> Result < ( ) , Box < dyn Error > > {
79+ assert_auto_correct_unused_dependencies (
80+ "check-unused-dependencies" ,
81+ "--auto-correct" ,
82+ ) ?;
83+ assert_auto_correct_unused_dependencies ( "check-unused-dependencies" , "-a" ) ?;
84+ assert_auto_correct_unused_dependencies (
85+ "check-unnecessary-dependencies" ,
86+ "-a" ,
87+ ) ?;
88+ assert_auto_correct_unused_dependencies (
89+ "check-unnecessary-dependencies" ,
90+ "--auto-correct" ,
91+ )
92+ }
93+
5294#[ test]
5395fn test_check_unnecessary_dependencies_no_issue ( ) -> Result < ( ) , Box < dyn Error > >
5496{
5597 Command :: cargo_bin ( "pks" ) ?
5698 . arg ( "--project-root" )
5799 . arg ( "tests/fixtures/simple_app" )
58100 . arg ( "--debug" )
59- . arg ( "check-unnecessary -dependencies" )
101+ . arg ( "check-unused -dependencies" )
60102 . assert ( )
61103 . success ( ) ;
62104 Ok ( ( ) )
0 commit comments