mongoid 7.3.4 → 7.4.1

data/spec/mongoid/clients/factory_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -37,6 +36,7 @@ describe Mongoid::Clients::Factory do
       context "when the configuration exists" do
 
         context "when the configuration is standard" do
+          restore_config_clients
 
           let(:config) do
             {
@@ -47,7 +47,6 @@ describe Mongoid::Clients::Factory do
 
           before do
             Mongoid::Config.send(:clients=, config)
-            # TODO: We should restore overwritten configuration in after block
           end
 
           after do
@@ -121,6 +120,7 @@ describe Mongoid::Clients::Factory do
         end
 
         context "when the configuration has no ports" do
+          restore_config_clients
 
           let(:config) do
             {
@@ -131,7 +131,6 @@ describe Mongoid::Clients::Factory do
 
           before do
             Mongoid::Config.send(:clients=, config)
-            # TODO: We should restore overwritten configuration in after block
           end
 
           after do
@@ -166,6 +165,7 @@ describe Mongoid::Clients::Factory do
         context "when configured via a uri" do
 
           context "when the uri has a single host:port" do
+            restore_config_clients
 
             let(:config) do
               {
@@ -176,7 +176,6 @@ describe Mongoid::Clients::Factory do
 
             before do
               Mongoid::Config.send(:clients=, config)
-              # TODO: We should restore overwritten configuration in after block
             end
 
             after do
@@ -205,6 +204,7 @@ describe Mongoid::Clients::Factory do
           end
 
           context "when the uri has multiple host:port pairs" do
+            restore_config_clients
 
             let(:config) do
               {
@@ -215,7 +215,6 @@ describe Mongoid::Clients::Factory do
 
             before do
               Mongoid::Config.send(:clients=, config)
-              # TODO: We should restore overwritten configuration in after block
             end
 
             after do
@@ -256,6 +255,7 @@ describe Mongoid::Clients::Factory do
     end
 
     context "when no name is provided" do
+      restore_config_clients
 
       let(:config) do
         { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
@@ -263,7 +263,6 @@ describe Mongoid::Clients::Factory do
 
       before do
         Mongoid::Config.send(:clients=, config)
-        # TODO: We should restore overwritten configuration in after block
       end
 
       after do
@@ -290,12 +289,12 @@ describe Mongoid::Clients::Factory do
     end
 
     context "when nil is provided and no default config" do
+      restore_config_clients
 
       let(:config) { nil }
 
       before do
         Mongoid.clients[:default] = nil
-        # TODO: We should restore overwritten configuration in after block
       end
 
       it "raises NoClientsConfig error" do
@@ -305,6 +304,7 @@ describe Mongoid::Clients::Factory do
   end
 
   describe ".default" do
+    restore_config_clients
 
     let(:config) do
       { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
@@ -312,7 +312,6 @@ describe Mongoid::Clients::Factory do
 
     before do
       Mongoid::Config.send(:clients=, config)
-      # TODO: We should restore overwritten configuration in after block
     end
 
     after do
@@ -339,6 +338,7 @@ describe Mongoid::Clients::Factory do
   end
 
   context "when options are provided with string keys" do
+    restore_config_clients
 
     let(:config) do
       {
@@ -355,7 +355,6 @@ describe Mongoid::Clients::Factory do
 
     before do
       Mongoid::Config.send(:clients=, config)
-      # TODO: We should restore overwritten configuration in after block
     end
 
     after do
@@ -394,6 +393,8 @@ describe Mongoid::Clients::Factory do
   end
 
   context "unexpected config options" do
+    restore_config_clients
+
     let(:unknown_opts) do
       {
         bad_one: 1,
@@ -411,11 +412,8 @@ describe Mongoid::Clients::Factory do
       }
     end
 
-    around(:each) do |example|
-      old_config = Mongoid::Config.clients
+    before do
       Mongoid::Config.send(:clients=, config)
-      example.run
-      Mongoid::Config.send(:clients=, old_config)
     end
 
     [:bad_one, :bad_two].each do |env|

data/spec/mongoid/clients/options_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -246,11 +245,11 @@ describe Mongoid::Clients::Options, retry: 3 do
             threads << Thread.new do
               if i % 2 == 0
                 NameOnly.with(collection: 'British') do |klass|
-                  klass.create(name: 'realised')
+                  klass.create!(name: 'realised')
                 end
               else
                 NameOnly.with(collection: 'American') do |klass|
-                  klass.create(name: 'realized')
+                  klass.create!(name: 'realized')
                 end
               end
             end
@@ -308,7 +307,7 @@ describe Mongoid::Clients::Options, retry: 3 do
       end
 
       let(:test_model) do
-        Minim.create
+        Minim.create!
       end
 
       let(:persistence_context) do
@@ -464,7 +463,7 @@ describe Mongoid::Clients::Options, retry: 3 do
         before do
           threads = []
           100.times do |i|
-            test_model = NameOnly.create
+            test_model = NameOnly.create!
             threads << Thread.new do
               if i % 2 == 0
                 test_model.with(collection: 'British') do |b|

data/spec/mongoid/clients/sessions_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -54,10 +53,10 @@ describe Mongoid::Clients::Sessions do
 
         let!(:last_use_diff) do
           Person.with_session do |session|
-            Person.create
-            Person.create
+            Person.create!
+            Person.create!
             last_use = session.instance_variable_get(:@server_session).last_use
-            Thread.new { Person.create }.value
+            Thread.new { Person.create! }.value
             session.instance_variable_get(:@server_session).last_use - last_use
           end
         end
@@ -76,8 +75,8 @@ describe Mongoid::Clients::Sessions do
 
         before do
           Person.with_session do
-            Person.create
-            Person.create
+            Person.create!
+            Person.create!
           end
         end
 
@@ -96,9 +95,9 @@ describe Mongoid::Clients::Sessions do
           before do
             Post.with(client: :other) do
               Person.with_session do
-                Person.create
-                Person.create
-                Post.create
+                Person.create!
+                Person.create!
+                Post.create!
               end
             end
           end
@@ -117,9 +116,9 @@ describe Mongoid::Clients::Sessions do
             e = nil
             begin
               Person.with_session do
-                Person.create
-                Person.create
-                Post.create
+                Person.create!
+                Person.create!
+                Post.create!
               end
             rescue => ex
                 e = ex
@@ -146,8 +145,8 @@ describe Mongoid::Clients::Sessions do
             begin
               Person.with_session do
                 Person.with_session do
-                  Person.create
-                  Post.create
+                  Person.create!
+                  Post.create!
                 end
               end
             rescue => ex
@@ -192,7 +191,7 @@ describe Mongoid::Clients::Sessions do
 
     let!(:person) do
       Person.with(client: :other) do |klass|
-        klass.create
+        klass.create!
       end
     end
 
@@ -213,9 +212,9 @@ describe Mongoid::Clients::Sessions do
         before do
           person.with_session do
             person.username = 'Emily'
-            person.save
+            person.save!
             person.age = 80
-            person.save
+            person.save!
           end
         end
 
@@ -236,8 +235,8 @@ describe Mongoid::Clients::Sessions do
             Post.with(client: :other) do
               person.with_session do
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
               end
             end
           end
@@ -262,8 +261,8 @@ describe Mongoid::Clients::Sessions do
             begin
               person.with_session do
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
               end
             rescue => ex
               e = ex
@@ -291,8 +290,8 @@ describe Mongoid::Clients::Sessions do
               person.with_session do
                 person.with_session do
                   person.username = 'Emily'
-                  person.save
-                  person.posts << Post.create
+                  person.save!
+                  person.posts << Post.create!
                 end
               end
             rescue => ex

data/spec/mongoid/clients/transactions_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -62,9 +61,12 @@ describe Mongoid::Clients::Sessions do
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
         Mongoid::Clients.with_name(:other).command(create: :people)
         Mongoid::Clients.with_name(:other).command(create: :posts)
+        Mongoid::Clients.with_name(:other).command(create: :canvases)
         subscriber.clear_events!
-        Person.with(client: :other) do
-          example.run
+        Canvas.with(client: :other) do
+          Person.with(client: :other) do
+            example.run
+          end
         end
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
       end
@@ -74,9 +76,9 @@ describe Mongoid::Clients::Sessions do
         let!(:last_use_diff) do
           Person.with_session do |s|
             s.start_transaction
-            Person.create
-            Person.create
-            Thread.new { Person.create }.value
+            Person.create!
+            Person.create!
+            Thread.new { Person.create! }.value
             s.commit_transaction
           end
         end
@@ -94,8 +96,8 @@ describe Mongoid::Clients::Sessions do
         before do
           Person.with_session do |s|
             s.start_transaction
-            Person.create
-            Person.create
+            Person.create!
+            Person.create!
             s.commit_transaction
           end
         end
@@ -115,9 +117,9 @@ describe Mongoid::Clients::Sessions do
             Post.with(client: :other) do
               Person.with_session do |s|
                 s.start_transaction
-                Person.create
-                Person.create
-                Post.create
+                Person.create!
+                Person.create!
+                Post.create!
                 s.commit_transaction
               end
             end
@@ -137,9 +139,9 @@ describe Mongoid::Clients::Sessions do
             begin
               Person.with_session do |s|
                 s.start_transaction
-                Person.create
-                Person.create
-                Post.create
+                Person.create!
+                Person.create!
+                Post.create!
                 s.commit_transaction
               end
             rescue => ex
@@ -169,8 +171,8 @@ describe Mongoid::Clients::Sessions do
               Person.with_session do |s|
                 s.start_transaction
                 s.start_transaction
-                Person.create
-                Post.create
+                Person.create!
+                Post.create!
                 s.commit_transaction
               end
             rescue => ex
@@ -190,6 +192,26 @@ describe Mongoid::Clients::Sessions do
           end
         end
       end
+
+      context 'When reloading an embedded document created inside a transaction' do
+        it 'does not raise an error and has the correct document' do
+          Canvas.with_session do |s|
+            s.start_transaction
+
+            p = Palette.new
+            c = Canvas.new(palette: p)
+            c.save!
+
+            expect do
+              p.reload
+            end.to_not raise_error
+
+            expect(c.palette).to eq(p)
+
+            s.commit_transaction
+          end
+        end
+      end
     end
 
     context 'when sessions are supported but transactions are not' do
@@ -202,7 +224,7 @@ describe Mongoid::Clients::Sessions do
         begin
           Person.with_session do |s|
             s.start_transaction
-            Person.create
+            Person.create!
             s.commit_transaction
           end
         rescue => ex
@@ -222,7 +244,7 @@ describe Mongoid::Clients::Sessions do
 
     let!(:person) do
       Person.with(client: :other) do |klass|
-        klass.create
+        klass.create!
       end
     end
 
@@ -246,9 +268,9 @@ describe Mongoid::Clients::Sessions do
           person.with_session do |s|
             s.start_transaction
             person.username = 'Emily'
-            person.save
+            person.save!
             person.age = 80
-            person.save
+            person.save!
             s.commit_transaction
           end
         end
@@ -270,8 +292,8 @@ describe Mongoid::Clients::Sessions do
               person.with_session do |s|
                 s.start_transaction
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
                 s.commit_transaction
               end
             end
@@ -296,8 +318,8 @@ describe Mongoid::Clients::Sessions do
               person.with_session do |s|
                 s.start_transaction
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
                 s.commit_transaction
               end
             rescue => ex
@@ -327,8 +349,8 @@ describe Mongoid::Clients::Sessions do
                 s.start_transaction
                 s.start_transaction
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
                 s.commit_transaction
               end
             rescue => ex
@@ -375,7 +397,7 @@ describe Mongoid::Clients::Sessions do
           person.with_session do |s|
             s.start_transaction
             person.username = 'Emily'
-            person.save
+            person.save!
             s.commit_transaction
           end
         rescue => ex

data/spec/mongoid/clients_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -792,11 +791,11 @@ describe Mongoid::Clients do
         end
       end
 
-      describe ".create" do
+      describe ".create!" do
 
         let!(:band) do
           Band.with(database: database_id_alt) do |klass|
-            klass.create
+            klass.create!
           end
         end
 
@@ -830,11 +829,11 @@ describe Mongoid::Clients do
 
     context "when sending operations to a different collection" do
 
-      describe ".create" do
+      describe ".create!" do
 
         let!(:band) do
           Band.with(collection: "artists") do |klass|
-            klass.create
+            klass.create!
           end
         end
 
@@ -945,7 +944,7 @@ describe Mongoid::Clients do
       describe ".save" do
 
         before do
-          Person.create(ssn: "432-97-1113")
+          Person.create!(ssn: "432-97-1113")
         end
 
         context "when a mongodb error occurs" do
@@ -1038,7 +1037,7 @@ describe Mongoid::Clients do
       end
 
       let!(:band) do
-        Band.create(name: "Tool")
+        Band.create!(name: "Tool")
       end
 
       it "persists to the overridden database" do

data/spec/mongoid/composable_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/config/environment_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -107,7 +106,7 @@ describe Mongoid::Config::Environment do
 
     context 'when file found' do
       before do
-        allow(File).to receive(:new).with('mongoid.yml').and_return(StringIO.new(file_contents))
+        allow(File).to receive(:read).with('mongoid.yml').and_return(file_contents)
       end
 
       let(:file_contents) do
@@ -163,5 +162,43 @@ describe Mongoid::Config::Environment do
         it { is_expected.to be_nil }
       end
     end
+
+    context 'when configuration includes schema map' do
+      paths = Dir.glob(File.join(File.dirname(__FILE__), '../../support/schema_maps/*.json'))
+
+      if paths.empty?
+        raise "Expected to find some schema maps"
+      end
+
+      before do
+        allow(File).to receive(:read).with('mongoid.yml').and_return(file_contents)
+      end
+
+      let(:file_contents) do
+        <<~FILE
+          test:
+            clients:
+              default:
+                database: mongoid_test
+                hosts: [localhost]
+                options:
+                  auto_encryption_options:
+                    schema_map: #{schema_map.to_yaml.sub(/\A---/, '').gsub(/\n/, "\n" + ' '*100)}
+        FILE
+      end
+
+      paths.each do |path|
+        context File.basename(path) do
+          let(:schema_map) do
+            BSON::ExtJSON.parse(File.read(path))
+          end
+
+          it 'loads successfully' do
+            subject.should be_a(Hash)
+            subject.fetch('clients').fetch('default').fetch('options').fetch('auto_encryption_options').fetch('schema_map').should be_a(Hash)
+          end
+        end
+      end
+    end
   end
 end

data/spec/mongoid/config/options_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"