aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activerecord/test/cases/finder_test.rb2
-rw-r--r--railties/test/generators/app_generator_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index b06418d9fe..5e8f1c851f 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -721,7 +721,7 @@ class FinderTest < ActiveRecord::TestCase
end
def test_find_last_with_offset
- devs = Developer.order('id').all
+ devs = Developer.order('id')
assert_equal devs[2], Developer.offset(2).first
assert_equal devs[-3], Developer.offset(2).last
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 7c2040470f..e584c01da9 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -439,7 +439,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
def test_spring
run_generator
- assert_file "Gemfile", /gem 'spring'/
+ assert_file "Gemfile", /gem 'spring', \s+group: :development/
end
def test_spring_binstubs