Merge pull request #6072 from marcandre/observer_simplify_test

Observer: simplify tests

1 files changed, 4 insertions, 11 deletions

diff --git a/activemodel/test/cases/observing_test.rb b/activemodel/test/cases/observing_test.rb
index f8bfcf839d..3b636a6768 100644
--- a/activemodel/test/cases/observing_test.rb
+++ b/activemodel/test/cases/observing_test.rb
@@ -113,32 +113,25 @@ class ObserverTest < ActiveModel::TestCase
 
   test "tracks implicit observable models" do
     instance = FooObserver.new
-    assert  instance.send(:observed_classes).include?(Foo), "Foo not in #{instance.send(:observed_classes).inspect}"
-    assert !instance.send(:observed_classes).include?(ObservedModel), "ObservedModel in #{instance.send(:observed_classes).inspect}"
+    assert_equal [Foo], old_instance.observed_classes
   end
 
   test "tracks explicit observed model class" do
-    old_instance = FooObserver.new
-    assert !old_instance.send(:observed_classes).include?(ObservedModel), "ObservedModel in #{old_instance.send(:observed_classes).inspect}"
     FooObserver.observe ObservedModel
     instance = FooObserver.new
-    assert instance.send(:observed_classes).include?(ObservedModel), "ObservedModel not in #{instance.send(:observed_classes).inspect}"
+    assert_equal [ObservedModel], instance.observed_classes
   end
 
   test "tracks explicit observed model as string" do
-    old_instance = FooObserver.new
-    assert !old_instance.send(:observed_classes).include?(ObservedModel), "ObservedModel in #{old_instance.send(:observed_classes).inspect}"
     FooObserver.observe 'observed_model'
     instance = FooObserver.new
-    assert instance.send(:observed_classes).include?(ObservedModel), "ObservedModel not in #{instance.send(:observed_classes).inspect}"
+    assert_equal [ObservedModel], instance.observed_classes
   end
 
   test "tracks explicit observed model as symbol" do
-    old_instance = FooObserver.new
-    assert !old_instance.send(:observed_classes).include?(ObservedModel), "ObservedModel in #{old_instance.send(:observed_classes).inspect}"
     FooObserver.observe :observed_model
     instance = FooObserver.new
-    assert instance.send(:observed_classes).include?(ObservedModel), "ObservedModel not in #{instance.send(:observed_classes).inspect}"
+    assert_equal [ObservedModel], instance.observed_classes
   end
 
   test "calls existing observer event" do