aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-09-21 16:10:23 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2012-09-21 16:10:23 -0700
commitec28c059b76702254f64989f04b29be4ac3f39fd (patch)
tree53b0ccbdf0ff0b51363c1e9f5155e4292c82d795
parentb7918cce046810ad66c9e641e8f92e549b76c31b (diff)
parentc60e19bc6da39807f551d280b88396678646212a (diff)
downloadrails-ec28c059b76702254f64989f04b29be4ac3f39fd.tar.gz
rails-ec28c059b76702254f64989f04b29be4ac3f39fd.tar.bz2
rails-ec28c059b76702254f64989f04b29be4ac3f39fd.zip
Merge pull request #7726 from jcorcuera/master
Remove '.rb' from require sentences
-rw-r--r--activesupport/test/core_ext/object/to_query_test.rb2
-rw-r--r--railties/test/generators/app_generator_test.rb2
-rw-r--r--railties/test/generators/plugin_new_generator_test.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/test/core_ext/object/to_query_test.rb b/activesupport/test/core_ext/object/to_query_test.rb
index c34647c1df..8d1a8c628c 100644
--- a/activesupport/test/core_ext/object/to_query_test.rb
+++ b/activesupport/test/core_ext/object/to_query_test.rb
@@ -1,7 +1,7 @@
require 'abstract_unit'
require 'active_support/ordered_hash'
require 'active_support/core_ext/object/to_query'
-require 'active_support/core_ext/string/output_safety.rb'
+require 'active_support/core_ext/string/output_safety'
class ToQueryTest < ActiveSupport::TestCase
def test_simple_conversion
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index e7b6a20b32..856a0e163b 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -1,6 +1,6 @@
require 'generators/generators_test_helper'
require 'rails/generators/rails/app/app_generator'
-require 'generators/shared_generator_tests.rb'
+require 'generators/shared_generator_tests'
DEFAULT_APP_FILES = %w(
.gitignore
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index bfb20dad2d..dddbfa64b6 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -1,6 +1,6 @@
require 'generators/generators_test_helper'
require 'rails/generators/rails/plugin_new/plugin_new_generator'
-require 'generators/shared_generator_tests.rb'
+require 'generators/shared_generator_tests'
DEFAULT_PLUGIN_FILES = %w(
.gitignore