1 files changed, 80 insertions, 2 deletions
diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb
index 04abf9e3a1..05d73dfc5c 100644
--- a/railties/test/application/rake/notes_test.rb
+++ b/railties/test/application/rake/notes_test.rb
@@ -12,11 +12,14 @@ module ApplicationTests
         teardown_app
       end
 
-      test 'notes' do
+      test 'notes finds notes for certain file_types' do
         app_file "app/views/home/index.html.erb", "<% # TODO: note in erb %>"
         app_file "app/views/home/index.html.haml", "-# TODO: note in haml"
         app_file "app/views/home/index.html.slim", "/ TODO: note in slim"
         app_file "app/assets/javascripts/application.js.coffee", "# TODO: note in coffee"
+        app_file "app/assets/javascripts/application.js", "// TODO: note in js"
+        app_file "app/assets/stylesheets/application.css", "// TODO: note in css"
+        app_file "app/assets/stylesheets/application.css.scss", "// TODO: note in scss"
         app_file "app/controllers/application_controller.rb", 1000.times.map { "" }.join("\n") << "# TODO: note in ruby"
 
         boot_rails
@@ -35,15 +38,90 @@ module ApplicationTests
           assert_match /note in slim/, output
           assert_match /note in ruby/, output
           assert_match /note in coffee/, output
+          assert_match /note in js/, output
+          assert_match /note in css/, output
+          assert_match /note in scss/, output
 
-          assert_equal 5, lines.size
+          assert_equal 8, lines.size
 
           lines.each do |line|
             assert_equal 4, line[0].size
             assert_equal ' ', line[1]
           end
         end
+      end
+
+      test 'notes finds notes in default directories' do
+        app_file "app/controllers/some_controller.rb", "# TODO: note in app directory"
+        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 "script/run_something.rb", "# TODO: note in script directory"
+        app_file "test/some_test.rb", 1000.times.map { "" }.join("\n") << "# TODO: note in test directory"
+
+        app_file "some_other_dir/blah.rb", "# TODO: note in some_other directory"
+
+        boot_rails
+
+        require 'rake'
+        require 'rdoc/task'
+        require 'rake/testtask'
 
+        Rails.application.load_tasks
+
+        Dir.chdir(app_path) do
+          output = `bundle exec rake notes`
+          lines = output.scan(/\[([0-9\s]+)\]/).flatten
+
+          assert_match /note in app directory/, output
+          assert_match /note in config directory/, output
+          assert_match /note in lib directory/, output
+          assert_match /note in script directory/, output
+          assert_match /note in test directory/, output
+          assert_no_match /note in some_other directory/, output
+
+          assert_equal 5, lines.size
+
+          lines.each do |line_number|
+            assert_equal 4, line_number.size
+          end
+        end
+      end
+
+      test 'notes finds notes in custom directories' do
+        app_file "app/controllers/some_controller.rb", "# TODO: note in app directory"
+        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 "script/run_something.rb", "# TODO: note in script directory"
+        app_file "test/some_test.rb", 1000.times.map { "" }.join("\n") << "# TODO: note in test directory"
+
+        app_file "some_other_dir/blah.rb", "# TODO: note in some_other directory"
+
+        boot_rails
+
+        require 'rake'
+        require 'rdoc/task'
+        require 'rake/testtask'
+
+        Rails.application.load_tasks
+
+        Dir.chdir(app_path) do
+          output = `SOURCE_ANNOTATION_DIRECTORIES='some_other_dir' bundle exec rake notes`
+          lines = output.scan(/\[([0-9\s]+)\]/).flatten
+
+          assert_match /note in app directory/, output
+          assert_match /note in config directory/, output
+          assert_match /note in lib directory/, output
+          assert_match /note in script directory/, output
+          assert_match /note in test directory/, output
+
+          assert_match /note in some_other directory/, output
+
+          assert_equal 6, lines.size
+
+          lines.each do |line_number|
+            assert_equal 4, line_number.size
+          end
+        end
       end
 
       private