mongoid 3.1.7 → 4.0.0.alpha1

data/spec/mongoid/attributes/readonly_spec.rb

@@ -15,7 +15,7 @@ describe Mongoid::Attributes::Readonly do
       end
 
       it "adds the field to readonly attributes" do
-        Person.readonly_attributes.to_a.should eq([ "title" ])
+        expect(Person.readonly_attributes.to_a).to eq([ "title" ])
       end
     end
 
@@ -26,7 +26,7 @@ describe Mongoid::Attributes::Readonly do
       end
 
       it "adds the fields to readonly attributes" do
-        Person.readonly_attributes.to_a.should eq([ "title", "terms" ])
+        expect(Person.readonly_attributes.to_a).to eq([ "title", "terms" ])
       end
     end
 
@@ -41,19 +41,19 @@ describe Mongoid::Attributes::Readonly do
       end
 
       it "sets the first readonly value" do
-        person.title.should eq("sir")
+        expect(person.title).to eq("sir")
       end
 
       it "sets subsequent readonly values" do
-        person.terms.should be_true
+        expect(person.terms).to be true
       end
 
       it "persists the first readonly value" do
-        person.reload.title.should eq("sir")
+        expect(person.reload.title).to eq("sir")
       end
 
       it "persists subsequent readonly values" do
-        person.reload.terms.should be_true
+        expect(person.reload.terms).to be true
       end
     end
 
@@ -75,11 +75,11 @@ describe Mongoid::Attributes::Readonly do
         end
 
         it "does not update the field" do
-          person.title.should eq("sir")
+          expect(person.title).to eq("sir")
         end
 
         it "does not persist the changes" do
-          person.reload.title.should eq("sir")
+          expect(person.reload.title).to eq("sir")
         end
       end
 
@@ -91,11 +91,11 @@ describe Mongoid::Attributes::Readonly do
         end
 
         it "does not update the field" do
-          person.title.should eq("sir")
+          expect(person.title).to eq("sir")
         end
 
         it "does not persist the changes" do
-          person.reload.title.should eq("sir")
+          expect(person.reload.title).to eq("sir")
         end
       end
 
@@ -107,11 +107,11 @@ describe Mongoid::Attributes::Readonly do
         end
 
         it "does not update the field" do
-          person.title.should eq("sir")
+          expect(person.title).to eq("sir")
         end
 
         it "does not persist the changes" do
-          person.reload.title.should eq("sir")
+          expect(person.reload.title).to eq("sir")
         end
       end
 
@@ -123,11 +123,11 @@ describe Mongoid::Attributes::Readonly do
         end
 
         it "does not update the field" do
-          person.title.should eq("sir")
+          expect(person.title).to eq("sir")
         end
 
         it "does not persist the changes" do
-          person.reload.title.should eq("sir")
+          expect(person.reload.title).to eq("sir")
         end
       end
 
@@ -139,11 +139,11 @@ describe Mongoid::Attributes::Readonly do
         end
 
         it "does not update the field" do
-          person.title.should eq("sir")
+          expect(person.title).to eq("sir")
         end
 
         it "does not persist the changes" do
-          person.reload.title.should eq("sir")
+          expect(person.reload.title).to eq("sir")
         end
       end
 

data/spec/mongoid/attributes_spec.rb

@@ -11,7 +11,7 @@ describe Mongoid::Attributes do
       end
 
       it "does not cause an infinite loop" do
-        account.overridden.should eq("not recommended")
+        expect(account.overridden).to eq("not recommended")
       end
     end
   end
@@ -33,14 +33,14 @@ describe Mongoid::Attributes do
         context "when passing just the name" do
 
           it "returns the full value" do
-            person[:desc].should eq("en" => "testing")
+            expect(person[:desc]).to eq("en" => "testing")
           end
         end
 
         context "when passing the name with locale" do
 
           it "returns the value for the locale" do
-            person["desc.en"].should eq("testing")
+            expect(person["desc.en"]).to eq("testing")
           end
         end
       end
@@ -48,7 +48,7 @@ describe Mongoid::Attributes do
       context "when attribute does not exist" do
 
         it "returns the default value" do
-          person[:age].should eq(100)
+          expect(person[:age]).to eq(100)
         end
       end
 
@@ -59,7 +59,7 @@ describe Mongoid::Attributes do
         end
 
         it "returns the value" do
-          person[:owner_id].should eq(5)
+          expect(person[:owner_id]).to eq(5)
         end
       end
     end
@@ -85,7 +85,7 @@ describe Mongoid::Attributes do
           end
 
           it "returns the default value" do
-            found[:age].should eq(100)
+            expect(found[:age]).to eq(100)
           end
         end
 
@@ -98,7 +98,7 @@ describe Mongoid::Attributes do
           end
 
           it "returns the default value" do
-            person[:age].should eq(100)
+            expect(person[:age]).to eq(100)
           end
         end
       end
@@ -113,270 +113,31 @@ describe Mongoid::Attributes do
 
     context "when setting the attribute to nil" do
 
-      before do
+      let!(:age) do
         person[:age] = nil
       end
 
       it "does not use the default value" do
-        person.age.should be_nil
+        expect(person.age).to be_nil
+      end
+
+      it "returns the set value" do
+        expect(age).to be_nil
       end
     end
 
     context "when field has a default value" do
 
-      before do
+      let!(:terms) do
         person[:terms] = true
       end
 
       it "allows overwriting of the default value" do
-        person.terms.should be_true
-      end
-    end
-  end
-
-  describe ".attr_accessible" do
-
-    context "when the field is not _id" do
-
-      let(:account) do
-        Account.new(number: 999999)
-      end
-
-      it "prevents setting via mass assignment" do
-        account.number.should be_nil
-      end
-    end
-
-    context "when the field is _id" do
-
-      let(:account) do
-        Account.new(_id: "ABBA")
-      end
-
-      it "prevents setting via mass assignment" do
-        account._id.should_not eq("ABBA")
-      end
-    end
-
-    context "when using instantiate" do
-
-      let(:account) do
-        Account.instantiate("_id" => "1", "balance" => "ABBA")
-      end
-
-      it "ignores any protected attribute" do
-        account.balance.should eq("ABBA")
-      end
-    end
-
-    context "when using override" do
-
-      let(:account) do
-        Account.new
-      end
-
-      it "ignores any protected attribute" do
-        account.write_attributes({balance: "ABBA"}, false)
-        account.balance.should eq("ABBA")
-      end
-    end
-
-    context "when mass assignment role is indicated" do
-
-      context "when attributes assigned from default role" do
-
-        let(:article) do
-          Article.new(
-            title: "Some Title",
-            is_rss: true,
-            user_login: "SomeLogin"
-          )
-        end
-
-        it "sets the title field for default role" do
-          article.title.should eq("Some Title")
-        end
-
-        it "sets the user login field for the default role" do
-          article.user_login.should eq("SomeLogin")
-        end
-
-        it "sets the rss field for the default role" do
-          article.is_rss.should be_false
-        end
-      end
-
-      context "when attributes assigned from parser role" do
-
-        let(:article) do
-          Article.new({
-            title: "Some Title",
-            is_rss: true,
-            user_login: "SomeLogin"
-            }, as: :parser
-          )
-        end
-
-        it "sets the title field" do
-          article.title.should eq("Some Title")
-        end
-
-        it "sets the rss field" do
-          article.is_rss.should be_true
-        end
-
-        it "does not set the user login field" do
-          article.user_login.should be_nil
-        end
+        expect(person.terms).to be true
       end
 
-      context "when attributes assigned without protection" do
-
-        let(:article) do
-          Article.new(
-            { title: "Some Title",
-              is_rss: true,
-              user_login: "SomeLogin"
-            }, without_protection: true
-          )
-        end
-
-        it "sets the title field" do
-          article.title.should eq("Some Title")
-        end
-
-        it "sets the user login field" do
-          article.user_login.should eq("SomeLogin")
-        end
-
-        it "sets the rss field" do
-          article.is_rss.should be_true
-        end
-      end
-    end
-  end
-
-  describe ".attr_protected" do
-
-    context "when the field is not _id" do
-
-      let(:person) do
-        Person.new(security_code: "ABBA")
-      end
-
-      it "prevents setting via mass assignment" do
-        person.security_code.should be_nil
-      end
-    end
-
-    context "when the field is _id" do
-
-      let(:game) do
-        Game.new(_id: "ABBA")
-      end
-
-      it "prevents setting via mass assignment" do
-        game._id.should_not eq("ABBA")
-      end
-    end
-
-    context "when using instantiate" do
-
-      let(:person) do
-        Person.instantiate("_id" => "1", "security_code" => "ABBA")
-      end
-
-      it "ignores any protected attribute" do
-        person.security_code.should eq("ABBA")
-      end
-    end
-
-    context "when using override" do
-
-      let(:person) do
-        Person.new
-      end
-
-      it "ignores any protected attribute" do
-        person.write_attributes({security_code: "ABBA"}, false)
-        person.security_code.should eq("ABBA")
-      end
-    end
-
-    context "when mass assignment role is indicated" do
-
-      let(:item) do
-        Item.new
-      end
-
-      context "when attributes assigned from default role" do
-
-        before do
-          item.assign_attributes(
-            title: "Some Title",
-            is_rss: true,
-            user_login: "SomeLogin"
-          )
-        end
-
-        it "sets the field for the default role" do
-          item.is_rss.should be_true
-        end
-
-        it "does not set the field for non default role title" do
-          item.title.should be_nil
-        end
-
-        it "does not set the field for non default role user login" do
-          item.user_login.should be_nil
-        end
-      end
-
-      context "when attributes assigned from parser role" do
-
-        before do
-          item.assign_attributes(
-            { title: "Some Title",
-              is_rss: true,
-              user_login: "SomeLogin" }, as: :parser
-          )
-        end
-
-        it "sets the user login field for parser role" do
-          item.user_login.should eq("SomeLogin")
-        end
-
-        it "sets the is rss field for parse role" do
-          item.is_rss.should be_false
-        end
-
-        it "does not set the title field" do
-          item.title.should be_nil
-        end
-      end
-
-      context "when attributes assigned without protection" do
-
-        before do
-          item.assign_attributes(
-            { title: "Some Title",
-              is_rss: true,
-              user_login: "SomeLogin"
-            }, without_protection: true
-          )
-        end
-
-        it "sets the title attribute" do
-          item.title.should eq("Some Title")
-        end
-
-        it "sets the user login attribute" do
-          item.user_login.should eq("SomeLogin")
-        end
-
-        it "sets the rss attribute" do
-          item.is_rss.should be_true
-        end
+      it "returns the set value" do
+        expect(terms).to eq(true)
       end
     end
   end
@@ -388,7 +149,7 @@ describe Mongoid::Attributes do
     end
 
     it "delegates to #id" do
-      person._id.should eq(person.id)
+      expect(person._id).to eq(person.id)
     end
   end
 
@@ -397,9 +158,10 @@ describe Mongoid::Attributes do
     after(:all) do
       Person.field(
         :_id,
-        type: Moped::BSON::ObjectId,
+        type: BSON::ObjectId,
         pre_processed: true,
-        default: ->{ Moped::BSON::ObjectId.new }
+        default: ->{ BSON::ObjectId.new },
+        overwrite: true
       )
     end
 
@@ -408,9 +170,10 @@ describe Mongoid::Attributes do
       before(:all) do
         Person.field(
           :_id,
-          type: Moped::BSON::ObjectId,
+          type: BSON::ObjectId,
           pre_processed: true,
-          default: ->{ Moped::BSON::ObjectId.new }
+          default: ->{ BSON::ObjectId.new },
+          overwrite: true
         )
       end
 
@@ -419,7 +182,7 @@ describe Mongoid::Attributes do
       end
 
       let(:bson_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       context "when providing an object id" do
@@ -429,7 +192,7 @@ describe Mongoid::Attributes do
         end
 
         it "sets the id as the object id" do
-          person.id.should eq(bson_id)
+          expect(person.id).to eq(bson_id)
         end
       end
 
@@ -440,7 +203,7 @@ describe Mongoid::Attributes do
         end
 
         it "sets the id as the object id" do
-          person.id.should eq(bson_id)
+          expect(person.id).to eq(bson_id)
         end
       end
 
@@ -451,7 +214,7 @@ describe Mongoid::Attributes do
         end
 
         it "sets the id as the supplied value to_s" do
-          person.id.should eq(2)
+          expect(person.id).to eq(2)
         end
       end
     end
@@ -463,7 +226,8 @@ describe Mongoid::Attributes do
           :_id,
           type: String,
           pre_processed: true,
-          default: ->{ Moped::BSON::ObjectId.new.to_s }
+          default: ->{ BSON::ObjectId.new.to_s },
+          overwrite: true
         )
       end
 
@@ -472,7 +236,7 @@ describe Mongoid::Attributes do
       end
 
       let(:bson_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       context "when providing an object id" do
@@ -482,7 +246,7 @@ describe Mongoid::Attributes do
         end
 
         it "sets the id as the string of the object id" do
-          person.id.should eq(bson_id.to_s)
+          expect(person.id).to eq(bson_id.to_s)
         end
       end
 
@@ -493,7 +257,7 @@ describe Mongoid::Attributes do
         end
 
         it "sets the id as the string" do
-          person.id.should eq(bson_id.to_s)
+          expect(person.id).to eq(bson_id.to_s)
         end
       end
 
@@ -504,7 +268,7 @@ describe Mongoid::Attributes do
         end
 
         it "sets the id as the supplied value to_s" do
-          person.id.should eq("2")
+          expect(person.id).to eq("2")
         end
       end
     end
@@ -512,7 +276,7 @@ describe Mongoid::Attributes do
     context "when using integer ids" do
 
       before(:all) do
-        Person.field(:_id, type: Integer)
+        Person.field(:_id, type: Integer, overwrite: true)
       end
 
       let(:person) do
@@ -526,7 +290,7 @@ describe Mongoid::Attributes do
         end
 
         it "sets the id as the integer" do
-          person.id.should eq(1)
+          expect(person.id).to eq(1)
         end
       end
 
@@ -537,7 +301,7 @@ describe Mongoid::Attributes do
         end
 
         it "sets the id as the supplied value" do
-          person.id.should eq(2)
+          expect(person.id).to eq(2)
         end
       end
     end
@@ -553,27 +317,23 @@ describe Mongoid::Attributes do
       Person.new(attributes)
     end
 
-    before do
-      Mongoid.configure.allow_dynamic_fields = true
-    end
-
     context "when an attribute exists" do
 
       it "allows the getter" do
-        person.testing.should eq("Testing")
+        expect(person.testing).to eq("Testing")
       end
 
       it "allows the setter" do
         person.testing = "Test"
-        person.testing.should eq("Test")
+        expect(person.testing).to eq("Test")
       end
 
       it "allows the getter before_type_cast" do
-        person.testing_before_type_cast.should eq("Testing")
+        expect(person.testing_before_type_cast).to eq("Testing")
       end
 
       it "returns true for respond_to?" do
-        person.respond_to?(:testing).should be_true
+        expect(person.respond_to?(:testing)).to be true
       end
     end
 
@@ -588,28 +348,17 @@ describe Mongoid::Attributes do
       end
 
       it "mongoizes the dynamic field" do
-        person.new_years.should be_a(Time)
+        expect(person.new_years).to be_a(Time)
       end
 
       it "keeps the same value" do
-        person.new_years.should eq(new_years)
+        expect(person.new_years).to eq(new_years)
       end
     end
   end
 
   describe "#process" do
 
-    context "when passing non accessible fields" do
-
-      let(:person) do
-        Person.new(owner_id: 6)
-      end
-
-      it "does not set the value" do
-        person.owner_id.should be_nil
-      end
-    end
-
     context "when attributes dont have fields defined" do
 
       let(:attributes) do
@@ -626,43 +375,26 @@ describe Mongoid::Attributes do
           Person.new(attributes)
         end
 
-        before do
-          Mongoid.configure.allow_dynamic_fields = true
-        end
-
         context "when attribute is a string" do
 
           it "adds the string to the attributes" do
-            person.attributes["nofieldstring"].should eq("Testing")
+            expect(person.attributes["nofieldstring"]).to eq("Testing")
           end
         end
 
         context "when attribute is not a string" do
 
           it "adds a cast value to the attributes" do
-            person.attributes["nofieldint"].should eq(5)
+            expect(person.attributes["nofieldint"]).to eq(5)
           end
         end
       end
 
       context "when not allowing dynamic fields" do
 
-        let!(:attributes) do
-          { nofieldstring: "Testing" }
-        end
-
-        before do
-          Mongoid.configure.allow_dynamic_fields = false
-          Person.fields.delete(:nofieldstring)
-        end
-
-        after do
-          Mongoid.configure.allow_dynamic_fields = true
-        end
-
-        it "raises an unknown attribute error" do
+        it "raises an unknown attribute error on instantiation" do
           expect {
-            Person.new({ anothernew: "Test" })
+            Account.new({ anothernew: "Test" })
           }.to raise_error(Mongoid::Errors::UnknownAttribute)
         end
       end
@@ -671,7 +403,7 @@ describe Mongoid::Attributes do
     context "when supplied hash has string values" do
 
       let(:bson_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let!(:attributes) do
@@ -695,15 +427,15 @@ describe Mongoid::Attributes do
       end
 
       it "casts integers" do
-        person[:age].should eq(30)
+        expect(person[:age]).to eq(30)
       end
 
       it "casts booleans" do
-        person[:terms].should be_true
+        expect(person[:terms]).to be true
       end
 
       it "sets empty strings to nil" do
-        person[:score].should be_nil
+        expect(person[:score]).to be_nil
       end
     end
 
@@ -724,7 +456,7 @@ describe Mongoid::Attributes do
         end
 
         it "sets the associations" do
-          person.name.should eq(name)
+          expect(person.name).to eq(name)
         end
       end
 
@@ -743,11 +475,11 @@ describe Mongoid::Attributes do
         end
 
         it "sets the parent association" do
-          person.game.should eq(game)
+          expect(person.game).to eq(game)
         end
 
         it "sets the inverse association" do
-          game.person.should eq(person)
+          expect(game.person).to eq(person)
         end
       end
 
@@ -762,7 +494,7 @@ describe Mongoid::Attributes do
         end
 
         it "sets the association" do
-          name.person.should eq(person)
+          expect(name.person).to eq(person)
         end
       end
     end
@@ -782,7 +514,7 @@ describe Mongoid::Attributes do
       end
 
       it "calls the setter for the association" do
-        person.employer_id.should eq("1")
+        expect(person.employer_id).to eq("1")
       end
     end
 
@@ -797,7 +529,7 @@ describe Mongoid::Attributes do
       end
 
       it "sets the empty array" do
-        person.aliases.should be_empty
+        expect(person.aliases).to be_empty
       end
     end
 
@@ -812,7 +544,7 @@ describe Mongoid::Attributes do
       end
 
       it "sets the empty hash" do
-        person.map.should eq({})
+        expect(person.map).to eq({})
       end
     end
   end
@@ -832,7 +564,7 @@ describe Mongoid::Attributes do
     end
 
     it "only overwrites supplied attributes" do
-      person.title.should eq("Sir")
+      expect(person.title).to eq("Sir")
     end
   end
 
@@ -847,8 +579,8 @@ describe Mongoid::Attributes do
       context "when attribute does not exist" do
 
         it "returns the default value" do
-          person.age.should eq(100)
-          person.pets.should be_false
+          expect(person.age).to eq(100)
+          expect(person.pets).to be false
         end
 
       end
@@ -860,7 +592,7 @@ describe Mongoid::Attributes do
         end
 
         it "returns the value" do
-          person.read_attribute(:owner_id).should eq(5)
+          expect(person.read_attribute(:owner_id)).to eq(5)
         end
       end
     end
@@ -883,7 +615,7 @@ describe Mongoid::Attributes do
         end
 
         it "returns the default value" do
-          person.age.should eq(100)
+          expect(person.age).to eq(100)
         end
       end
     end
@@ -912,7 +644,7 @@ describe Mongoid::Attributes do
     context "when the attribute has not yet been assigned" do
 
       it "returns the default value" do
-        person.age_before_type_cast.should eq(100)
+        expect(person.age_before_type_cast).to eq(100)
       end
     end
 
@@ -920,7 +652,7 @@ describe Mongoid::Attributes do
 
       it "returns the default value" do
         person.age = "old"
-        person.age_before_type_cast.should eq("old")
+        expect(person.age_before_type_cast).to eq("old")
       end
     end
   end
@@ -937,7 +669,7 @@ describe Mongoid::Attributes do
       context "when attribute does not exist" do
 
         it "returns false" do
-          person.attribute_present?(:owner_id).should be_false
+          expect(person.attribute_present?(:owner_id)).to be false
         end
       end
 
@@ -947,7 +679,7 @@ describe Mongoid::Attributes do
         end
 
         it "returns true" do
-          person.attribute_present?(:owner_id).should be_true
+          expect(person.attribute_present?(:owner_id)).to be true
         end
       end
     end
@@ -970,7 +702,7 @@ describe Mongoid::Attributes do
         end
 
         it "returns true" do
-          person.attribute_present?(:age).should be_true
+          expect(person.attribute_present?(:age)).to be true
         end
       end
     end
@@ -987,7 +719,7 @@ describe Mongoid::Attributes do
 
           it "return true"  do
             person.terms = false
-            person.attribute_present?(:terms).should be_true
+            expect(person.attribute_present?(:terms)).to be true
           end
         end
 
@@ -995,7 +727,7 @@ describe Mongoid::Attributes do
 
           it "return true"  do
             person.terms = false
-            person.attribute_present?(:terms).should be_true
+            expect(person.attribute_present?(:terms)).to be true
           end
         end
       end
@@ -1008,7 +740,7 @@ describe Mongoid::Attributes do
       end
 
       it "return false" do
-        person.attribute_present?(:title).should be_false
+        expect(person.attribute_present?(:title)).to be false
       end
     end
   end
@@ -1024,14 +756,14 @@ describe Mongoid::Attributes do
       context "when provided a symbol" do
 
         it "returns true" do
-          person.has_attribute?(:title).should be_true
+          expect(person.has_attribute?(:title)).to be true
         end
       end
 
       context "when provided a string" do
 
         it "returns true" do
-          person.has_attribute?("title").should be_true
+          expect(person.has_attribute?("title")).to be true
         end
       end
     end
@@ -1039,7 +771,7 @@ describe Mongoid::Attributes do
     context "when the key is not in the attributes" do
 
       it "returns false" do
-        person.has_attribute?(:employer_id).should be_false
+        expect(person.has_attribute?(:employer_id)).to be false
       end
     end
   end
@@ -1053,7 +785,7 @@ describe Mongoid::Attributes do
     context "before the attribute has been assigned" do
 
       it "returns false" do
-        person.has_attribute_before_type_cast?(:age).should be_false
+        expect(person.has_attribute_before_type_cast?(:age)).to be false
       end
     end
 
@@ -1061,7 +793,7 @@ describe Mongoid::Attributes do
 
       it "returns true" do
         person.age = 'old'
-        person.has_attribute_before_type_cast?(:age).should be_true
+        expect(person.has_attribute_before_type_cast?(:age)).to be true
       end
     end
   end
@@ -1079,11 +811,11 @@ describe Mongoid::Attributes do
       end
 
       it "removes the attribute" do
-        person.title.should be_nil
+        expect(person.title).to be_nil
       end
 
       it "removes the key from the attributes hash" do
-        person.has_attribute?(:title).should be_false
+        expect(person.has_attribute?(:title)).to be false
       end
 
       context "when saving after the removal" do
@@ -1093,7 +825,7 @@ describe Mongoid::Attributes do
         end
 
         it "persists the removal" do
-          person.reload.has_attribute?(:title).should be_false
+          expect(person.reload.has_attribute?(:title)).to be false
         end
       end
     end
@@ -1114,11 +846,11 @@ describe Mongoid::Attributes do
      end
 
      it "removes the attribute" do
-       person.pet.name.should be_nil
+       expect(person.pet.name).to be_nil
      end
 
      it "removes the key from the attributes hash" do
-       person.pet.has_attribute?(:name).should be_false
+       expect(person.pet.has_attribute?(:name)).to be false
      end
 
      context "when saving after the removal" do
@@ -1128,7 +860,7 @@ describe Mongoid::Attributes do
        end
 
        it "persists the removal" do
-         person.reload.pet.has_attribute?(:name).should be_false
+         expect(person.reload.pet.has_attribute?(:name)).to be false
        end
      end
 
@@ -1145,7 +877,7 @@ describe Mongoid::Attributes do
       end
 
       it "does not fail" do
-        person.title.should be_nil
+        expect(person.title).to be_nil
       end
     end
 
@@ -1160,7 +892,7 @@ describe Mongoid::Attributes do
       end
 
       it "does not add a delayed unset operation" do
-        person.delayed_atomic_unsets.should be_empty
+        expect(person.delayed_atomic_unsets).to be_empty
       end
     end
   end
@@ -1173,10 +905,6 @@ describe Mongoid::Attributes do
         Person.new
       end
 
-      before(:all) do
-        Mongoid.allow_dynamic_fields = true
-      end
-
       context "when asking for the getter" do
 
         context "when the attribute exists" do
@@ -1186,14 +914,14 @@ describe Mongoid::Attributes do
           end
 
           it "returns true" do
-            person.should respond_to(:attr)
+            expect(person).to respond_to(:attr)
           end
         end
 
         context "when the attribute does not exist" do
 
           it "returns false" do
-            person.should_not respond_to(:attr)
+            expect(person).to_not respond_to(:attr)
           end
         end
       end
@@ -1207,14 +935,14 @@ describe Mongoid::Attributes do
           end
 
           it "returns true" do
-            person.should respond_to(:attr=)
+            expect(person).to respond_to(:attr=)
           end
         end
 
         context "when the attribute does not exist" do
 
           it "returns false" do
-            person.should_not respond_to(:attr=)
+            expect(person).to_not respond_to(:attr=)
           end
         end
       end
@@ -1222,29 +950,21 @@ describe Mongoid::Attributes do
 
     context "when not allowing dynamic fields" do
 
-      let(:person) do
-        Person.new
-      end
-
-      before(:all) do
-        Mongoid.allow_dynamic_fields = false
-      end
-
-      after(:all) do
-        Mongoid.allow_dynamic_fields = true
+      let(:bar) do
+        Bar.new
       end
 
       context "when asking for the getter" do
 
         it "returns false" do
-          person.should_not respond_to(:attr)
+          expect(bar).to_not respond_to(:attr)
         end
       end
 
       context "when asking for the setter" do
 
         it "returns false" do
-          person.should_not respond_to(:attr=)
+          expect(bar).to_not respond_to(:attr=)
         end
       end
     end
@@ -1259,7 +979,7 @@ describe Mongoid::Attributes do
       end
 
       it "returns the default value" do
-        person.age.should eq(100)
+        expect(person.age).to eq(100)
       end
     end
 
@@ -1269,7 +989,7 @@ describe Mongoid::Attributes do
       end
 
       it "should store the attribute before type cast" do
-        person.age_before_type_cast.should eq("old")
+        expect(person.age_before_type_cast).to eq("old")
       end
     end
 
@@ -1280,7 +1000,7 @@ describe Mongoid::Attributes do
       end
 
       it "does not use the default value" do
-        person.age.should be_nil
+        expect(person.age).to be_nil
       end
     end
 
@@ -1295,7 +1015,7 @@ describe Mongoid::Attributes do
       end
 
       it "allows overwriting of the default value" do
-        person.terms.should be_true
+        expect(person.terms).to be true
       end
     end
 
@@ -1310,7 +1030,35 @@ describe Mongoid::Attributes do
       end
 
       it "allows the field name to be udpated" do
-        person.t.should eq("aliased field to test")
+        expect(person.t).to eq("aliased field to test")
+      end
+    end
+
+    context "when attribute is a Hash" do
+      let(:person) { Person.new map: { somekey: "somevalue" } }
+
+      it "raises an error when try to set an invalid value" do
+        expect {
+          person.map = []
+        }.to raise_error(Mongoid::Errors::InvalidValue)
+      end
+
+      it "can set a Hash value" do
+        person.map.should eq( { somekey: "somevalue" } )
+      end
+    end
+
+    context "when attribute is an Array" do
+      let(:person) { Person.new aliases: [ :alias_1 ] }
+
+      it "can set an Array Value" do
+        person.aliases.should eq [ :alias_1 ]
+      end
+
+      it "raises an error when try to set an invalid value" do
+        expect {
+          person.aliases = {}
+        }.to raise_error(Mongoid::Errors::InvalidValue)
       end
     end
   end
@@ -1335,7 +1083,7 @@ describe Mongoid::Attributes do
       end
 
       it "returns the value" do
-        person.send(:typed_value_for, "age", "51").should eq("51")
+        person.send(:typed_value_for, "age", expect("51")).to eq("51")
       end
     end
   end
@@ -1347,7 +1095,7 @@ describe Mongoid::Attributes do
     end
 
     it "typecasts proc values" do
-      person.age.should eq(100)
+      expect(person.age).to eq(100)
     end
   end
 
@@ -1366,7 +1114,7 @@ describe Mongoid::Attributes do
         end
 
         it "sets nested documents" do
-          person.videos.first.title.should eq("Fight Club")
+          expect(person.videos.first.title).to eq("Fight Club")
         end
       end
 
@@ -1387,7 +1135,7 @@ describe Mongoid::Attributes do
           end
 
           it "properly casts values" do
-            person.age.should eq(50)
+            expect(person.age).to eq(50)
           end
         end
 
@@ -1398,11 +1146,38 @@ describe Mongoid::Attributes do
           end
 
           it "does not set anything" do
-            person.age.should eq(100)
+            expect(person.age).to eq(100)
           end
         end
       end
 
+      context "copying from instance" do
+
+        let(:person) do
+          Person.new
+        end
+
+        let(:instance) do
+          Person.new(attributes)
+        end
+
+        let(:attributes) do
+          { age: 50, range: 1..100 }
+        end
+
+        before do
+          person.send(method, instance.attributes)
+        end
+
+        it "properly copies values" do
+          expect(person.age).to eq(50)
+        end
+
+        it "properly copies ranges" do
+          expect(person.range).to eq(1..100)
+        end
+      end
+
       context "on a parent document" do
 
         context "when the parent has a has many through a has one" do
@@ -1426,8 +1201,8 @@ describe Mongoid::Attributes do
           end
 
           it "does not overwrite child attributes if not in the hash" do
-            owner.pet.name.should eq("Bingo")
-            owner.pet.vet_visits.size.should eq(1)
+            expect(owner.pet.name).to eq("Bingo")
+            expect(owner.pet.vet_visits.size).to eq(1)
           end
         end
 
@@ -1451,11 +1226,11 @@ describe Mongoid::Attributes do
           end
 
           it "has 3 new entries" do
-            pet.vet_visits.count.should eq(3)
+            expect(pet.vet_visits.count).to eq(3)
           end
 
           it "persists the changes" do
-            pet.reload.vet_visits.count.should eq(3)
+            expect(pet.reload.vet_visits.count).to eq(3)
           end
         end
 
@@ -1493,7 +1268,7 @@ describe Mongoid::Attributes do
           end
 
           it "sets the child attributes on the parent" do
-            name.attributes.should eq(
+            expect(name.attributes).to eq(
               { "_id" => "Test-User", "first_name" => "Test2", "last_name" => "User2" }
             )
           end
@@ -1515,7 +1290,7 @@ describe Mongoid::Attributes do
           end
 
           it "updates the child attributes on the parent" do
-            address.attributes.should eq(
+            expect(address.attributes).to eq(
               { "_id" => "test", "street" => "Test2" }
             )
           end
@@ -1536,38 +1311,42 @@ describe Mongoid::Attributes do
         product.cost = 500
       end
 
+      it "adds the alias for criteria" do
+        expect(Product.where(cost: 500).selector).to eq("price" => 500)
+      end
+
       it "aliases the getter" do
-        product.cost.should eq(500)
+        expect(product.cost).to eq(500)
       end
 
       it "aliases the existance check" do
-        product.cost?.should be_true
+        expect(product.cost?).to be true
       end
 
       it "aliases *_changed?" do
-        product.cost_changed?.should be_true
+        expect(product.cost_changed?).to be true
       end
 
       it "aliases *_change" do
-        product.cost_change.should eq([ nil, 500 ])
+        expect(product.cost_change).to eq([ nil, 500 ])
       end
 
       it "aliases *_will_change!" do
-        product.should respond_to(:cost_will_change!)
+        expect(product).to respond_to(:cost_will_change!)
       end
 
       it "aliases *_was" do
-        product.cost_was.should be_nil
+        expect(product.cost_was).to be_nil
       end
 
       it "aliases reset_*!" do
         product.reset_cost!
-        product.cost.should be_nil
+        expect(product.cost).to be_nil
       end
 
       it "aliases *_before_type_cast" do
         product.cost = "expensive"
-        product.cost_before_type_cast.should eq("expensive")
+        expect(product.cost_before_type_cast).to eq("expensive")
       end
     end
 
@@ -1578,32 +1357,32 @@ describe Mongoid::Attributes do
       end
 
       it "aliases the getter" do
-        product.price.should eq(500)
+        expect(product.price).to eq(500)
       end
 
       it "aliases the existance check" do
-        product.price?.should be_true
+        expect(product.price?).to be true
       end
 
       it "aliases *_changed?" do
-        product.price_changed?.should be_true
+        expect(product.price_changed?).to be true
       end
 
       it "aliases *_change" do
-        product.price_change.should eq([ nil, 500 ])
+        expect(product.price_change).to eq([ nil, 500 ])
       end
 
       it "aliases *_will_change!" do
-        product.should respond_to(:price_will_change!)
+        expect(product).to respond_to(:price_will_change!)
       end
 
       it "aliases *_was" do
-        product.price_was.should be_nil
+        expect(product.price_was).to be_nil
       end
 
       it "aliases reset_*!" do
         product.reset_price!
-        product.price.should be_nil
+        expect(product.price).to be_nil
       end
     end
   end
@@ -1615,7 +1394,7 @@ describe Mongoid::Attributes do
     end
 
     it "has an entry in the attributes" do
-      person.reload.attributes.should have_key("score")
+      expect(person.reload.attributes).to have_key("score")
     end
   end
 
@@ -1627,7 +1406,7 @@ describe Mongoid::Attributes do
 
     it "saves the default" do
       expect { person.save }.to_not raise_error
-      person.last_drink_taken_at.should eq(1.day.ago.in_time_zone("Alaska").to_date)
+      expect(person.last_drink_taken_at).to eq(1.day.ago.in_time_zone("Alaska").to_date)
     end
   end
 
@@ -1640,7 +1419,7 @@ describe Mongoid::Attributes do
       end
 
       it "applies the default value" do
-        person.last_drink_taken_at.should eq(1.day.ago.in_time_zone("Alaska").to_date)
+        expect(person.last_drink_taken_at).to eq(1.day.ago.in_time_zone("Alaska").to_date)
       end
     end
 
@@ -1657,7 +1436,7 @@ describe Mongoid::Attributes do
         end
 
         it "does not set the default" do
-          from_db.age.should eq(50)
+          expect(from_db.age).to eq(50)
         end
       end
 
@@ -1672,7 +1451,7 @@ describe Mongoid::Attributes do
         end
 
         it "does not set the default" do
-          from_db.age.should be_nil
+          expect(from_db.age).to be_nil
         end
       end
 
@@ -1687,32 +1466,7 @@ describe Mongoid::Attributes do
         end
 
         it "applies the defaults after all attributes are set" do
-          from_db.should be_balanced
-        end
-      end
-    end
-  end
-
-  context "when dynamic fields are not allowed" do
-
-    before do
-      Mongoid.configure.allow_dynamic_fields = false
-    end
-
-    after do
-      Mongoid.configure.allow_dynamic_fields = true
-    end
-
-    context "when an embedded document has been persisted" do
-
-      context "when the field is no longer recognized" do
-
-        before do
-          Person.collection.insert 'pet' => { 'unrecognized_field' => true }
-        end
-
-        it "allows access to the legacy data" do
-          Person.first.pet.read_attribute(:unrecognized_field).should be_true
+          expect(from_db).to be_balanced
         end
       end
     end