mongoid 9.0.11 → 9.1.1

data/spec/mongoid/errors/invalid_options_spec.rb

@@ -1,31 +1,28 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "spec_helper"
+require 'spec_helper'
 
 describe Mongoid::Errors::InvalidOptions do
-
-  describe "#message" do
-
+  describe '#message' do
     let(:error) do
       described_class.new(:name, :invalid, [ :valid ])
     end
 
-    it "contains the problem in the message" do
+    it 'contains the problem in the message' do
       expect(error.message).to include(
-        "Invalid option :invalid provided to association :name."
+        'Invalid option :invalid provided to association :name.'
       )
     end
 
-    it "contains the summary in the message" do
+    it 'contains the summary in the message' do
       expect(error.message).to include(
-        "Mongoid checks the options that are passed to the association macros"
+        'Mongoid checks the options that are passed to the association macros'
       )
     end
 
-    it "contains the resolution in the message" do
+    it 'contains the resolution in the message' do
       expect(error.message).to include(
-        "Valid options are: valid, make sure these are the ones you are using."
+        'Valid options are: valid, make sure these are the ones you are using.'
       )
     end
   end

data/spec/mongoid/errors/invalid_path_spec.rb

@@ -1,26 +1,23 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'spec_helper'
 
 describe Mongoid::Errors::InvalidPath do
-
-  describe "#message" do
-
+  describe '#message' do
     let(:error) do
       described_class.new(Address)
     end
 
-    it "contains the problem in the message" do
-      expect(error.message).to include("Having a root path assigned for Address")
+    it 'contains the problem in the message' do
+      expect(error.message).to include('Having a root path assigned for Address')
     end
 
-    it "contains the summary in the message" do
-      expect(error.message).to include("Mongoid has two different path objects")
+    it 'contains the summary in the message' do
+      expect(error.message).to include('Mongoid has two different path objects')
     end
 
-    it "contains the resolution in the message" do
-      expect(error.message).to include("Most likely your embedded model, Address")
+    it 'contains the resolution in the message' do
+      expect(error.message).to include('Most likely your embedded model, Address')
     end
   end
 end

data/spec/mongoid/errors/invalid_relation_spec.rb

@@ -1,40 +1,39 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "spec_helper"
+require 'spec_helper'
 
 describe Mongoid::Errors::InvalidRelation do
-
-  describe "#message" do
-
+  describe '#message' do
     module MyModule
-      def crazy_method; self; end
+      def crazy_method
+        self
+      end
     end
 
     before do
-      Object.send(:include, MyModule)
+      Object.include MyModule
     end
 
     let(:error) do
       described_class.new(Person, :crazy_method)
     end
 
-    it "contains the problem in the message" do
+    it 'contains the problem in the message' do
       expect(error.message).to include(
-                                   "Defining an association named 'crazy_method' is not allowed."
-                               )
+        "Defining an association named 'crazy_method' is not allowed."
+      )
     end
 
-    it "contains the summary in the message" do
+    it 'contains the summary in the message' do
       expect(error.message).to include(
-                                   "Defining this association would override the method 'crazy_method'"
-                               )
+        "Defining this association would override the method 'crazy_method'"
+      )
     end
 
-    it "contains the resolution in the message" do
+    it 'contains the resolution in the message' do
       expect(error.message).to include(
-                                   "Use Mongoid.destructive_fields to see what names are not allowed"
-                               )
+        'Use Mongoid.destructive_fields to see what names are not allowed'
+      )
     end
   end
 end

data/spec/mongoid/errors/invalid_scope_spec.rb

@@ -1,31 +1,28 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "spec_helper"
+require 'spec_helper'
 
 describe Mongoid::Errors::InvalidScope do
-
-  describe "#message" do
-
+  describe '#message' do
     let(:error) do
       described_class.new(Band, {})
     end
 
-    it "contains the problem in the message" do
+    it 'contains the problem in the message' do
       expect(error.message).to include(
-        "Defining a scope of value {} on Band is not allowed."
+        'Defining a scope of value {} on Band is not allowed.'
       )
     end
 
-    it "contains the summary in the message" do
+    it 'contains the summary in the message' do
       expect(error.message).to include(
-        "Scopes in Mongoid must be procs that wrap"
+        'Scopes in Mongoid must be procs that wrap'
       )
     end
 
-    it "contains the resolution in the message" do
+    it 'contains the resolution in the message' do
       expect(error.message).to include(
-        "Change the scope to be a proc wrapped criteria."
+        'Change the scope to be a proc wrapped criteria.'
       )
     end
   end

data/spec/mongoid/errors/invalid_set_polymorphic_relation_spec.rb

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "spec_helper"
+require 'spec_helper'
 
 describe Mongoid::Errors::InvalidSetPolymorphicRelation do
-
-  describe "#message" do
-
+  describe '#message' do
     let(:error) do
       described_class.new(:postable, Post, Person)
     end
 
-    it "contains the problem in the message" do
+    it 'contains the problem in the message' do
       expect(error.message).to include(
         "The postable attribute can't be set to an instance of Person"
       )

data/spec/mongoid/errors/invalid_storage_options_spec.rb

@@ -1,31 +1,28 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "spec_helper"
+require 'spec_helper'
 
 describe Mongoid::Errors::InvalidStorageOptions do
-
-  describe "#message" do
-
+  describe '#message' do
     let(:error) do
       described_class.new(Band, :bad_option)
     end
 
-    it "contains the problem in the message" do
+    it 'contains the problem in the message' do
       expect(error.message).to include(
-        "Invalid options passed to Band.store_in: bad_option."
+        'Invalid options passed to Band.store_in: bad_option.'
       )
     end
 
-    it "contains the summary in the message" do
+    it 'contains the summary in the message' do
       expect(error.message).to include(
-        "The :store_in macro takes only a hash of parameters with the"
+        'The :store_in macro takes only a hash of parameters with the'
       )
     end
 
-    it "contains the resolution in the message" do
+    it 'contains the resolution in the message' do
       expect(error.message).to include(
-        "Change the options passed to store_in to match the documented API"
+        'Change the options passed to store_in to match the documented API'
       )
     end
   end

data/spec/mongoid/errors/invalid_time_spec.rb

@@ -1,31 +1,28 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "spec_helper"
+require 'spec_helper'
 
 describe Mongoid::Errors::InvalidTime do
-
-  describe "#message" do
-
+  describe '#message' do
     let(:error) do
-      described_class.new("this is not a date")
+      described_class.new('this is not a date')
     end
 
-    it "contains the problem in the message" do
+    it 'contains the problem in the message' do
       expect(error.message).to include(
         "'this is not a date' is not a valid Time."
       )
     end
 
-    it "contains the summary in the message" do
+    it 'contains the summary in the message' do
       expect(error.message).to include(
-        "Mongoid tries to serialize the values for Date, DateTime, and Time"
+        'Mongoid tries to serialize the values for Date, DateTime, and Time'
       )
     end
 
-    it "contains the resolution in the message" do
+    it 'contains the resolution in the message' do
       expect(error.message).to include(
-        "Make sure to pass parsable values to the field setter for Date"
+        'Make sure to pass parsable values to the field setter for Date'
       )
     end
   end

data/spec/mongoid/errors/inverse_not_found_spec.rb

@@ -1,31 +1,28 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "spec_helper"
+require 'spec_helper'
 
 describe Mongoid::Errors::InverseNotFound do
-
-  describe "#message" do
-
+  describe '#message' do
     let(:error) do
-      described_class.new("Town", :citizens, "Person", :town_id)
+      described_class.new('Town', :citizens, 'Person', :town_id)
     end
 
-    it "contains the problem in the message" do
+    it 'contains the problem in the message' do
       expect(error.message).to include(
-        "When adding a(n) Person to Town#citizens, Mongoid could not"
+        'When adding a(n) Person to Town#citizens, Mongoid could not'
       )
     end
 
-    it "contains the summary in the message" do
+    it 'contains the summary in the message' do
       expect(error.message).to include(
-        "hen adding a document to an association, Mongoid attempts to link"
+        'hen adding a document to an association, Mongoid attempts to link'
       )
     end
 
-    it "contains the resolution in the message" do
+    it 'contains the resolution in the message' do
       expect(error.message).to include(
-        "If an inverse is not required, like a belongs_to or"
+        'If an inverse is not required, like a belongs_to or'
       )
     end
   end

data/spec/mongoid/errors/mixed_client_configuration_spec.rb

@@ -1,32 +1,60 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "spec_helper"
+require 'spec_helper'
 
 describe Mongoid::Errors::MixedClientConfiguration do
-
-  describe "#message" do
-
+  describe '#message' do
     let(:error) do
-      described_class.new(:testing, { uri: "blah" })
+      described_class.new(:testing, { uri: 'blah' })
     end
 
-    it "contains the problem in the message" do
+    it 'contains the problem in the message' do
       expect(error.message).to include(
-        "Both uri and standard configuration options defined"
+        'Both uri and standard configuration options defined'
       )
     end
 
-    it "contains the summary in the message" do
+    it 'contains the summary in the message' do
       expect(error.message).to include(
-        "Instead of simply giving uri or standard options a preference"
+        'Instead of simply giving uri or standard options a preference'
       )
     end
 
-    it "contains the resolution in the message" do
+    it 'contains the resolution in the message' do
       expect(error.message).to include(
-        "Provide either only a uri as configuration"
+        'Provide either only a uri as configuration'
       )
     end
+
+    context 'when the config contains sensitive values' do
+      let(:error) do
+        described_class.new(
+          :testing,
+          {
+            uri: 'mongodb://admin:s3cr3t@cluster.example.com/db',
+            password: 'standalone-secret',
+            options: {
+              auto_encryption_options: {
+                kms_providers: { local: { key: 'A' * 96 } }
+              }
+            }
+          }
+        )
+      end
+
+      it 'redacts the URI userinfo' do
+        expect(error.message).not_to include('admin:s3cr3t')
+        expect(error.message).to include('mongodb://[REDACTED]@cluster.example.com/db')
+      end
+
+      it 'redacts the standalone password value' do
+        expect(error.message).not_to include('standalone-secret')
+      end
+
+      it 'redacts auto_encryption_options entirely' do
+        expect(error.message).not_to include('kms_providers')
+        expect(error.message).not_to include('A' * 96)
+      end
+    end
   end
 end

data/spec/mongoid/errors/mixed_relations_spec.rb

@@ -1,31 +1,28 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "spec_helper"
+require 'spec_helper'
 
 describe Mongoid::Errors::MixedRelations do
-
-  describe "#message" do
-
+  describe '#message' do
     let(:error) do
       described_class.new(Post, Address)
     end
 
-    it "contains the problem in the message" do
+    it 'contains the problem in the message' do
       expect(error.message).to include(
-        "Referencing a(n) Address document from the Post document"
+        'Referencing a(n) Address document from the Post document'
       )
     end
 
-    it "contains the summary in the message" do
+    it 'contains the summary in the message' do
       expect(error.message).to include(
-        "In order to properly access a(n) Address from Post the reference"
+        'In order to properly access a(n) Address from Post the reference'
       )
     end
 
-    it "contains the resolution in the message" do
+    it 'contains the resolution in the message' do
       expect(error.message).to include(
-        "Consider not embedding Address, or do the key storage"
+        'Consider not embedding Address, or do the key storage'
       )
     end
   end

data/spec/mongoid/errors/mongoid_error_spec.rb

@@ -1,70 +1,67 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'spec_helper'
 
 describe Mongoid::Errors::MongoidError do
-
   let(:error) { described_class.new }
   let(:key) { :callbacks }
   let(:options) { {} }
 
   before do
-    {"message_title" => "message", "summary_title" => "summary", "resolution_title" => "resolution"}.each do |key, name|
-      expect(::I18n).to receive(:translate).with("mongoid.errors.messages.#{key}", **{}).and_return(name)
+    { 'message_title' => 'message', 'summary_title' => 'summary',
+      'resolution_title' => 'resolution' }.each do |key, name|
+      expect(I18n).to receive(:translate).with("mongoid.errors.messages.#{key}", **{}).and_return(name)
     end
 
-    ["message", "summary", "resolution"].each do |name|
-      expect(::I18n).to receive(:translate).
-        with("mongoid.errors.messages.#{key}.#{name}", **{}).
-        and_return(name)
+    %w[message summary resolution].each do |name|
+      expect(I18n).to receive(:translate)
+        .with("mongoid.errors.messages.#{key}.#{name}", **{})
+        .and_return(name)
     end
 
     error.compose_message(key, options)
   end
 
-  describe "#compose_message" do
-
-    it "sets ivar problem" do
+  describe '#compose_message' do
+    it 'sets ivar problem' do
       expect(error.problem).to be
     end
 
-    it "sets ivar summary" do
+    it 'sets ivar summary' do
       expect(error.summary).to be
     end
 
-    it "sets ivar resolution" do
+    it 'sets ivar resolution' do
       expect(error.resolution).to be
     end
 
-    it "sets ivar problem_title" do
+    it 'sets ivar problem_title' do
       expect(error.instance_variable_get(:@problem_title)).to be
     end
 
-    it "sets ivar summary_title" do
+    it 'sets ivar summary_title' do
       expect(error.instance_variable_get(:@summary_title)).to be
     end
 
-    it "sets ivar resolution_title" do
+    it 'sets ivar resolution_title' do
       expect(error.instance_variable_get(:@resolution_title)).to be
     end
   end
 
-  describe "#to_json" do
-
-    it "has problem" do
+  describe '#to_json' do
+    it 'has problem' do
       # @todo: uncomment if https://github.com/rails/rails/pull/24628 is merged
-      #expect(error.to_json).to include('"problem":"message"')
+      # expect(error.to_json).to include('"problem":"message"')
     end
 
-    it "has summary" do
+    it 'has summary' do
       # @todo: uncomment if https://github.com/rails/rails/pull/24628 is merged
-      #expect(error.to_json).to include('"summary":"summary"')
+      # expect(error.to_json).to include('"summary":"summary"')
     end
 
-    it "has resolution" do
+    it 'has resolution' do
       # @todo: uncomment if https://github.com/rails/rails/pull/24628 is merged
-      #expect(error.to_json).to include('"resolution":"resolution"')
+      # expect(error.to_json).to include('"resolution":"resolution"')
     end
   end
 end

data/spec/mongoid/errors/nested_attributes_metadata_not_found_spec.rb

@@ -1,29 +1,26 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "spec_helper"
+require 'spec_helper'
 
 describe Mongoid::Errors::NestedAttributesMetadataNotFound do
-
-  describe "#message" do
-
+  describe '#message' do
     let(:error) do
       described_class.new(Person, :posts)
     end
 
-    it "contains the problem in the message" do
+    it 'contains the problem in the message' do
       expect(error.message).to include(
         "Could not find metadata for association 'posts' on model: Person."
       )
     end
 
-    it "contains the summary in the message" do
+    it 'contains the summary in the message' do
       expect(error.message).to include(
-        "When defining nested attributes for an association, Mongoid needs"
+        'When defining nested attributes for an association, Mongoid needs'
       )
     end
 
-    it "contains the resolution in the message" do
+    it 'contains the resolution in the message' do
       expect(error.message).to include(
         "Make sure that there is an association defined named 'posts' on Person"
       )

data/spec/mongoid/errors/no_client_config_spec.rb

@@ -1,31 +1,28 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "spec_helper"
+require 'spec_helper'
 
 describe Mongoid::Errors::NoClientConfig do
-
-  describe "#message" do
-
+  describe '#message' do
     let(:error) do
       described_class.new(:analytics)
     end
 
-    it "contains the problem in the message" do
+    it 'contains the problem in the message' do
       expect(error.message).to include(
         "No configuration could be found for a client named 'analytics'."
       )
     end
 
-    it "contains the summary in the message" do
+    it 'contains the summary in the message' do
       expect(error.message).to include(
-        "When attempting to create the new client, Mongoid could not find a client"
+        'When attempting to create the new client, Mongoid could not find a client'
       )
     end
 
-    it "contains the resolution in the message" do
+    it 'contains the resolution in the message' do
       expect(error.message).to include(
-        "Double check your mongoid.yml to make sure under the clients"
+        'Double check your mongoid.yml to make sure under the clients'
       )
     end
   end