mongoid 9.0.11 → 9.1.0

data/spec/mongoid/clients/transactions_spec.rb

@@ -1,27 +1,21 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "spec_helper"
-require_relative './transactions_spec_models'
+require 'spec_helper'
+require_relative 'transactions_spec_models'
 
 def capture_exception
   e = nil
   begin
     yield
-  rescue => ex
-    e = ex
+  rescue StandardError => e
+    e = e
   end
   e
 end
 
 describe Mongoid::Clients::Sessions do
   before(:all) do
-    if Gem::Version.new(Mongo::VERSION) < Gem::Version.new('2.6')
-      skip 'Driver does not support transactions'
-    end
-  end
-
-  before(:all) do
+    skip 'Driver does not support transactions' if Gem::Version.new(Mongo::VERSION) < Gem::Version.new('2.6')
     if Gem::Version.new(Mongo::VERSION) >= Gem::Version.new('2.6')
       CONFIG[:clients][:other] = CONFIG[:clients][:default].dup
       CONFIG[:clients][:other][:database] = 'other'
@@ -61,11 +55,10 @@ describe Mongoid::Clients::Sessions do
   end
 
   let(:other_events) do
-    subscriber.started_events.reject { |event| ['insert', 'update'].include?(event.command_name) }
+    subscriber.started_events.reject { |event| %w[insert update].include?(event.command_name) }
   end
 
   context 'when a transaction is used on a model class' do
-
     context 'when transactions are supported' do
       require_transaction_support
 
@@ -205,8 +198,8 @@ describe Mongoid::Clients::Sessions do
               expect(Person.count).to be(2)
               expect(Post.count).to be(1)
               expect(insert_events_txn_numbers.size).to eq(2)
-              expect(other_events.count { |e| e.command_name == 'abortTransaction'}).to be(0)
-              expect(other_events.count { |e| e.command_name == 'commitTransaction'}).to be(1)
+              expect(other_events.count { |e| e.command_name == 'abortTransaction' }).to be(0)
+              expect(other_events.count { |e| e.command_name == 'commitTransaction' }).to be(1)
             end
           end
 
@@ -298,7 +291,7 @@ describe Mongoid::Clients::Sessions do
 
               expect do
                 p.reload
-              end.to_not raise_error
+              end.not_to raise_error
 
               expect(c.palette).to eq(p)
 
@@ -310,14 +303,13 @@ describe Mongoid::Clients::Sessions do
         context 'using #transaction' do
           it 'does not raise an error and has the correct document' do
             Canvas.transaction do
-
               p = Palette.new
               c = Canvas.new(palette: p)
               c.save!
 
               expect do
                 p.reload
-              end.to_not raise_error
+              end.not_to raise_error
 
               expect(c.palette).to eq(p)
             end
@@ -340,8 +332,8 @@ describe Mongoid::Clients::Sessions do
         end
 
         it 'aborts the transaction' do
-          expect(other_events.count { |e| e.command_name == 'abortTransaction'}).to be(1)
-          expect(other_events.count { |e| e.command_name == 'commitTransaction'}).to be(0)
+          expect(other_events.count { |e| e.command_name == 'abortTransaction' }).to be(1)
+          expect(other_events.count { |e| e.command_name == 'commitTransaction' }).to be(0)
         end
       end
     end
@@ -388,7 +380,7 @@ describe Mongoid::Clients::Sessions do
     context 'when transactions are not supported' do
       require_topology :single
 
-      it 'it raises a transactions not supported error' do
+      it 'raises a transactions not supported error' do
         expect do
           Person.transaction do
             Person.create!
@@ -399,7 +391,6 @@ describe Mongoid::Clients::Sessions do
   end
 
   context 'when a transaction is used on a model instance' do
-
     let!(:person) do
       Person.with(client: :other) do |klass|
         klass.create!
@@ -460,7 +451,6 @@ describe Mongoid::Clients::Sessions do
       end
 
       context 'when the operations in the transaction block are also on another class' do
-
         context 'when the other class uses the same client' do
           shared_examples 'it uses a single transaction number for all operations on the class' do
             it do
@@ -543,7 +533,7 @@ describe Mongoid::Clients::Sessions do
                   person.save!
                   person.posts << Post.create!
                 end
-              rescue => ex
+              rescue StandardError
               end
             end
 
@@ -600,7 +590,6 @@ describe Mongoid::Clients::Sessions do
               expect(update_events).to be_empty
             end
           end
-
         end
       end
 
@@ -620,8 +609,8 @@ describe Mongoid::Clients::Sessions do
         end
 
         it 'aborts the transaction' do
-          expect(other_events.count { |e| e.command_name == 'abortTransaction'}).to be(1)
-          expect(other_events.count { |e| e.command_name == 'commitTransaction'}).to be(0)
+          expect(other_events.count { |e| e.command_name == 'abortTransaction' }).to be(1)
+          expect(other_events.count { |e| e.command_name == 'commitTransaction' }).to be(0)
         end
       end
     end
@@ -683,7 +672,7 @@ describe Mongoid::Clients::Sessions do
     context 'when transactions are not supported' do
       require_topology :single
 
-      it 'it raises a transactions not supported error' do
+      it 'raises a transactions not supported error' do
         expect do
           Person.transaction do
             Person.create!
@@ -722,9 +711,9 @@ describe Mongoid::Clients::Sessions do
           end
         end
 
-        it 'commits the transacrion' do
-          expect(other_events.count { |e| e.command_name == 'abortTransaction'}).to be(0)
-          expect(other_events.count { |e| e.command_name == 'commitTransaction'}).to be(1)
+        it 'commits the transaction' do
+          expect(other_events.count { |e| e.command_name == 'abortTransaction' }).to be(0)
+          expect(other_events.count { |e| e.command_name == 'commitTransaction' }).to be(1)
         end
 
         it 'returns the value from the block' do
@@ -747,8 +736,8 @@ describe Mongoid::Clients::Sessions do
         end
 
         it 'aborts the transaction' do
-          expect(other_events.count { |e| e.command_name == 'abortTransaction'}).to be(1)
-          expect(other_events.count { |e| e.command_name == 'commitTransaction'}).to be(0)
+          expect(other_events.count { |e| e.command_name == 'abortTransaction' }).to be(1)
+          expect(other_events.count { |e| e.command_name == 'commitTransaction' }).to be(0)
         end
 
         it 'passes on the error' do
@@ -1174,14 +1163,12 @@ describe Mongoid::Clients::Sessions do
 
           context 'when modified once' do
             before do
-              begin
-                subject.transaction do
-                  subject.name = 'Austin Powers'
-                  subject.save!
-                  raise 'Something went wrong'
-                end
-              rescue RuntimeError
+              subject.transaction do
+                subject.name = 'Austin Powers'
+                subject.save!
+                raise 'Something went wrong'
               end
+            rescue RuntimeError
             end
 
             it_behaves_like 'rollback callbacks are called'
@@ -1208,12 +1195,10 @@ describe Mongoid::Clients::Sessions do
               end
 
               before do
-                begin
-                  subject.transaction do
-                    subject.save!
-                  end
-                rescue RuntimeError
+                subject.transaction do
+                  subject.save!
                 end
+              rescue RuntimeError
               end
 
               it 'does not call any transaction callbacks' do
@@ -1229,12 +1214,10 @@ describe Mongoid::Clients::Sessions do
               end
 
               before do
-                begin
-                  subject.transaction do
-                    subject.save!
-                  end
-                rescue RuntimeError
+                subject.transaction do
+                  subject.save!
                 end
+              rescue RuntimeError
               end
 
               it_behaves_like 'rollback callbacks are called'

data/spec/mongoid/clients/transactions_spec_models.rb

@@ -1,4 +1,3 @@
-# rubocop:todo all
 class TransactionsSpecCounter
   def initialize
     @called = 0
@@ -194,7 +193,7 @@ class TransactionSpecRaisesBeforeSave
   field :attr, type: String
 
   before_save do
-    raise "I cannot be saved"
+    raise 'I cannot be saved'
   end
 
   after_commit do
@@ -213,7 +212,7 @@ class TransactionSpecRaisesAfterSave
   field :attr, type: String
 
   after_save do
-    raise "I cannot be saved"
+    raise 'I cannot be saved'
   end
 
   after_commit do
@@ -239,7 +238,7 @@ class TransactionSpecRaisesBeforeCreate
   field :attr, type: String
 
   before_create do
-    raise "I cannot be saved"
+    raise 'I cannot be saved'
   end
 
   after_commit do