mongoid 3.1.6 → 4.0.2

data/spec/mongoid/fields/standard_spec.rb

@@ -9,7 +9,7 @@ describe Mongoid::Fields::Standard do
     end
 
     it "returns false" do
-      field.should_not be_lazy
+      expect(field).to_not be_lazy
     end
   end
 
@@ -42,7 +42,7 @@ describe Mongoid::Fields::Standard do
           end
 
           it "returns true" do
-            field.should be_pre_processed
+            expect(field).to be_pre_processed
           end
         end
 
@@ -58,7 +58,7 @@ describe Mongoid::Fields::Standard do
           end
 
           it "returns false" do
-            field.should_not be_pre_processed
+            expect(field).to_not be_pre_processed
           end
         end
       end
@@ -75,7 +75,7 @@ describe Mongoid::Fields::Standard do
         end
 
         it "returns true" do
-          field.should be_pre_processed
+          expect(field).to be_pre_processed
         end
       end
     end
@@ -90,7 +90,7 @@ describe Mongoid::Fields::Standard do
       end
 
       it "returns false" do
-        field.should_not be_pre_processed
+        expect(field).to_not be_pre_processed
       end
     end
   end
@@ -102,7 +102,7 @@ describe Mongoid::Fields::Standard do
     end
 
     it "does not conflict with the ruby core hash" do
-      image.hash_is_hash.should be_true
+      expect(image.hash_is_hash).to be true
     end
   end
 
@@ -119,14 +119,14 @@ describe Mongoid::Fields::Standard do
       end
 
       it "allows normal hash access" do
-        hash[:key].should eq("value")
+        expect(hash[:key]).to eq("value")
       end
     end
 
     context "when getting a non existant value" do
 
       it "returns nil" do
-        hash[:key].should be_nil
+        expect(hash[:key]).to be_nil
       end
     end
   end
@@ -138,11 +138,11 @@ describe Mongoid::Fields::Standard do
     end
 
     it "inherits the parents deserialize method" do
-      Thumbnail.demongoize("testy").name.should eq("testy")
+      expect(Thumbnail.demongoize("testy").name).to eq("testy")
     end
 
     it "inherits the parents serialize method" do
-      thumbnail.mongoize.should eq("test")
+      expect(thumbnail.mongoize).to eq("test")
     end
 
     context "when instantiating the class" do
@@ -155,11 +155,11 @@ describe Mongoid::Fields::Standard do
       end
 
       it "deserializes the parent type" do
-        movie.poster.name.should eq("poster")
+        expect(movie.poster.name).to eq("poster")
       end
 
       it "deserializes the child type" do
-        movie.poster_thumb.name.should eq("thumb")
+        expect(movie.poster_thumb.name).to eq("thumb")
       end
     end
   end

data/spec/mongoid/fields_spec.rb

@@ -31,10 +31,14 @@ describe Mongoid::Fields do
         end
 
         it "returns all the translations" do
-          translations.should eq(
+          expect(translations).to eq(
             { "en" => "test", "de" => "The best" }
           )
         end
+
+        it "returns translations as a HashWithIndifferentAccess" do
+          expect(translations[:en]).to eq("test")
+        end
       end
 
       context "when translations do not exist" do
@@ -42,25 +46,33 @@ describe Mongoid::Fields do
         context "when no default is provided" do
 
           it "returns an empty hash" do
-            product.description_translations.should be_empty
+            expect(product.description_translations).to be_empty
           end
         end
 
         context "when a default is provided" do
 
           it "returns the translations with the default" do
-            product.name_translations.should eq(
+            expect(product.name_translations).to eq(
               { "en" => "no translation" }
             )
           end
         end
       end
+
+      it "should have alias method #\{field}_t" do
+        expect(product.method(:name_t)).to eq product.method(:name_translations)
+      end
     end
 
     context "when the field is not localized" do
 
       it "does not respond to the method" do
-        product.should_not respond_to(:price_translations)
+        expect(product).to_not respond_to(:price_translations)
+      end
+
+      it "does not respond to the alias method" do
+        expect(product).to_not respond_to(:price_t)
       end
     end
   end
@@ -88,7 +100,7 @@ describe Mongoid::Fields do
         end
 
         it "sets the raw values of the translations" do
-          product.description_translations.should eq(translations)
+          expect(product.description_translations).to eq(translations)
         end
 
         context "when saving the new translations" do
@@ -98,7 +110,7 @@ describe Mongoid::Fields do
           end
 
           it "persists the changes" do
-            product.reload.description_translations.should eq(translations)
+            expect(product.reload.description_translations).to eq(translations)
           end
 
           context "when updating the translations" do
@@ -109,7 +121,7 @@ describe Mongoid::Fields do
             end
 
             it "persists the changes" do
-              product.reload.description_translations.should eq(
+              expect(product.reload.description_translations).to eq(
                 { "en" => "overwritten" }
               )
             end
@@ -128,7 +140,7 @@ describe Mongoid::Fields do
         end
 
         it "sets the mongoized values of the translations" do
-          dictionary.description_translations.should eq(
+          expect(dictionary.description_translations).to eq(
             { "en" => "1", "de" => "2" }
           )
         end
@@ -140,7 +152,7 @@ describe Mongoid::Fields do
           end
 
           it "persists the changes" do
-            dictionary.reload.description_translations.should eq(
+            expect(dictionary.reload.description_translations).to eq(
               { "en" => "1", "de" => "2" }
             )
           end
@@ -153,19 +165,27 @@ describe Mongoid::Fields do
             end
 
             it "persists the changes" do
-              dictionary.reload.description_translations.should eq(
+              expect(dictionary.reload.description_translations).to eq(
                 { "en" => "overwritten" }
               )
             end
           end
         end
       end
+
+      it "should have alias method #\{field}_t=" do
+        expect(product.method(:name_t=)).to eq product.method(:name_translations=)
+      end
     end
 
     context "when the field is not localized" do
 
       it "does not respond to the method" do
-        product.should_not respond_to(:price_translations=)
+        expect(product).to_not respond_to(:price_translations=)
+      end
+
+      it "does not respond to the alias method" do
+        expect(product).to_not respond_to(:price_t=)
       end
     end
   end
@@ -179,7 +199,7 @@ describe Mongoid::Fields do
     context "when the document is subclassed" do
 
       it "does not include the child aliases" do
-        person.aliased_fields.keys.should_not include("spec")
+        expect(person.aliased_fields.keys).to_not include("spec")
       end
     end
   end
@@ -193,19 +213,19 @@ describe Mongoid::Fields do
       end
 
       it "includes the _id field" do
-        shape.attribute_names.should include("_id")
+        expect(shape.attribute_names).to include("_id")
       end
 
       it "includes the _type field" do
-        shape.attribute_names.should include("_type")
+        expect(shape.attribute_names).to include("_type")
       end
 
       it "includes its own fields" do
-        shape.attribute_names.should include("x")
+        expect(shape.attribute_names).to include("x")
       end
 
       it "does not return subclass fields" do
-        shape.attribute_names.should_not include("radius")
+        expect(shape.attribute_names).to_not include("radius")
       end
     end
 
@@ -216,23 +236,23 @@ describe Mongoid::Fields do
       end
 
       it "includes the _id field" do
-        circle.attribute_names.should include("_id")
+        expect(circle.attribute_names).to include("_id")
       end
 
       it "includes the _type field" do
-        circle.attribute_names.should include("_type")
+        expect(circle.attribute_names).to include("_type")
       end
 
       it "includes the first parent field" do
-        circle.attribute_names.should include("x")
+        expect(circle.attribute_names).to include("x")
       end
 
       it "includes the second parent field" do
-        circle.attribute_names.should include("y")
+        expect(circle.attribute_names).to include("y")
       end
 
       it "includes the child fields" do
-        circle.attribute_names.should include("radius")
+        expect(circle.attribute_names).to include("radius")
       end
     end
   end
@@ -242,42 +262,42 @@ describe Mongoid::Fields do
     context "when the class is a parent" do
 
       it "includes the _id field" do
-        Shape.attribute_names.should include("_id")
+        expect(Shape.attribute_names).to include("_id")
       end
 
       it "includes the _type field" do
-        Shape.attribute_names.should include("_type")
+        expect(Shape.attribute_names).to include("_type")
       end
 
       it "includes its own fields" do
-        Shape.attribute_names.should include("x")
+        expect(Shape.attribute_names).to include("x")
       end
 
       it "does not return subclass fields" do
-        Shape.attribute_names.should_not include("radius")
+        expect(Shape.attribute_names).to_not include("radius")
       end
     end
 
     context "when the class is a subclass" do
 
       it "includes the _id field" do
-        Circle.attribute_names.should include("_id")
+        expect(Circle.attribute_names).to include("_id")
       end
 
       it "includes the _type field" do
-        Circle.attribute_names.should include("_type")
+        expect(Circle.attribute_names).to include("_type")
       end
 
       it "includes the first parent field" do
-        Circle.attribute_names.should include("x")
+        expect(Circle.attribute_names).to include("x")
       end
 
       it "includes the second parent field" do
-        Circle.attribute_names.should include("y")
+        expect(Circle.attribute_names).to include("y")
       end
 
       it "includes the child fields" do
-        Circle.attribute_names.should include("radius")
+        expect(Circle.attribute_names).to include("radius")
       end
     end
   end
@@ -289,6 +309,92 @@ describe Mongoid::Fields do
       end
     end
 
+    context "when providing a root Boolean type" do
+
+      let(:klass) do
+        Class.new do
+          include Mongoid::Document
+        end
+      end
+
+      it "converts to Mongoid::Boolean" do
+        expect(klass.field(:test, type: Boolean).type).to be(Mongoid::Boolean)
+      end
+    end
+
+    context "when using symbol types" do
+
+      let(:klass) do
+        Class.new do
+          include Mongoid::Document
+        end
+      end
+
+      it "converts :array to Array" do
+        expect(klass.field(:test, type: :array).type).to be(Array)
+      end
+
+      it "converts :big_decimal to BigDecimal" do
+        expect(klass.field(:test, type: :big_decimal).type).to be(BigDecimal)
+      end
+
+      it "converts :binary to BSON::Binary" do
+        expect(klass.field(:test, type: :binary).type).to be(BSON::Binary)
+      end
+
+      it "converts :boolean to Mongoid::Boolean" do
+        expect(klass.field(:test, type: :boolean).type).to be(Mongoid::Boolean)
+      end
+
+      it "converts :date to Date" do
+        expect(klass.field(:test, type: :date).type).to be(Date)
+      end
+
+      it "converts :date_time to DateTime" do
+        expect(klass.field(:test, type: :date_time).type).to be(DateTime)
+      end
+
+      it "converts :float to Float" do
+        expect(klass.field(:test, type: :float).type).to be(Float)
+      end
+
+      it "converts :hash to Hash" do
+        expect(klass.field(:test, type: :hash).type).to be(Hash)
+      end
+
+      it "converts :integer to Integer" do
+        expect(klass.field(:test, type: :integer).type).to be(Integer)
+      end
+
+      it "converts :object_id to BSON::ObjectId" do
+        expect(klass.field(:test, type: :object_id).type).to be(BSON::ObjectId)
+      end
+
+      it "converts :range to Range" do
+        expect(klass.field(:test, type: :range).type).to be(Range)
+      end
+
+      it "converts :regexp to Rexegp" do
+        expect(klass.field(:test, type: :regexp).type).to be(Regexp)
+      end
+
+      it "converts :set to Set" do
+        expect(klass.field(:test, type: :set).type).to be(Set)
+      end
+
+      it "converts :string to String" do
+        expect(klass.field(:test, type: :string).type).to be(String)
+      end
+
+      it "converts :symbol to Symbol" do
+        expect(klass.field(:test, type: :symbol).type).to be(Symbol)
+      end
+
+      it "converts :time to Time" do
+        expect(klass.field(:test, type: :time).type).to be(Time)
+      end
+    end
+
     context "when the options are valid" do
 
       context "when the options are all standard" do
@@ -302,7 +408,7 @@ describe Mongoid::Fields do
         end
 
         it "adds the field to the model" do
-          Band.fields["acceptable"].should_not be_nil
+          expect(Band.fields["acceptable"]).to_not be_nil
         end
       end
 
@@ -313,7 +419,7 @@ describe Mongoid::Fields do
         end
 
         it "adds the field to the model" do
-          Band.fields["acceptable"].should_not be_nil
+          expect(Band.fields["acceptable"]).to_not be_nil
         end
       end
     end
@@ -333,7 +439,7 @@ describe Mongoid::Fields do
     context "when the field is binary" do
 
       let(:binary) do
-        Moped::BSON::Binary.new(:md5, "testing")
+        BSON::Binary.new("testing", :md5)
       end
 
       let(:registry) do
@@ -341,7 +447,7 @@ describe Mongoid::Fields do
       end
 
       it "returns the binary data intact" do
-        registry.data.should eq(binary)
+        expect(registry.data).to eq(binary)
       end
     end
 
@@ -362,7 +468,7 @@ describe Mongoid::Fields do
         end
 
         it "returns the default locale value" do
-          description.should eq("The best")
+          expect(description).to eq("The best")
         end
       end
 
@@ -382,7 +488,7 @@ describe Mongoid::Fields do
         end
 
         it "returns the set locale value" do
-          description.should eq("The best")
+          expect(description).to eq("The best")
         end
       end
 
@@ -403,7 +509,7 @@ describe Mongoid::Fields do
         end
 
         it "returns the current locale value" do
-          description.should eq("Cheaper drinks")
+          expect(description).to eq("Cheaper drinks")
         end
       end
     end
@@ -417,7 +523,7 @@ describe Mongoid::Fields do
     context "when the attribute has not been assigned" do
 
       it "delgates to the getter" do
-        person.age_before_type_cast.should eq(person.age)
+        expect(person.age_before_type_cast).to eq(person.age)
       end
     end
 
@@ -425,7 +531,7 @@ describe Mongoid::Fields do
 
       it "returns the attribute before type cast" do
         person.age = "old"
-        person.age_before_type_cast.should eq("old")
+        expect(person.age_before_type_cast).to eq("old")
       end
     end
   end
@@ -436,10 +542,24 @@ describe Mongoid::Fields do
       Product.new
     end
 
+    context "when setting via the setter" do
+
+      it "returns the set value" do
+        expect(product.price = 10).to eq(10)
+      end
+    end
+
+    context "when setting via send" do
+
+      it "returns the set value" do
+        expect(product.send(:price=, 10)).to eq(10)
+      end
+    end
+
     context "when the field is binary" do
 
       let(:binary) do
-        Moped::BSON::Binary.new(:md5, "testing")
+        BSON::Binary.new("testing", :md5)
       end
 
       let(:registry) do
@@ -451,7 +571,7 @@ describe Mongoid::Fields do
       end
 
       it "returns the binary data intact" do
-        registry.data.should eq(binary)
+        expect(registry.data).to eq(binary)
       end
     end
 
@@ -470,7 +590,7 @@ describe Mongoid::Fields do
         end
 
         it "allows the set" do
-          product.stores.should be_nil
+          expect(product.stores).to be_nil
         end
       end
 
@@ -482,11 +602,11 @@ describe Mongoid::Fields do
         end
 
         it "allows the set of nil values" do
-          product.stores.should eq([ "kadewe", nil ])
+          expect(product.stores).to eq([ "kadewe", nil ])
         end
 
         it "persists the nil values" do
-          product.reload.stores.should eq([ "kadewe", nil ])
+          expect(product.reload.stores).to eq([ "kadewe", nil ])
         end
       end
 
@@ -498,11 +618,11 @@ describe Mongoid::Fields do
         end
 
         it "reverses the values" do
-          product.stores.should eq([ "karstadt", "kadewe" ])
+          expect(product.stores).to eq([ "karstadt", "kadewe" ])
         end
 
         it "persists the changes" do
-          product.reload.stores.should eq([ "karstadt", "kadewe" ])
+          expect(product.reload.stores).to eq([ "karstadt", "kadewe" ])
         end
       end
     end
@@ -520,7 +640,7 @@ describe Mongoid::Fields do
         end
 
         it "sets the value in the default locale" do
-          description.should eq({ "en" => "Cheap drinks" })
+          expect(description).to eq({ "en" => "Cheap drinks" })
         end
       end
 
@@ -540,7 +660,7 @@ describe Mongoid::Fields do
         end
 
         it "sets the value in the default locale" do
-          description.should eq({ "de" => "Cheaper drinks" })
+          expect(description).to eq({ "de" => "Cheaper drinks" })
         end
       end
 
@@ -561,7 +681,7 @@ describe Mongoid::Fields do
         end
 
         it "sets the value in both locales" do
-          description.should eq(
+          expect(description).to eq(
             { "de" => "Cheaper drinks", "en" => "Cheap drinks" }
           )
         end
@@ -584,7 +704,7 @@ describe Mongoid::Fields do
       context "when provided a default array" do
 
         before do
-          Person.field(:array_testing, type: Array, default: [])
+          Person.field(:array_testing, type: Array, default: [], overwrite: true)
         end
 
         after do
@@ -593,7 +713,7 @@ describe Mongoid::Fields do
         end
 
         it "returns an equal object of a different instance" do
-          person_one.array_testing.object_id.should_not eq(
+          expect(person_one.array_testing.object_id).to_not eq(
             person_two.array_testing.object_id
           )
         end
@@ -602,7 +722,7 @@ describe Mongoid::Fields do
       context "when provided a default hash" do
 
         before do
-          Person.field(:hash_testing, type: Hash, default: {})
+          Person.field(:hash_testing, type: Hash, default: {}, overwrite: true)
         end
 
         after do
@@ -610,7 +730,7 @@ describe Mongoid::Fields do
         end
 
         it "returns an equal object of a different instance" do
-          person_one.hash_testing.object_id.should_not eq(
+          expect(person_one.hash_testing.object_id).to_not eq(
             person_two.hash_testing.object_id
           )
         end
@@ -624,7 +744,8 @@ describe Mongoid::Fields do
             Person.field(
               :generated_testing,
               type: Float,
-              default: ->{ Time.now.to_f }
+              default: ->{ Time.now.to_f },
+              overwrite: true
             )
           end
 
@@ -634,7 +755,7 @@ describe Mongoid::Fields do
           end
 
           it "returns an equal object of a different instance" do
-            person_one.generated_testing.object_id.should_not eq(
+            expect(person_one.generated_testing.object_id).to_not eq(
               person_two.generated_testing.object_id
             )
           end
@@ -646,7 +767,8 @@ describe Mongoid::Fields do
             Person.field(
               :rank,
               type: Integer,
-              default: ->{ title? ? 1 : 2 }
+              default: ->{ title? ? 1 : 2 },
+              overwrite: true
             )
           end
 
@@ -656,7 +778,7 @@ describe Mongoid::Fields do
           end
 
           it "yields the document to the proc" do
-            Person.new.rank.should eq(2)
+            expect(Person.new.rank).to eq(2)
           end
         end
       end
@@ -669,7 +791,7 @@ describe Mongoid::Fields do
       end
 
       it "does not return subclass defaults" do
-        shape.pre_processed_defaults.should eq([ "_id", "x", "y", "_type" ])
+        expect(shape.pre_processed_defaults).to eq([ "_id", "x", "y", "_type" ])
       end
     end
 
@@ -680,7 +802,7 @@ describe Mongoid::Fields do
       end
 
       it "has the parent and child defaults" do
-        circle.pre_processed_defaults.should eq([ "_id", "x", "y", "_type", "radius" ])
+        expect(circle.pre_processed_defaults).to eq([ "_id", "x", "y", "_type", "radius" ])
       end
     end
   end
@@ -688,21 +810,46 @@ describe Mongoid::Fields do
   describe ".field" do
 
     it "returns the generated field" do
-      Person.field(:testing).should equal Person.fields["testing"]
+      expect(Person.field(:testing)).to eq(Person.fields["testing"])
     end
 
     context "when the field name conflicts with mongoid's internals" do
 
-      context "when the field is named metadata" do
+      [:__metadata, :invalid].each do |meth|
+        context "when the field is named #{meth}" do
 
-        it "raises an error" do
-          expect {
-            Person.field(:metadata)
-          }.to raise_error(Mongoid::Errors::InvalidField)
+          it "raises an error" do
+            expect {
+              Person.field(meth)
+            }.to raise_error(Mongoid::Errors::InvalidField)
+          end
         end
       end
     end
 
+    context "when field already exist and validate_duplicate is enable" do
+
+      before do
+        Mongoid.duplicate_fields_exception = true
+      end
+
+      after do
+        Mongoid.duplicate_fields_exception = false
+      end
+
+      it "raises an error" do
+        expect {
+          Person.field(:title)
+        }.to raise_error(Mongoid::Errors::InvalidField)
+      end
+
+      it "doesn't raise an error" do
+        expect {
+          Class.new(Person)
+        }.to_not raise_error
+      end
+    end
+
     context "when the field is a time" do
 
       let!(:time) do
@@ -724,7 +871,7 @@ describe Mongoid::Fields do
         end
 
         it "performs the necessary time conversions" do
-          person.lunch_time.to_s.should eq(time.getlocal.to_s)
+          expect(person.lunch_time.to_s).to eq(time.getlocal.to_s)
         end
       end
     end
@@ -732,7 +879,7 @@ describe Mongoid::Fields do
     context "when providing no options" do
 
       before do
-        Person.field(:testing)
+        Person.field(:testing, overwrite: true)
       end
 
       let(:person) do
@@ -740,15 +887,15 @@ describe Mongoid::Fields do
       end
 
       it "adds a reader for the fields defined" do
-        person.testing.should eq("Test")
+        expect(person.testing).to eq("Test")
       end
 
       it "adds a writer for the fields defined" do
-        (person.testing = "Testy").should eq("Testy")
+        (person.testing = expect("Testy")).to eq("Testy")
       end
 
       it "adds an existance method" do
-        Person.new.testing?.should be_false
+        expect(Person.new.testing?).to be false
       end
 
       context "when overwriting an existing field" do
@@ -765,7 +912,7 @@ describe Mongoid::Fields do
         end
 
         it "properly overwrites the method" do
-          person.testing_override_called.should be_true
+          expect(person.testing_override_called).to be true
         end
       end
     end
@@ -777,7 +924,7 @@ describe Mongoid::Fields do
       end
 
       it "returns the given value" do
-        bob.reading.should eq(10.023)
+        expect(bob.reading).to eq(10.023)
       end
     end
 
@@ -788,7 +935,7 @@ describe Mongoid::Fields do
       end
 
       it "adds an accessor method with a question mark" do
-        person.terms?.should be_true
+        expect(person.terms?).to be true
       end
     end
 
@@ -799,39 +946,39 @@ describe Mongoid::Fields do
       end
 
       before do
-        Person.field :aliased, as: :alias, type: Boolean
+        Person.field :aliased, as: :alias, type: Boolean, overwrite: true
       end
 
       it "uses the alias to write the attribute" do
-        (person.alias = true).should be_true
+        (person.alias = expect(true)).to be true
       end
 
       it "uses the alias to read the attribute" do
-        person.alias.should be_true
+        expect(person.alias).to be true
       end
 
       it "uses the alias for the query method" do
-        person.should be_alias
+        expect(person).to be_alias
       end
 
       it "uses the name to write the attribute" do
-        (person.aliased = true).should be_true
+        (person.aliased = expect(true)).to be true
       end
 
       it "uses the name to read the attribute" do
-        person.aliased.should be_true
+        expect(person.aliased).to be true
       end
 
       it "uses the name for the query method" do
-        person.should be_aliased
+        expect(person).to be_aliased
       end
 
       it "creates dirty methods for the name" do
-        person.should respond_to(:aliased_changed?)
+        expect(person).to respond_to(:aliased_changed?)
       end
 
       it "creates dirty methods for the alias" do
-        person.should respond_to(:alias_changed?)
+        expect(person).to respond_to(:alias_changed?)
       end
 
       context "when changing the name" do
@@ -841,11 +988,11 @@ describe Mongoid::Fields do
         end
 
         it "sets name_changed?" do
-          person.aliased_changed?.should be_true
+          expect(person.aliased_changed?).to be true
         end
 
         it "sets alias_changed?" do
-          person.alias_changed?.should be_true
+          expect(person.alias_changed?).to be true
         end
       end
 
@@ -856,11 +1003,11 @@ describe Mongoid::Fields do
         end
 
         it "sets name_changed?" do
-          person.aliased_changed?.should be_true
+          expect(person.aliased_changed?).to be true
         end
 
         it "sets alias_changed?" do
-          person.alias_changed?.should be_true
+          expect(person.alias_changed?).to be true
         end
       end
 
@@ -871,7 +1018,7 @@ describe Mongoid::Fields do
         end
 
         it "properly serializes the aliased field" do
-          criteria.selector.should eq({ "aliased" => true })
+          expect(criteria.selector).to eq({ "aliased" => true })
         end
       end
     end
@@ -889,44 +1036,24 @@ describe Mongoid::Fields do
       context "when option is provided" do
 
         it "calls the handler with the model" do
-          handler.should_receive(:call).with do |model,_,_|
-            model.should eql User
-          end
-
-          User.field :custom, option: true
-        end
-
-        it "calls the handler with the field" do
-          handler.should_receive(:call).with do |_,field,_|
-            field.should eql User.fields["custom"]
-          end
-
-          User.field :custom, option: true
-        end
-
-        it "calls the handler with the option value" do
-          handler.should_receive(:call).with do |_,_,value|
-            value.should eql true
-          end
-
-          User.field :custom, option: true
+          User.field :custom, option: true, overwrite: true
+          expect(User.fields["custom"].options[:option]).to be_truthy
         end
       end
 
       context "when option is nil" do
 
         it "calls the handler" do
-          handler.should_receive(:call)
-          User.field :custom, option: nil
+          expect(handler).to receive(:call)
+          User.field :custom, option: nil, overwrite: true
         end
       end
 
       context "when option is not provided" do
 
         it "does not call the handler" do
-          handler.should_receive(:call).never
-
-          User.field :custom
+          expect(handler).to receive(:call).never
+          User.field :custom, overwrite: true
         end
       end
     end
@@ -941,11 +1068,11 @@ describe Mongoid::Fields do
       end
 
       it "includes its own fields" do
-        shape.fields.keys.should include("x")
+        expect(shape.fields.keys).to include("x")
       end
 
       it "does not return subclass fields" do
-        shape.fields.keys.should_not include("radius")
+        expect(shape.fields.keys).to_not include("radius")
       end
     end
 
@@ -956,15 +1083,15 @@ describe Mongoid::Fields do
       end
 
       it "includes the first parent field" do
-        circle.fields.keys.should include("x")
+        expect(circle.fields.keys).to include("x")
       end
 
       it "includes the second parent field" do
-        circle.fields.keys.should include("y")
+        expect(circle.fields.keys).to include("y")
       end
 
       it "includes the child fields" do
-        circle.fields.keys.should include("radius")
+        expect(circle.fields.keys).to include("radius")
       end
     end
   end
@@ -972,7 +1099,7 @@ describe Mongoid::Fields do
   describe ".replace_field" do
 
     let!(:original) do
-      Person.field(:id_test, type: Moped::BSON::ObjectId, label: "id")
+      Person.field(:id_test, type: BSON::ObjectId, label: "id")
     end
 
     let!(:altered) do
@@ -988,11 +1115,11 @@ describe Mongoid::Fields do
     end
 
     it "sets the new type on the field" do
-      new_field.type.should eq(String)
+      expect(new_field.type).to eq(String)
     end
 
     it "keeps the options from the old field" do
-      new_field.options[:label].should eq("id")
+      expect(new_field.options[:label]).to eq("id")
     end
   end
 
@@ -1009,7 +1136,7 @@ describe Mongoid::Fields do
       end
 
       it "resets the fields" do
-        fields.keys.should include("user_id")
+        expect(fields.keys).to include("user_id")
       end
     end
 
@@ -1020,7 +1147,7 @@ describe Mongoid::Fields do
       end
 
       it "resets the fields" do
-        fields.keys.should include("user_id")
+        expect(fields.keys).to include("user_id")
       end
     end
   end
@@ -1032,88 +1159,7 @@ describe Mongoid::Fields do
     end
 
     it "sets the default value pre process" do
-      person.map_with_default.should eq({ "key" => "testing" })
-    end
-  end
-
-  context "when dealing with auto protection" do
-
-    context "when auto protect ids and types is true" do
-
-      context "when redefining as accessible" do
-
-        before do
-          Person.attr_accessible :id, :_id, :_type
-        end
-
-        after do
-          Person.attr_protected :id, :_id, :_type
-        end
-
-        let(:bson_id) do
-          Moped::BSON::ObjectId.new
-        end
-
-        it "allows mass assignment of id" do
-          Person.new(_id: bson_id).id.should eq(bson_id)
-        end
-
-        it "allows mass assignment of type" do
-          Person.new(_type: "Something")._type.should eq("Something")
-        end
-      end
-
-      context "when redefining as protected" do
-
-        before do
-          Person.attr_protected :id, :_id, :_type
-        end
-
-        let(:bson_id) do
-          Moped::BSON::ObjectId.new
-        end
-
-        it "protects assignment of id" do
-          Person.new(_id: bson_id).id.should_not eq(bson_id)
-        end
-
-        it "protects assignment of type" do
-          Person.new(_type: "Something")._type.should_not eq("Something")
-        end
-      end
-    end
-
-    context "when auto protecting ids and types is false" do
-
-      before do
-        Mongoid.protect_sensitive_fields = false
-      end
-
-      after do
-        Mongoid.protect_sensitive_fields = true
-      end
-
-      let(:klass) do
-        Class.new do
-          include Mongoid::Document
-        end
-      end
-
-      let(:bson_id) do
-        Moped::BSON::ObjectId.new
-      end
-
-      let(:model) do
-        klass.new(id: bson_id, _type: "Model")
-      end
-
-      it "allows mass assignment of id" do
-        model.id.should eq(bson_id)
-      end
-
-      it "allows mass assignment of type" do
-        model._type.should eq("Model")
-      end
+      expect(person.map_with_default).to eq({ "key" => "testing" })
     end
   end
 
@@ -1134,11 +1180,11 @@ describe Mongoid::Fields do
       end
 
       it "properly persists as a string" do
-        band.attributes["sales"].should eq(decimal.to_s)
+        expect(band.attributes["sales"]).to eq(decimal.to_s)
       end
 
       it "returns the proper big decimal" do
-        band.sales.should eq(decimal)
+        expect(band.sales).to eq(decimal)
       end
     end
 
@@ -1149,11 +1195,11 @@ describe Mongoid::Fields do
       end
 
       it "properly persists as a string" do
-        band.attributes["sales"].should eq(decimal.to_s)
+        expect(band.attributes["sales"]).to eq(decimal.to_s)
       end
 
       it "returns the proper big decimal" do
-        band.sales.should eq(decimal)
+        expect(band.sales).to eq(decimal)
       end
     end
 
@@ -1164,11 +1210,11 @@ describe Mongoid::Fields do
       end
 
       it "properly persists as a string" do
-        band.attributes["sales"].should eq("1000000")
+        expect(band.attributes["sales"]).to eq("1000000")
       end
 
       it "returns the proper big decimal" do
-        band.sales.should eq(decimal)
+        expect(band.sales).to eq(decimal)
       end
     end
 
@@ -1179,11 +1225,11 @@ describe Mongoid::Fields do
       end
 
       it "properly persists as a string" do
-        band.attributes["sales"].should eq(decimal.to_s)
+        expect(band.attributes["sales"]).to eq(decimal.to_s)
       end
 
       it "returns the proper big decimal" do
-        band.sales.should eq(decimal)
+        expect(band.sales).to eq(decimal)
       end
     end
   end
@@ -1209,7 +1255,7 @@ describe Mongoid::Fields do
     end
 
     it "properly updates the hash" do
-      person.map.should eq(
+      expect(person.map).to eq(
         {
           "stack1" => [ 4, 3, 2, 1 ],
           "stack2" => [ 1, 2, 3, 4 ],
@@ -1219,7 +1265,7 @@ describe Mongoid::Fields do
     end
 
     it "persists the changes" do
-      person.reload.map.should eq(
+      expect(person.reload.map).to eq(
         {
           "stack1" => [ 4, 3, 2, 1 ],
           "stack2" => [ 1, 2, 3, 4 ],
@@ -1242,11 +1288,11 @@ describe Mongoid::Fields do
       end
 
       it "does not override the parent" do
-        canvas.foo.should eq("original")
+        expect(canvas.foo).to eq("original")
       end
 
       it "overrides the default" do
-        test.foo.should eq("overridden")
+        expect(test.foo).to eq("overridden")
       end
     end
   end