public_activity 2.0.0 → 2.0.1

data/test/test_controller_integration.rb

@@ -11,31 +11,37 @@ describe PublicActivity::StoreController do
   it 'stores controller' do
     controller = StoringController.new
     PublicActivity.set_controller(controller)
-    controller.must_be_same_as Thread.current[:public_activity_controller]
-    controller.must_be_same_as PublicActivity.get_controller
+    assert_same controller, Thread.current[:public_activity_controller]
+    assert_same controller, PublicActivity.get_controller
   end
 
   it 'stores controller with a filter in controller' do
     controller = StoringController.new
-    controller._process_action_callbacks.select {|c| c.kind == :around}.map(&:filter).must_include :store_controller_for_public_activity
-    controller.instance_eval do
-      store_controller_for_public_activity do
-        controller.must_be_same_as PublicActivity.get_controller
+
+    callbacks = controller._process_action_callbacks.select { |c| c.kind == :around }.map(&:filter)
+    assert_includes(callbacks, :store_controller_for_public_activity)
+
+    public_activity_controller =
+      controller.instance_eval do
+        store_controller_for_public_activity do
+          PublicActivity.get_controller
+        end
       end
-    end
+
+    assert_equal controller, public_activity_controller
   end
 
   it 'stores controller in a threadsafe way' do
     PublicActivity.set_controller(1)
-    PublicActivity.get_controller.must_equal 1
+    assert_equal PublicActivity.get_controller, 1
 
-    Thread.new {
+    Thread.new do
       PublicActivity.set_controller(2)
       assert_equal 2, PublicActivity.get_controller
       PublicActivity.set_controller(nil)
-    }
+    end
 
-    PublicActivity.get_controller.must_equal 1
+    assert_equal PublicActivity.get_controller, 1
 
     PublicActivity.set_controller(nil)
   end

data/test/test_generators.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if ENV["PA_ORM"] == "active_record"
+if ENV['PA_ORM'] == 'active_record'
 
   require 'test_helper'
   require 'rails/generators/test_case'
@@ -9,23 +9,23 @@ if ENV["PA_ORM"] == "active_record"
 
   class TestMigrationGenerator < Rails::Generators::TestCase
     tests PublicActivity::Generators::MigrationGenerator
-    destination File.expand_path("../tmp", File.dirname(__FILE__))
+    destination File.expand_path('../tmp', File.dirname(__FILE__))
     setup :prepare_destination
 
     def test_generating_activity_model
       run_generator
-      assert_migration "db/migrate/create_activities.rb"
+      assert_migration 'db/migrate/create_activities.rb'
     end
   end
 
   class TestMigrationUpgradeGenerator < Rails::Generators::TestCase
     tests PublicActivity::Generators::MigrationUpgradeGenerator
-    destination File.expand_path("../tmp", File.dirname(__FILE__))
+    destination File.expand_path('../tmp', File.dirname(__FILE__))
     setup :prepare_destination
 
     def test_generating_activity_model
       run_generator
-      assert_migration "db/migrate/upgrade_activities.rb"
+      assert_migration 'db/migrate/upgrade_activities.rb'
     end
   end
 end

data/test/test_helper.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require "rubygems"
-require "bundler"
+require 'rubygems'
+require 'bundler'
 Bundler.setup(:default, :test)
 
 if ENV['COV']
   require 'simplecov'
   SimpleCov.start do
-    add_filter "/test/"
+    add_filter '/test/'
   end
 end
-$:.unshift File.expand_path('../../lib/', __FILE__)
+$:.unshift File.expand_path('../lib', __dir__)
 require 'active_support/testing/setup_and_teardown'
 require 'public_activity'
 require 'public_activity/testing'
@@ -26,13 +26,13 @@ when :active_record
   require 'active_record/connection_adapters/sqlite3_adapter'
   require 'stringio'        # silence the output
   $stdout = StringIO.new    # from migrator
-  ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+  ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
 
-  migrations_path = File.expand_path('../migrations', __FILE__)
-  active_record_version = ActiveRecord.version.release()
+  migrations_path = File.expand_path('migrations', __dir__)
+  active_record_version = ActiveRecord.version.release
 
   if active_record_version >= Gem::Version.new('6.0.0')
-    schema_path = File.expand_path("../tmp/schema.rb", File.dirname(__FILE__))
+    schema_path = File.expand_path('../tmp/schema.rb', File.dirname(__FILE__))
     ActiveRecord::MigrationContext.new(migrations_path, ActiveRecord::SchemaMigration).migrate
   elsif active_record_version >= Gem::Version.new('5.2.0')
     ActiveRecord::MigrationContext.new(migrations_path).migrate
@@ -43,33 +43,23 @@ when :active_record
   $stdout = STDOUT
 
   def article(options = {})
-    klass = Class.new(ActiveRecord::Base) do
+    Class.new(ActiveRecord::Base) do
       self.table_name = 'articles'
       include PublicActivity::Model
       tracked options
       belongs_to :user
 
       def self.name
-        "Article"
-      end
-
-      if ::ActiveRecord::VERSION::MAJOR < 4
-        attr_accessible :name, :published, :user
+        'Article'
       end
     end
-    klass
   end
-  class User < ActiveRecord::Base; end
 
-  if ::ActiveRecord::VERSION::MAJOR < 4
-    PublicActivity::Activity.class_eval do
-      attr_accessible :nonstandard
-    end
-  end
+  class User < ActiveRecord::Base; end
 when :mongoid
   require 'mongoid'
 
-  Mongoid.load!(File.expand_path("test/mongoid.yml"), :test)
+  Mongoid.load!(File.expand_path('test/mongoid.yml'), :test)
 
   class User
     include Mongoid::Document
@@ -106,7 +96,7 @@ when :mongoid
 when :mongo_mapper
   require 'mongo_mapper'
 
-  config = YAML.load(File.read("test/mongo_mapper.yml"))
+  config = YAML.load(File.read('test/mongo_mapper.yml'))
   MongoMapper.setup(config, :test)
 
   class User

data/test/test_testing.rb

@@ -1,36 +1,37 @@
 # frozen_string_literal: true
 
 require 'test_helper'
-describe PublicActivity do
 
-  describe "self.with_tracking" do
+describe PublicActivity do
+  describe 'self.with_tracking' do
     after do
       PublicActivity.enabled = true
     end
-    
-    it "enables tracking inside the block" do
+
+    it 'enables tracking inside the block' do
       PublicActivity.enabled = false
 
       PublicActivity.with_tracking do
-        PublicActivity.enabled?.must_equal true
+        assert PublicActivity.enabled?
       end
     end
 
-    it "restores previous `enabled` state" do
+    it 'restores previous `enabled` state' do
       PublicActivity.enabled = false
       PublicActivity.with_tracking do
         # something
       end
-      PublicActivity.enabled?.must_equal false
+
+      assert_equal PublicActivity.enabled?, false
     end
   end
 
-  describe "self.without_tracking" do
-    it "disables tracking inside the block" do
+  describe 'self.without_tracking' do
+    it 'disables tracking inside the block' do
       PublicActivity.enabled = true
 
       PublicActivity.without_tracking do
-        PublicActivity.enabled?.must_equal false
+        assert_equal PublicActivity.enabled?, false
       end
     end
   end