Merge pull request #14524 from tgxworld/fix_unsubscribe_from_notifica…

…tions Fix tests not unsubscribing from Notifications.
rails · Mar 29, 2014 · 0b33c06 · 0b33c06
2 parents 66b42a6 + 0212a41
commit 0b33c06
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb
@@ -4,12 +4,12 @@ class MysqlConnectionTest < ActiveRecord::TestCase
   def setup
     super
     @subscriber = SQLSubscriber.new
-    ActiveSupport::Notifications.subscribe('sql.active_record', @subscriber)
+    @subscription = ActiveSupport::Notifications.subscribe('sql.active_record', @subscriber)
     @connection = ActiveRecord::Base.connection
   end
 
   def teardown
-    ActiveSupport::Notifications.unsubscribe(@subscriber)
+    ActiveSupport::Notifications.unsubscribe(@subscription)
     super
   end
 

diff --git a/activerecord/test/cases/adapters/postgresql/connection_test.rb b/activerecord/test/cases/adapters/postgresql/connection_test.rb
@@ -8,12 +8,12 @@ class NonExistentTable < ActiveRecord::Base
     def setup
       super
       @subscriber = SQLSubscriber.new
-      ActiveSupport::Notifications.subscribe('sql.active_record', @subscriber)
+      @subscription = ActiveSupport::Notifications.subscribe('sql.active_record', @subscriber)
       @connection = ActiveRecord::Base.connection
     end
 
     def teardown
-      ActiveSupport::Notifications.unsubscribe(@subscriber)
+      ActiveSupport::Notifications.unsubscribe(@subscription)
       super
     end
 

diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -23,7 +23,7 @@ def setup
         eosql
 
         @subscriber = SQLSubscriber.new
-        ActiveSupport::Notifications.subscribe('sql.active_record', @subscriber)
+        @subscription = ActiveSupport::Notifications.subscribe('sql.active_record', @subscriber)
       end
 
       def test_bad_connection
@@ -70,7 +70,7 @@ def test_invalid_column
       end
 
       def teardown
-        ActiveSupport::Notifications.unsubscribe(@subscriber)
+        ActiveSupport::Notifications.unsubscribe(@subscription)
         super
       end
 

diff --git a/activerecord/test/cases/bind_parameter_test.rb b/activerecord/test/cases/bind_parameter_test.rb
@@ -20,13 +20,13 @@ def call(*args)
     def setup
       super
       @connection = ActiveRecord::Base.connection
-      @listener   = LogListener.new
+      @subscriber   = LogListener.new
       @pk         = Topic.columns.find { |c| c.primary }
-      ActiveSupport::Notifications.subscribe('sql.active_record', @listener)
+      @subscription = ActiveSupport::Notifications.subscribe('sql.active_record', @subscriber)
     end
 
     teardown do
-      ActiveSupport::Notifications.unsubscribe(@listener)
+      ActiveSupport::Notifications.unsubscribe(@subscription)
     end
 
     if ActiveRecord::Base.connection.supports_statement_cache?
@@ -37,7 +37,7 @@ def test_binds_are_logged
 
         @connection.exec_query(sql, 'SQL', binds)
 
-        message = @listener.calls.find { |args| args[4][:sql] == sql }
+        message = @subscriber.calls.find { |args| args[4][:sql] == sql }
         assert_equal binds, message[4][:binds]
       end
 
@@ -48,14 +48,14 @@ def test_binds_are_logged_after_type_cast
 
         @connection.exec_query(sql, 'SQL', binds)
 
-        message = @listener.calls.find { |args| args[4][:sql] == sql }
+        message = @subscriber.calls.find { |args| args[4][:sql] == sql }
         assert_equal [[@pk, 3]], message[4][:binds]
       end
 
       def test_find_one_uses_binds
         Topic.find(1)
         binds = [[@pk, 1]]
-        message = @listener.calls.find { |args| args[4][:binds] == binds }
+        message = @subscriber.calls.find { |args| args[4][:binds] == binds }
         assert message, 'expected a message with binds'
       end