aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2013-03-25 08:19:03 -0700
committerSteve Klabnik <steve@steveklabnik.com>2013-03-25 08:19:03 -0700
commit1d4541900dd9e5786bee5b700a651f996a379f48 (patch)
tree494833ba14357cc42ef7a096494ceac856a69f5f /railties
parent3450eff02d9d350a81e79996a5f116a68dffa2c1 (diff)
parent5546081c4f6d074b34e855ab76bcfb062cc80e76 (diff)
downloadrails-1d4541900dd9e5786bee5b700a651f996a379f48.tar.gz
rails-1d4541900dd9e5786bee5b700a651f996a379f48.tar.bz2
rails-1d4541900dd9e5786bee5b700a651f996a379f48.zip
Merge pull request #9918 from prathamesh-sonpatki/railties-typos
Fixed typo in railties/test
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/asset_debugging_test.rb2
-rw-r--r--railties/test/application/initializers/i18n_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/asset_debugging_test.rb b/railties/test/application/asset_debugging_test.rb
index 1eddfac664..b3b40448c0 100644
--- a/railties/test/application/asset_debugging_test.rb
+++ b/railties/test/application/asset_debugging_test.rb
@@ -48,7 +48,7 @@ module ApplicationTests
assert_no_match(/<script src="\/assets\/xmlhr-([0-z]+)\.js"><\/script>/, last_response.body)
end
- test "assets aren't concatened when compile is true is on and debug_assets params is true" do
+ test "assets aren't concatenated when compile is true is on and debug_assets params is true" do
add_to_env_config "production", "config.assets.compile = true"
ENV["RAILS_ENV"] = "production"
diff --git a/railties/test/application/initializers/i18n_test.rb b/railties/test/application/initializers/i18n_test.rb
index 489b7ddb92..17d0b10b70 100644
--- a/railties/test/application/initializers/i18n_test.rb
+++ b/railties/test/application/initializers/i18n_test.rb
@@ -45,7 +45,7 @@ module ApplicationTests
end
# Load paths
- test "no config locales dir present should return empty load path" do
+ test "no config locales directory present should return empty load path" do
FileUtils.rm_rf "#{app_path}/config/locales"
load_app
assert_equal [], Rails.application.config.i18n.load_path