aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2019-03-11 17:49:27 -0400
committerRafael Mendonça França <rafaelmfranca@gmail.com>2019-03-11 17:49:27 -0400
commitcfa22f1a4b5e8b95ee01a432168de2f831b3f788 (patch)
tree2e27c23a6f3c04c407cecb11777879f838868662 /railties
parentcab396f4238997421181057645ab13e552881208 (diff)
downloadrails-cfa22f1a4b5e8b95ee01a432168de2f831b3f788.tar.gz
rails-cfa22f1a4b5e8b95ee01a432168de2f831b3f788.tar.bz2
rails-cfa22f1a4b5e8b95ee01a432168de2f831b3f788.zip
Do not generate dummy string when the tag used is not the <%=
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/application/dummy_erb_compiler.rb5
-rw-r--r--railties/test/application/rake/dbs_test.rb1
2 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/rails/application/dummy_erb_compiler.rb b/railties/lib/rails/application/dummy_erb_compiler.rb
index 4e92526969..985e6f605e 100644
--- a/railties/lib/rails/application/dummy_erb_compiler.rb
+++ b/railties/lib/rails/application/dummy_erb_compiler.rb
@@ -11,6 +11,9 @@ end
class DummyCompiler < ERB::Compiler # :nodoc:
def compile_content(stag, out)
- out.push "_erbout << 'dummy_compiler'"
+ case stag
+ when '<%='
+ out.push "_erbout << 'dummy_compiler'"
+ end
end
end
diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
index 4f689bcb78..ea7117800c 100644
--- a/railties/test/application/rake/dbs_test.rb
+++ b/railties/test/application/rake/dbs_test.rb
@@ -53,6 +53,7 @@ module ApplicationTests
test "db:create and db:drop respect environment setting" do
app_file "config/database.yml", <<-YAML
+ <% 1 %>
development:
database: <%= Rails.application.config.database %>
adapter: sqlite3