diff --git a/test/fixture/config/t/.standard.yml b/test/fixture/config/t/.standard.yml deleted file mode 100644 index e2784730..00000000 --- a/test/fixture/config/t/.standard.yml +++ /dev/null @@ -1,3 +0,0 @@ -ignore: - - none_todo_path/**/* - - none_todo_file.rb diff --git a/test/fixture/config/t/.standard_todo.yml b/test/fixture/config/t/.standard_todo.yml deleted file mode 100644 index bb622faa..00000000 --- a/test/fixture/config/t/.standard_todo.yml +++ /dev/null @@ -1,4 +0,0 @@ -ignore: - - todo_file_one.rb: - - Lint/AssignmentInCondition - - todo_file_two.rb diff --git a/test/fixture/config/u/.standard.yml b/test/fixture/config/u/.standard.yml new file mode 100644 index 00000000..8aeab28a --- /dev/null +++ b/test/fixture/config/u/.standard.yml @@ -0,0 +1,9 @@ +ignore: + - none_todo_path/**/* + - none_todo_file.rb + - thing.rb: + - Lint/Style + - Lint/UselessAssignment + - stuff.rb: + - Lint/Style + - Metric/LineLength \ No newline at end of file diff --git a/test/fixture/config/u/.standard_todo.yml b/test/fixture/config/u/.standard_todo.yml new file mode 100644 index 00000000..d765abb1 --- /dev/null +++ b/test/fixture/config/u/.standard_todo.yml @@ -0,0 +1,3 @@ +ignore: + - todo_file_one.rb + - todo_file_two.rb \ No newline at end of file diff --git a/test/standard/builds_config_test.rb b/test/standard/builds_config_test.rb index 186dc07a..09ce1841 100644 --- a/test/standard/builds_config_test.rb +++ b/test/standard/builds_config_test.rb @@ -84,18 +84,19 @@ def test_todo_file_not_loaded_when_generating_todo_file assert_equal DEFAULT_OPTIONS, result.rubocop_options end - def test_todo_with_offenses_merged - result = @subject.call([], path("test/fixture/config/t")) - - assert_equal DEFAULT_OPTIONS.merge( - todo_file: path("test/fixture/config/t/.standard_todo.yml"), - todo_ignore_files: %w[todo_file_one.rb todo_file_two.rb] - ), result.rubocop_options + def test_todo_merged + result = @subject.call([], path("test/fixture/config/u")) resulting_options_config = result.rubocop_config_store.for("").to_h - assert_includes resulting_options_config["AllCops"]["Exclude"], path("test/fixture/config/t/none_todo_path/**/*") - assert_includes resulting_options_config["AllCops"]["Exclude"], path("test/fixture/config/t/none_todo_file.rb") - assert_includes resulting_options_config["AllCops"]["Exclude"], path("test/fixture/config/t/todo_file_two.rb") - assert_includes resulting_options_config["Lint/AssignmentInCondition"]["Exclude"], path("test/fixture/config/t/todo_file_one.rb") + assert_includes resulting_options_config["AllCops"]["Exclude"], path("test/fixture/config/u/none_todo_path/**/*") + assert_includes resulting_options_config["AllCops"]["Exclude"], path("test/fixture/config/u/none_todo_file.rb") + assert_includes resulting_options_config["AllCops"]["Exclude"], path("test/fixture/config/u/todo_file_one.rb") + assert_includes resulting_options_config["AllCops"]["Exclude"], path("test/fixture/config/u/todo_file_two.rb") + assert_includes resulting_options_config["Lint/Style"]["Exclude"], path("test/fixture/config/u/thing.rb") + assert_includes resulting_options_config["Lint/Style"]["Exclude"], path("test/fixture/config/u/stuff.rb") + assert_includes resulting_options_config["Lint/UselessAssignment"]["Exclude"], path("test/fixture/config/u/thing.rb") + refute_includes resulting_options_config["Lint/UselessAssignment"]["Exclude"], path("test/fixture/config/u/stuff.rb") + refute_includes resulting_options_config["Metric/LineLength"]["Exclude"], path("test/fixture/config/u/thing.rb") + assert_includes resulting_options_config["Metric/LineLength"]["Exclude"], path("test/fixture/config/u/stuff.rb") end end