diff --git a/railties/test/commands/notes_test.rb b/railties/test/commands/notes_test.rb index d8647b3acab7437a0e84a8c799e38ea41fc1ee83..147019e29911b1fe2741fe40ee5434078308082f 100644 --- a/railties/test/commands/notes_test.rb +++ b/railties/test/commands/notes_test.rb @@ -8,51 +8,51 @@ class Rails::Command::NotesTest < ActiveSupport::TestCase setup :build_app teardown :teardown_app - test "`rails notes` displays results for default directories and default annotations" do + test "`rails notes` displays results for default directories and default annotations with aligned line number and annotation tag" do app_file "app/controllers/some_controller.rb", "# OPTIMIZE: note in app directory" app_file "config/initializers/some_initializer.rb", "# TODO: note in config directory" app_file "db/some_seeds.rb", "# FIXME: note in db directory" app_file "lib/some_file.rb", "# TODO: note in lib directory" - app_file "test/some_test.rb", 1000.times.map { "" }.join("\n") << "# FIXME: note in test directory" + app_file "test/some_test.rb", "\n" * 100 + "# FIXME: note in test directory" app_file "some_other_dir/blah.rb", "# TODO: note in some_other directory" assert_equal <<~OUTPUT, run_notes_command app/controllers/some_controller.rb: - * [ 1] [OPTIMIZE] note in app directory + * [ 1] [OPTIMIZE] note in app directory config/initializers/some_initializer.rb: - * [ 1] [TODO] note in config directory + * [ 1] [TODO] note in config directory db/some_seeds.rb: - * [ 1] [FIXME] note in db directory + * [ 1] [FIXME] note in db directory lib/some_file.rb: - * [ 1] [TODO] note in lib directory + * [ 1] [TODO] note in lib directory test/some_test.rb: - * [1000] [FIXME] note in test directory + * [101] [FIXME] note in test directory OUTPUT end - test "`rails notes` displays an empty array when no results were found" do + test "`rails notes` displays an empty string when no results were found" do assert_equal "", run_notes_command end test "`rails notes --annotations` displays results for a single annotation without being prefixed by a tag" do app_file "db/some_seeds.rb", "# FIXME: note in db directory" - app_file "test/some_test.rb", 1000.times.map { "" }.join("\n") << "# FIXME: note in test directory" + app_file "test/some_test.rb", "# FIXME: note in test directory" app_file "app/controllers/some_controller.rb", "# OPTIMIZE: note in app directory" app_file "config/initializers/some_initializer.rb", "# TODO: note in config directory" assert_equal <<~OUTPUT, run_notes_command(["--annotations", "FIXME"]) db/some_seeds.rb: - * [ 1] note in db directory + * [1] note in db directory test/some_test.rb: - * [1000] note in test directory + * [1] note in test directory OUTPUT end @@ -62,7 +62,7 @@ class Rails::Command::NotesTest < ActiveSupport::TestCase app_file "config/initializers/some_initializer.rb", "# TODO: note in config directory" app_file "lib/some_file.rb", "# TODO: note in lib directory" - app_file "test/some_test.rb", 1000.times.map { "" }.join("\n") << "# FIXME: note in test directory" + app_file "test/some_test.rb", "# FIXME: note in test directory" assert_equal <<~OUTPUT, run_notes_command(["--annotations", "FOOBAR", "TODO"]) app/controllers/some_controller.rb: