mongoid 3.1.7 → 4.0.0.alpha1

data/spec/mongoid/relations/metadata_spec.rb

@@ -15,7 +15,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns false" do
-        metadata.should_not be_counter_cached
+        expect(metadata).to_not be_counter_cached
       end
     end
 
@@ -30,7 +30,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns true" do
-        metadata.should be_counter_cached
+        expect(metadata).to be_counter_cached
       end
     end
 
@@ -45,7 +45,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns true" do
-        metadata.should be_counter_cached
+        expect(metadata).to be_counter_cached
       end
     end
 
@@ -59,7 +59,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns false" do
-        metadata.should_not be_counter_cached
+        expect(metadata).to_not be_counter_cached
       end
     end
   end
@@ -104,7 +104,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns the name given" do
-        metadata.counter_cache_column_name.should eq(counter_cache_name)
+        expect(metadata.counter_cache_column_name).to eq(counter_cache_name)
       end
     end
   end
@@ -121,7 +121,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns true" do
-        metadata.should be_autobuilding
+        expect(metadata).to be_autobuilding
       end
     end
 
@@ -135,7 +135,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns false" do
-        metadata.should_not be_autobuilding
+        expect(metadata).to_not be_autobuilding
       end
     end
 
@@ -148,7 +148,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns false" do
-        metadata.should_not be_autobuilding
+        expect(metadata).to_not be_autobuilding
       end
     end
   end
@@ -160,16 +160,17 @@ describe Mongoid::Relations::Metadata do
     end
 
     let(:object) do
-      stub
+      double
     end
 
     let(:base) do
-      stub
+      double
     end
 
     it "returns the builder from the relation" do
-      metadata.builder(base, object).should
-      be_a_kind_of(Mongoid::Relations::Builders::Embedded::One)
+      expect(
+        metadata.builder(base, object)
+      ).to be_a_kind_of(Mongoid::Relations::Builders::Embedded::One)
     end
   end
 
@@ -185,7 +186,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns true" do
-        metadata.should be_cascading_callbacks
+        expect(metadata).to be_cascading_callbacks
       end
     end
 
@@ -199,7 +200,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns false" do
-        metadata.should_not be_cascading_callbacks
+        expect(metadata).to_not be_cascading_callbacks
       end
     end
 
@@ -212,7 +213,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns false" do
-        metadata.should_not be_cascading_callbacks
+        expect(metadata).to_not be_cascading_callbacks
       end
     end
   end
@@ -229,7 +230,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns nil" do
-        metadata.cascade_strategy.should be_nil
+        expect(metadata.cascade_strategy).to be_nil
       end
     end
 
@@ -244,7 +245,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns the delete strategy" do
-        metadata.cascade_strategy.should eq(
+        expect(metadata.cascade_strategy).to eq(
           Mongoid::Relations::Cascading::Delete
         )
       end
@@ -261,7 +262,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns the destroy strategy" do
-        metadata.cascade_strategy.should eq(
+        expect(metadata.cascade_strategy).to eq(
           Mongoid::Relations::Cascading::Destroy
         )
       end
@@ -278,7 +279,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns the nullify strategy" do
-        metadata.cascade_strategy.should eq(
+        expect(metadata.cascade_strategy).to eq(
           Mongoid::Relations::Cascading::Nullify
         )
       end
@@ -295,7 +296,7 @@ describe Mongoid::Relations::Metadata do
     end
 
     it "returns the constraint object" do
-      metadata.constraint.should be_a(Mongoid::Relations::Constraint)
+      expect(metadata.constraint).to be_a(Mongoid::Relations::Constraint)
     end
   end
 
@@ -319,7 +320,7 @@ describe Mongoid::Relations::Metadata do
 
     it "concatenates the result from #find_module and name.classify" do
       metadata.should_receive(:find_module).once.and_return("Fruit")
-      classified.should eq("Fruit::Name")
+      expect(classified).to eq("Fruit::Name")
     end
   end
 
@@ -348,7 +349,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns nil" do
-        mod.should be_nil
+        expect(mod).to be_nil
       end
     end
 
@@ -359,7 +360,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns nil" do
-        mod.should be_nil
+        expect(mod).to be_nil
       end
     end
 
@@ -378,7 +379,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "returns nil" do
-            mod.should be_nil
+            expect(mod).to be_nil
           end
         end
 
@@ -389,7 +390,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "returns root namespace" do
-            mod.should be_empty
+            expect(mod).to be_empty
           end
         end
 
@@ -406,7 +407,7 @@ describe Mongoid::Relations::Metadata do
             end
 
             it "returns Fruits" do
-              mod.should eq("Fruits")
+              expect(mod).to eq("Fruits")
             end
           end
 
@@ -421,7 +422,7 @@ describe Mongoid::Relations::Metadata do
             end
 
             it "returns Fruits" do
-              mod.should eq("Fruits")
+              expect(mod).to eq("Fruits")
             end
           end
 
@@ -436,7 +437,7 @@ describe Mongoid::Relations::Metadata do
             end
 
             it "returns nil" do
-              mod.should be_nil
+              expect(mod).to be_nil
             end
           end
         end
@@ -458,7 +459,7 @@ describe Mongoid::Relations::Metadata do
         end
 
         it "returns the stripped class name" do
-          metadata.class_name.should eq("Person")
+          expect(metadata.class_name).to eq("Person")
         end
       end
 
@@ -472,7 +473,7 @@ describe Mongoid::Relations::Metadata do
         end
 
         it "constantizes the class name" do
-          metadata.class_name.should eq("Person")
+          expect(metadata.class_name).to eq("Person")
         end
       end
     end
@@ -494,7 +495,7 @@ describe Mongoid::Relations::Metadata do
             end
 
             it "classifies and constantizes the association name and adds the module" do
-              metadata.class_name.should eq("Name")
+              expect(metadata.class_name).to eq("Name")
             end
           end
 
@@ -509,7 +510,7 @@ describe Mongoid::Relations::Metadata do
             end
 
             it "classifies and constantizes the association name and adds the module" do
-              metadata.class_name.should eq("Address")
+              expect(metadata.class_name).to eq("Address")
             end
           end
 
@@ -528,7 +529,7 @@ describe Mongoid::Relations::Metadata do
             end
 
             it "classifies and constantizes the association name and adds the module" do
-              metadata.class_name.should eq("Fruits::Apple")
+              expect(metadata.class_name).to eq("Fruits::Apple")
             end
           end
 
@@ -543,7 +544,7 @@ describe Mongoid::Relations::Metadata do
             end
 
             it "classifies and constantizes the association name and adds the module" do
-              metadata.class_name.should eq("Fruits::Apple")
+              expect(metadata.class_name).to eq("Fruits::Apple")
             end
           end
 
@@ -563,7 +564,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "classifies and constantizes the association name" do
-            metadata.class_name.should eq("Name")
+            expect(metadata.class_name).to eq("Name")
           end
         end
 
@@ -578,7 +579,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "classifies and constantizes the association name" do
-            metadata.class_name.should eq("Address")
+            expect(metadata.class_name).to eq("Address")
           end
         end
       end
@@ -597,7 +598,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns true" do
-        metadata.should be_destructive
+        expect(metadata).to be_destructive
       end
     end
 
@@ -610,7 +611,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns false" do
-        metadata.should_not be_destructive
+        expect(metadata).to_not be_destructive
       end
     end
   end
@@ -626,7 +627,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns true" do
-        metadata.should be_embedded
+        expect(metadata).to be_embedded
       end
     end
 
@@ -639,7 +640,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns false" do
-        metadata.should_not be_embedded
+        expect(metadata).to_not be_embedded
       end
     end
   end
@@ -654,7 +655,7 @@ describe Mongoid::Relations::Metadata do
     end
 
     it "returns the extend property" do
-      metadata.extension.should eq(:value)
+      expect(metadata.extension).to eq(:value)
     end
   end
 
@@ -670,7 +671,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns true" do
-        metadata.extension?.should be_true
+        expect(metadata.extension?).to be true
       end
     end
 
@@ -683,7 +684,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns false" do
-        metadata.extension?.should be_false
+        expect(metadata.extension?).to be false
       end
     end
   end
@@ -706,7 +707,7 @@ describe Mongoid::Relations::Metadata do
             end
 
             it "returns the foreign_key" do
-              metadata.foreign_key.should eq("person_id")
+              expect(metadata.foreign_key).to eq("person_id")
             end
           end
 
@@ -721,7 +722,7 @@ describe Mongoid::Relations::Metadata do
             end
 
             it "returns the foreign_key" do
-              metadata.foreign_key.should eq("person_id")
+              expect(metadata.foreign_key).to eq("person_id")
             end
           end
 
@@ -736,7 +737,7 @@ describe Mongoid::Relations::Metadata do
             end
 
             it "returns the foreign_key without the module name" do
-              metadata.foreign_key.should eq("apple_id")
+              expect(metadata.foreign_key).to eq("apple_id")
             end
           end
         end
@@ -751,7 +752,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "returns the foreign_key" do
-            metadata.foreign_key.should eq("person_ids")
+            expect(metadata.foreign_key).to eq("person_ids")
           end
 
           context "given a specific foreign key" do
@@ -765,7 +766,7 @@ describe Mongoid::Relations::Metadata do
             end
 
             it "returns the foreign_key" do
-              metadata.foreign_key.should eq("follower_list")
+              expect(metadata.foreign_key).to eq("follower_list")
             end
           end
 
@@ -780,7 +781,7 @@ describe Mongoid::Relations::Metadata do
             end
 
             it "returns the foreign_key" do
-              metadata.foreign_key.should eq("follower_ids")
+              expect(metadata.foreign_key).to eq("follower_ids")
             end
           end
 
@@ -796,11 +797,11 @@ describe Mongoid::Relations::Metadata do
             end
 
             it "returns the foreign_key without the module name" do
-              metadata.foreign_key.should eq("banana_ids")
+              expect(metadata.foreign_key).to eq("banana_ids")
             end
 
             it "returns the inverse_foreign_key without the module name" do
-              metadata.inverse_foreign_key.should eq("apple_ids")
+              expect(metadata.inverse_foreign_key).to eq("apple_ids")
             end
           end
         end
@@ -819,7 +820,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "returns the inverse foreign key" do
-            metadata.foreign_key.should eq("person_id")
+            expect(metadata.foreign_key).to eq("person_id")
           end
         end
 
@@ -837,7 +838,7 @@ describe Mongoid::Relations::Metadata do
             end
 
             it "returns the inverse_of plus suffix" do
-              metadata.foreign_key.should eq("creator_id")
+              expect(metadata.foreign_key).to eq("creator_id")
             end
           end
 
@@ -852,23 +853,42 @@ describe Mongoid::Relations::Metadata do
             end
 
             it "returns the inverse foreign key" do
-              metadata.foreign_key.should eq("person_id")
+              expect(metadata.foreign_key).to eq("person_id")
             end
           end
 
           context "when the class is namespaced" do
 
-            let(:metadata) do
-              described_class.new(
-                name: :bananas,
-                relation: Mongoid::Relations::Referenced::Many,
-                inverse_class_name: "Fruits::Apple",
-                class_name: "Fruits::Banana"
-              )
+            context "when name doesnt include namespace" do
+
+              let(:metadata) do
+                described_class.new(
+                  name: :bananas,
+                  relation: Mongoid::Relations::Referenced::Many,
+                  inverse_class_name: "Fruits::Apple",
+                  class_name: "Fruits::Banana"
+                  )
+              end
+
+              it "returns the foreign_key without the module name" do
+                expect(metadata.foreign_key).to eq("apple_id")
+              end
             end
 
-            it "returns the foreign_key without the module name" do
-              metadata.foreign_key.should eq("apple_id")
+            context "when name include namespace" do
+
+              let(:metadata) do
+                described_class.new(
+                  name: :fruits_melons,
+                  relation: Mongoid::Relations::Referenced::Many,
+                  inverse_class_name: "Fruits::Apple",
+                  class_name: "Fruits::Melon"
+                  )
+              end
+
+              it "returns the foreign_key with the module name" do
+                expect(metadata.foreign_key).to eq("fruit_apple_id")
+              end
             end
           end
         end
@@ -882,8 +902,8 @@ describe Mongoid::Relations::Metadata do
             )
           end
 
-          it "returns the inverse foreign key" do
-            metadata.foreign_key.should eq("person_id")
+          it "returns a nil foreign key" do
+            expect(metadata.foreign_key).to be_nil
           end
         end
       end
@@ -900,7 +920,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns the foreign_key" do
-        metadata.foreign_key.should eq("blog_post_id")
+        expect(metadata.foreign_key).to eq("blog_post_id")
       end
     end
   end
@@ -918,7 +938,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns an empty array" do
-        metadata.foreign_key_default.should be_empty
+        expect(metadata.foreign_key_default).to be_empty
       end
     end
 
@@ -933,7 +953,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns an empty array" do
-        metadata.foreign_key_default.should be_nil
+        expect(metadata.foreign_key_default).to be_nil
       end
     end
   end
@@ -951,7 +971,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns the foreign_key plus =" do
-        metadata.foreign_key_setter.should eq("person_id=")
+        expect(metadata.foreign_key_setter).to eq("person_id=")
       end
     end
 
@@ -967,7 +987,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns the polymorphic foreign_key plus =" do
-        metadata.foreign_key_setter.should eq("ratable_id=")
+        expect(metadata.foreign_key_setter).to eq("ratable_id=")
       end
     end
   end
@@ -985,7 +1005,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns nil" do
-        metadata.inverse_type.should be_nil
+        expect(metadata.inverse_type).to be_nil
       end
     end
 
@@ -1001,7 +1021,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns the polymorphic name plus type" do
-        metadata.inverse_type.should eq("ratable_type")
+        expect(metadata.inverse_type).to eq("ratable_type")
       end
     end
   end
@@ -1019,7 +1039,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns nil" do
-        metadata.inverse_type_setter.should be_nil
+        expect(metadata.inverse_type_setter).to be_nil
       end
     end
 
@@ -1035,75 +1055,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns the inverse type plus =" do
-        metadata.inverse_type_setter.should eq("ratable_type=")
-      end
-    end
-  end
-
-  describe "#inverse_of_field" do
-
-    context "when the relation is not polymorphic" do
-
-      let(:metadata) do
-        described_class.new(
-          name: :person,
-          relation: Mongoid::Relations::Referenced::In,
-          foreign_key: "person_id"
-        )
-      end
-
-      it "returns nil" do
-        metadata.inverse_of_field.should be_nil
-      end
-    end
-
-    context "when the relation is polymorphic" do
-
-      let(:metadata) do
-        described_class.new(
-          name: :ratable,
-          relation: Mongoid::Relations::Referenced::In,
-          polymorphic: true,
-          inverse_class_name: "Rating"
-        )
-      end
-
-      it "returns the polymorphic name plus field" do
-        metadata.inverse_of_field.should eq("ratable_field")
-      end
-    end
-  end
-
-  describe "#inverse_of_field_setter" do
-
-    context "when the relation is not polymorphic" do
-
-      let(:metadata) do
-        described_class.new(
-          name: :person,
-          relation: Mongoid::Relations::Referenced::In,
-          foreign_key: "person_id"
-        )
-      end
-
-      it "returns nil" do
-        metadata.inverse_of_field_setter.should be_nil
-      end
-    end
-
-    context "when the relation is polymorphic" do
-
-      let(:metadata) do
-        described_class.new(
-          name: :ratable,
-          relation: Mongoid::Relations::Referenced::In,
-          polymorphic: true,
-          inverse_class_name: "Rating"
-        )
-      end
-
-      it "returns the inverse of field plus =" do
-        metadata.inverse_of_field_setter.should eq("ratable_field=")
+        expect(metadata.inverse_type_setter).to eq("ratable_type=")
       end
     end
   end
@@ -1124,7 +1076,7 @@ describe Mongoid::Relations::Metadata do
         end
 
         it "returns only the inverse_of" do
-          metadata.inverses(nil).should eq([ "my_ratings" ])
+          expect(metadata.inverses(nil)).to eq([ "my_ratings" ])
         end
       end
     end
@@ -1142,7 +1094,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns true" do
-        metadata.indexed?.should be_true
+        expect(metadata.indexed?).to be true
       end
     end
 
@@ -1155,7 +1107,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns false" do
-        metadata.indexed?.should be_false
+        expect(metadata.indexed?).to be false
       end
     end
 
@@ -1169,7 +1121,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns false" do
-        metadata.indexed?.should be_false
+        expect(metadata.indexed?).to be false
       end
     end
   end
@@ -1185,7 +1137,7 @@ describe Mongoid::Relations::Metadata do
         end
 
         it "returns the name of the inverse with the matching foreign_key" do
-          metadata.inverse.should eq(:creator)
+          expect(metadata.inverse).to eq(:creator)
         end
       end
 
@@ -1202,7 +1154,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "returns the name of the inverse with the matching inverse of" do
-            metadata.inverse.should eq(:user)
+            expect(metadata.inverse).to eq(:user)
           end
         end
 
@@ -1219,7 +1171,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "returns the name of the relation" do
-            metadata.inverse.should eq(:eyeable)
+            expect(metadata.inverse).to eq(:eyeable)
           end
         end
 
@@ -1235,7 +1187,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "returns nil" do
-            metadata.inverse(Face.new).should be_nil
+            expect(metadata.inverse(Face.new)).to be_nil
           end
         end
       end
@@ -1252,7 +1204,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "returns nil" do
-            metadata.inverse.should be_nil
+            expect(metadata.inverse).to be_nil
           end
         end
 
@@ -1266,7 +1218,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "returns the name of the inverse_of property" do
-            metadata.inverse.should eq(:crazy_name)
+            expect(metadata.inverse).to eq(:crazy_name)
           end
         end
       end
@@ -1283,7 +1235,7 @@ describe Mongoid::Relations::Metadata do
         end
 
         it "returns the name of the relation" do
-          metadata.inverse.should eq(:person)
+          expect(metadata.inverse).to eq(:person)
         end
       end
 
@@ -1299,7 +1251,7 @@ describe Mongoid::Relations::Metadata do
         end
 
         it "returns the name of the relation" do
-          metadata.inverse.should eq(:addressable)
+          expect(metadata.inverse).to eq(:addressable)
         end
       end
 
@@ -1315,7 +1267,7 @@ describe Mongoid::Relations::Metadata do
         end
 
         it "returns the name of the relation" do
-          metadata.inverse(Person.new).should eq(:addresses)
+          expect(metadata.inverse(Person.new)).to eq(:addresses)
         end
       end
 
@@ -1334,7 +1286,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "returns the name of the relation" do
-            metadata.inverse(Role.new).should eq(:child_roles)
+            expect(metadata.inverse(Role.new)).to eq(:child_roles)
           end
         end
 
@@ -1351,7 +1303,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "returns the name of the relation" do
-            metadata.inverse(Entry.new).should eq(:child_entries)
+            expect(metadata.inverse(Entry.new)).to eq(:child_entries)
           end
         end
       end
@@ -1373,7 +1325,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns the inverse class name plus suffix" do
-        metadata.inverse_foreign_key.should eq("person_ids")
+        expect(metadata.inverse_foreign_key).to eq("person_ids")
       end
     end
 
@@ -1389,7 +1341,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns nil" do
-        metadata.inverse_foreign_key.should be_nil
+        expect(metadata.inverse_foreign_key).to be_nil
       end
     end
   end
@@ -1404,7 +1356,7 @@ describe Mongoid::Relations::Metadata do
     end
 
     it "constantizes the inverse_class_name" do
-      metadata.inverse_klass.should eq(Person)
+      expect(metadata.inverse_klass).to eq(Person)
     end
   end
 
@@ -1422,7 +1374,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns a string for the setter" do
-        metadata.inverse_setter.should eq("person=")
+        expect(metadata.inverse_setter).to eq("person=")
       end
     end
 
@@ -1445,7 +1397,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "returns nil" do
-            metadata.inverse_setter(other).should be_nil
+            expect(metadata.inverse_setter(other)).to be_nil
           end
         end
 
@@ -1461,7 +1413,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "returns a string for the setter" do
-            metadata.inverse_setter.should eq("eyeable=")
+            expect(metadata.inverse_setter).to eq("eyeable=")
           end
         end
       end
@@ -1482,7 +1434,7 @@ describe Mongoid::Relations::Metadata do
         end
 
         it "returns a string for the setter" do
-          metadata.inverse_setter(other).should eq("ratings=")
+          expect(metadata.inverse_setter(other)).to eq("ratings=")
         end
       end
 
@@ -1498,7 +1450,7 @@ describe Mongoid::Relations::Metadata do
         end
 
         it "returns a string for the setter" do
-          metadata.inverse_setter.should eq("ratable=")
+          expect(metadata.inverse_setter).to eq("ratable=")
         end
       end
     end
@@ -1516,7 +1468,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns the name as a string" do
-        metadata.key.should eq("addresses")
+        expect(metadata.key).to eq("addresses")
       end
 
       context "with a store_as option defined" do
@@ -1530,7 +1482,7 @@ describe Mongoid::Relations::Metadata do
         end
 
         it "return the name define by store_as option" do
-          metadata.key.should eq("user_comments")
+          expect(metadata.key).to eq("user_comments")
         end
       end
     end
@@ -1549,7 +1501,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "returns the foreign_key" do
-            metadata.key.should eq("post_ids")
+            expect(metadata.key).to eq("post_ids")
           end
         end
 
@@ -1564,7 +1516,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "returns the polymorphic foreign_key" do
-            metadata.key.should eq("ratable_id")
+            expect(metadata.key).to eq("ratable_id")
           end
         end
       end
@@ -1580,7 +1532,7 @@ describe Mongoid::Relations::Metadata do
         end
 
         it "returns _id" do
-          metadata.key.should eq("_id")
+          expect(metadata.key).to eq("_id")
         end
       end
     end
@@ -1596,7 +1548,7 @@ describe Mongoid::Relations::Metadata do
     end
 
     it "returns self" do
-      metadata.options.should eq(metadata)
+      expect(metadata.options).to eq(metadata)
     end
   end
 
@@ -1610,7 +1562,7 @@ describe Mongoid::Relations::Metadata do
     end
 
     it "returns order criteria" do
-      metadata.order.should eq(:rating.asc)
+      expect(metadata.order).to eq(:rating.asc)
     end
   end
 
@@ -1626,7 +1578,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "constantizes the class_name" do
-        metadata.klass.should eq(Address)
+        expect(metadata.klass).to eq(Address)
       end
     end
 
@@ -1640,7 +1592,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns the class" do
-        metadata.klass.should eq(Address)
+        expect(metadata.klass).to eq(Address)
       end
     end
   end
@@ -1654,7 +1606,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns true" do
-        metadata.should be_many
+        expect(metadata).to be_many
       end
     end
 
@@ -1665,7 +1617,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns false" do
-        metadata.should_not be_many
+        expect(metadata).to_not be_many
       end
     end
   end
@@ -1677,7 +1629,7 @@ describe Mongoid::Relations::Metadata do
     end
 
     it "returns the macro from the relation" do
-      metadata.macro.should eq(:embeds_one)
+      expect(metadata.macro).to eq(:embeds_one)
     end
   end
 
@@ -1696,8 +1648,9 @@ describe Mongoid::Relations::Metadata do
     end
 
     it "returns the nested builder from the relation" do
-      metadata.nested_builder(attributes, options).should
-      be_a_kind_of(Mongoid::Relations::Builders::NestedAttributes::One)
+      expect(
+        metadata.nested_builder(attributes, options)
+      ).to be_a_kind_of(Mongoid::Relations::Builders::NestedAttributes::One)
     end
   end
 
@@ -1714,7 +1667,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns _id" do
-        metadata.primary_key.should eq("_id")
+        expect(metadata.primary_key).to eq("_id")
       end
     end
 
@@ -1730,7 +1683,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns the primary key" do
-        metadata.primary_key.should eq("something_id")
+        expect(metadata.primary_key).to eq("something_id")
       end
     end
   end
@@ -1751,7 +1704,7 @@ describe Mongoid::Relations::Metadata do
         end
 
         it "returns true" do
-          metadata.validate?.should be_true
+          expect(metadata.validate?).to be true
         end
       end
 
@@ -1767,7 +1720,7 @@ describe Mongoid::Relations::Metadata do
         end
 
         it "returns false" do
-          metadata.validate?.should be_false
+          expect(metadata.validate?).to be false
         end
       end
     end
@@ -1783,54 +1736,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns the relation default" do
-        metadata.validate?.should be_true
-      end
-    end
-  end
-
-  describe "#versioned?" do
-
-    context "when versioned is true" do
-
-      let(:metadata) do
-        described_class.new(
-          name: :versions,
-          relation: Mongoid::Relations::Embedded::Many,
-          versioned: true
-        )
-      end
-
-      it "returns true" do
-        metadata.should be_versioned
-      end
-    end
-
-    context "when versioned is false" do
-
-      let(:metadata) do
-        described_class.new(
-          name: :versions,
-          relation: Mongoid::Relations::Embedded::Many,
-          versioned: false
-        )
-      end
-
-      it "returns false" do
-        metadata.should_not be_versioned
-      end
-    end
-
-    context "when versioned is nil" do
-
-      let(:metadata) do
-        described_class.new(
-          name: :versions,
-          relation: Mongoid::Relations::Embedded::Many
-        )
-      end
-
-      it "returns false" do
-        metadata.should_not be_versioned
+        expect(metadata.validate?).to be true
       end
     end
   end
@@ -1848,7 +1754,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns the value" do
-        metadata.store_as.should eq("user_comments")
+        expect(metadata.store_as).to eq("user_comments")
       end
     end
 
@@ -1862,7 +1768,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns false" do
-        metadata.store_as.should eq("comments")
+        expect(metadata.store_as).to eq("comments")
       end
     end
   end
@@ -1893,14 +1799,14 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns nil" do
-        inverse_relation.should be_nil
+        expect(inverse_relation).to be_nil
       end
     end
 
     context "when one match" do
 
       it "returns correct relation" do
-        inverse_relation.should eq(:drugs)
+        expect(inverse_relation).to eq(:drugs)
       end
     end
 
@@ -1936,7 +1842,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns false" do
-        metadata.should_not be_touchable
+        expect(metadata).to_not be_touchable
       end
     end
 
@@ -1951,7 +1857,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns true" do
-        metadata.should be_touchable
+        expect(metadata).to be_touchable
       end
     end
 
@@ -1965,7 +1871,7 @@ describe Mongoid::Relations::Metadata do
       end
 
       it "returns false" do
-        metadata.should_not be_touchable
+        expect(metadata).to_not be_touchable
       end
     end
   end
@@ -1991,7 +1897,7 @@ describe Mongoid::Relations::Metadata do
         end
 
         it "returns the #{property} property" do
-          metadata.send(property).should eq(:value)
+          expect(metadata.send(property)).to eq(:value)
         end
       end
 
@@ -2007,7 +1913,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "returns true" do
-            metadata.send("#{property}?").should be_true
+            expect(metadata.send("#{property}?")).to be true
           end
         end
 
@@ -2020,7 +1926,7 @@ describe Mongoid::Relations::Metadata do
           end
 
           it "returns false" do
-            metadata.send("#{property}?").should be_false
+            expect(metadata.send("#{property}?")).to be false
           end
         end
       end