2 files changed, 9 insertions, 6 deletions
diff --git a/activesupport/test/core_ext/class/attribute_test.rb b/activesupport/test/core_ext/class/attribute_test.rb
index 1c3ba8a7a0..e7a1334db3 100644
--- a/activesupport/test/core_ext/class/attribute_test.rb
+++ b/activesupport/test/core_ext/class/attribute_test.rb
@@ -27,7 +27,7 @@ class ClassAttributeTest < ActiveSupport::TestCase
     assert_equal 1, Class.new(@sub).setting
   end
 
-  test 'query method' do
+  test 'predicate method' do
     assert_equal false, @klass.setting?
     @klass.setting = 1
     assert_equal true, @klass.setting?
@@ -48,7 +48,7 @@ class ClassAttributeTest < ActiveSupport::TestCase
     assert_equal 1, object.setting
   end
 
-  test 'instance query' do
+  test 'instance predicate' do
     object = @klass.new
     assert_equal false, object.setting?
     object.setting = 1
@@ -73,6 +73,11 @@ class ClassAttributeTest < ActiveSupport::TestCase
     assert_raise(NoMethodError) { object.setting = 'boom' }
   end
 
+  test 'disabling instance predicate' do
+    object = Class.new { class_attribute :setting, instance_predicate: false }.new
+    assert_raise(NoMethodError) { object.setting? }
+  end
+
   test 'works well with singleton classes' do
     object = @klass.new
     object.singleton_class.setting = 'foo'
diff --git a/activesupport/test/core_ext/enumerable_test.rb b/activesupport/test/core_ext/enumerable_test.rb
index 0a1abac767..6781e3c20e 100644
--- a/activesupport/test/core_ext/enumerable_test.rb
+++ b/activesupport/test/core_ext/enumerable_test.rb
@@ -24,10 +24,8 @@ class EnumerableTests < ActiveSupport::TestCase
   def test_group_by
     names = %w(marcel sam david jeremy)
     klass = Struct.new(:name)
-    objects = (1..50).inject([]) do |people,|
-      p = klass.new
-      p.name = names.sort_by { rand }.first
-      people << p
+    objects = (1..50).map do
+      klass.new names.sample
     end
 
     enum = GenericEnumerable.new(objects)