aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkennyj <kennyj@gmail.com>2011-11-27 20:25:05 +0900
committerkennyj <kennyj@gmail.com>2011-11-27 20:25:05 +0900
commit78ad94aaa7b70fee6c8f49de04f26d4ec14fa162 (patch)
tree7928099c1653c456b42672edcf179b067fb10ec7
parent3c81fc3b91ddfd4d115a7001640588eb93249261 (diff)
downloadrails-78ad94aaa7b70fee6c8f49de04f26d4ec14fa162.tar.gz
rails-78ad94aaa7b70fee6c8f49de04f26d4ec14fa162.tar.bz2
rails-78ad94aaa7b70fee6c8f49de04f26d4ec14fa162.zip
avoid absolute path for the rails.png in index.html
-rw-r--r--railties/lib/rails/generators/rails/app/templates/public/index.html2
-rw-r--r--railties/test/generators/app_generator_test.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/public/index.html b/railties/lib/rails/generators/rails/app/templates/public/index.html
index 9d9811a5bf..a1d50995c5 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/index.html
+++ b/railties/lib/rails/generators/rails/app/templates/public/index.html
@@ -59,7 +59,7 @@
#header {
- background-image: url("/assets/rails.png");
+ background-image: url("assets/rails.png");
background-repeat: no-repeat;
background-position: top left;
height: 64px;
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index a1bd2fbaa5..235c08e38e 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -55,6 +55,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
assert_file "app/views/layouts/application.html.erb", /javascript_include_tag\s+"application"/
assert_file "app/assets/stylesheets/application.css"
assert_file "config/application.rb", /config\.assets\.enabled = true/
+ assert_file "public/index.html", /url\("assets\/rails.png"\);/
end
def test_invalid_application_name_raises_an_error