aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-05-29 20:54:57 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-05-29 20:54:57 -0700
commitf09ae8538f3625468ee175d5a4d9782e0d5ba415 (patch)
tree3ecf2b0f15ecf191b8fc413a7c280b6876f8f0d3 /railties/test/application
parent12e5c727aea3975d2108a66571dc13a5b2a0e651 (diff)
parent2f71d4063f17e25310939f81246ada0accff0342 (diff)
downloadrails-f09ae8538f3625468ee175d5a4d9782e0d5ba415.tar.gz
rails-f09ae8538f3625468ee175d5a4d9782e0d5ba415.tar.bz2
rails-f09ae8538f3625468ee175d5a4d9782e0d5ba415.zip
Merge pull request #6519 from oscardelben/3-2-stable
Display annotations in coffee files
Diffstat (limited to 'railties/test/application')
-rw-r--r--railties/test/application/rake/notes_test.rb14
1 files changed, 9 insertions, 5 deletions
diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb
index 659cbfec0f..dd401009f7 100644
--- a/railties/test/application/rake/notes_test.rb
+++ b/railties/test/application/rake/notes_test.rb
@@ -7,7 +7,7 @@ module ApplicationTests
build_app
require "rails/all"
end
-
+
def teardown
teardown_app
end
@@ -17,6 +17,8 @@ module ApplicationTests
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/controllers/application_controller.rb", 1000.times.map { "" }.join("\n") << "# TODO: note in ruby"
boot_rails
require 'rake'
@@ -24,17 +26,19 @@ module ApplicationTests
require 'rake/testtask'
Rails.application.load_tasks
-
+
Dir.chdir(app_path) do
output = `bundle exec rake notes`
-
+
assert_match /note in erb/, output
assert_match /note in haml/, output
assert_match /note in slim/, output
+ assert_match /note in ruby/, output
+ assert_match /note in coffee/, output
end
-
+
end
-
+
private
def boot_rails
super