Merge pull request #47275 from hahmed/ha/fix-wrong-assert-in-railties

Fix wrong order for assert_includes in railties test
This commit is contained in:
Eileen M. Uchitelle 2023-02-06 12:12:01 -05:00 committed by GitHub
commit 52a525b3ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 14 deletions

@ -377,7 +377,7 @@ class Rails::Command::RoutesTest < ActiveSupport::TestCase
output = run_routes_command([ "--unused" ])
assert_equal(output, "No unused routes found.\n")
assert_includes(output, "No unused routes found.")
end
private

@ -15,9 +15,7 @@ class Rails::Command::UnusedRoutesTest < ActiveSupport::TestCase
end
RUBY
assert_includes <<~OUTPUT, run_unused_routes_command
No unused routes found.
OUTPUT
assert_includes run_unused_routes_command, "No unused routes found."
end
test "no controller" do
@ -27,7 +25,7 @@ class Rails::Command::UnusedRoutesTest < ActiveSupport::TestCase
end
RUBY
assert_includes <<~OUTPUT, run_unused_routes_command(allow_failure: true)
assert_includes run_unused_routes_command(allow_failure: true), <<~OUTPUT
Found 1 unused route:
Prefix Verb URI Pattern Controller#Action
@ -47,7 +45,7 @@ class MyController < ActionController::Base
end
RUBY
assert_includes <<~OUTPUT, run_unused_routes_command(allow_failure: true)
assert_includes run_unused_routes_command(allow_failure: true), <<~OUTPUT
Found 1 unused route:
Prefix Verb URI Pattern Controller#Action
@ -71,9 +69,7 @@ class MyController < ActionController::Base
end
RUBY
assert_includes <<~OUTPUT, run_unused_routes_command
No unused routes found.
OUTPUT
assert_includes run_unused_routes_command, "No unused routes found."
end
test "multiple unused routes" do
@ -84,7 +80,7 @@ class MyController < ActionController::Base
end
RUBY
assert_includes <<~OUTPUT, run_unused_routes_command(allow_failure: true)
assert_includes run_unused_routes_command(allow_failure: true), <<~OUTPUT
Found 2 unused routes:
Prefix Verb URI Pattern Controller#Action
@ -101,7 +97,7 @@ class MyController < ActionController::Base
end
RUBY
assert_includes <<~OUTPUT, run_unused_routes_command(["-g", "one"], allow_failure: true)
assert_includes run_unused_routes_command(["-g", "one"], allow_failure: true), <<~OUTPUT
Found 1 unused route:
Prefix Verb URI Pattern Controller#Action
@ -115,7 +111,7 @@ class MyController < ActionController::Base
end
RUBY
assert_includes <<~OUTPUT, run_unused_routes_command(["-g", "one"])
assert_includes run_unused_routes_command(["-g", "one"]), <<~OUTPUT
No unused routes found for this grep pattern.
OUTPUT
end
@ -128,7 +124,7 @@ class MyController < ActionController::Base
end
RUBY
assert_includes <<~OUTPUT, run_unused_routes_command(["-c", "posts"], allow_failure: true)
assert_includes run_unused_routes_command(["-c", "posts"], allow_failure: true), <<~OUTPUT
Found 1 unused route:
Prefix Verb URI Pattern Controller#Action
@ -142,7 +138,7 @@ class MyController < ActionController::Base
end
RUBY
assert_includes <<~OUTPUT, run_unused_routes_command(["-c", "posts"])
assert_includes run_unused_routes_command(["-c", "posts"]), <<~OUTPUT
No unused routes found for this controller.
OUTPUT
end