mongoid 3.1.7 → 4.0.0.alpha1

data/spec/mongoid/{validations → validatable}/numericality_spec.rb

@@ -23,7 +23,7 @@ describe ActiveModel::Validations::NumericalityValidator do
       end
 
       it "returns false" do
-        model.should_not be_valid
+        expect(model).to_not be_valid
       end
     end
   end

data/spec/mongoid/{validations → validatable}/presence_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Validations::PresenceValidator do
+describe Mongoid::Validatable::PresenceValidator do
 
   describe "#validate_each" do
 
@@ -21,7 +21,7 @@ describe Mongoid::Validations::PresenceValidator do
         end
 
         it "adds no errors" do
-          product.errors[:brand_name].should be_empty
+          expect(product.errors[:brand_name]).to be_empty
         end
       end
 
@@ -32,7 +32,7 @@ describe Mongoid::Validations::PresenceValidator do
         end
 
         it "adds errors" do
-          product.errors[:brand_name].should eq(["can't be blank"])
+          expect(product.errors[:brand_name]).to eq(["can't be blank"])
         end
       end
 
@@ -43,7 +43,7 @@ describe Mongoid::Validations::PresenceValidator do
         end
 
         it "adds errors" do
-          product.errors[:brand_name].should eq(["can't be blank"])
+          expect(product.errors[:brand_name]).to eq(["can't be blank"])
         end
       end
     end
@@ -57,7 +57,7 @@ describe Mongoid::Validations::PresenceValidator do
         end
 
         it "adds no errors" do
-          product.errors[:name].should be_empty
+          expect(product.errors[:name]).to be_empty
         end
       end
 
@@ -68,7 +68,7 @@ describe Mongoid::Validations::PresenceValidator do
         end
 
         it "adds errors" do
-          product.errors[:name].should eq(["can't be blank"])
+          expect(product.errors[:name]).to eq(["can't be blank"])
         end
       end
 
@@ -79,7 +79,7 @@ describe Mongoid::Validations::PresenceValidator do
         end
 
         it "adds errors" do
-          product.errors[:name].should eq(["can't be blank in en"])
+          expect(product.errors[:name]).to eq(["can't be blank in en"])
         end
       end
 
@@ -90,7 +90,7 @@ describe Mongoid::Validations::PresenceValidator do
         end
 
         it "adds errors" do
-          product.errors[:name].should eq(["can't be blank in en"])
+          expect(product.errors[:name]).to eq(["can't be blank in en"])
         end
       end
 
@@ -105,7 +105,7 @@ describe Mongoid::Validations::PresenceValidator do
         end
 
         it "adds errors" do
-          product.errors[:name].should eq(["can't be blank in de"])
+          expect(product.errors[:name]).to eq(["can't be blank in de"])
         end
       end
 
@@ -120,7 +120,7 @@ describe Mongoid::Validations::PresenceValidator do
         end
 
         it "adds errors" do
-          product.errors[:name].should eq(["can't be blank in en", "can't be blank in de"])
+          expect(product.errors[:name]).to eq(["can't be blank in en", "can't be blank in de"])
         end
       end
     end
@@ -212,12 +212,10 @@ describe Mongoid::Validations::PresenceValidator do
     context "when the relation is a has one" do
 
       before do
-        Person.autosaved_relations.delete_one(:game)
         Person.validates :game, presence: true
       end
 
       after do
-        Person.autosaved_relations.clear
         Person.reset_callbacks(:save)
         Person.reset_callbacks(:validate)
       end
@@ -241,7 +239,7 @@ describe Mongoid::Validations::PresenceValidator do
             end
 
             it "saves the relation" do
-              game.reload.should eq(game)
+              expect(game.reload).to eq(game)
             end
           end
         end
@@ -260,11 +258,7 @@ describe Mongoid::Validations::PresenceValidator do
       end
 
       it "does not change autosave on the relation" do
-        Person.relations["game"][:autosave].should be_false
-      end
-
-      it "does not add any autosaved relations" do
-        Person.autosaved_relations.should be_empty
+        expect(Person.relations["game"][:autosave]).to be false
       end
 
       context "when the relation is new" do
@@ -316,7 +310,7 @@ describe Mongoid::Validations::PresenceValidator do
           end
 
           it "is not valid" do
-            line_item.should_not be_valid
+            expect(line_item).to_not be_valid
           end
         end
       end
@@ -329,7 +323,6 @@ describe Mongoid::Validations::PresenceValidator do
       end
 
       after do
-        Person.autosaved_relations.clear
         Person.reset_callbacks(:save)
         Person.reset_callbacks(:validate)
       end
@@ -351,14 +344,14 @@ describe Mongoid::Validations::PresenceValidator do
           end
 
           it "is valid" do
-            loaded.should be_valid
+            expect(loaded).to be_valid
           end
         end
 
         context "when the relation is in memory" do
 
           it "is valid" do
-            person.should be_valid
+            expect(person).to be_valid
           end
         end
       end
@@ -378,12 +371,12 @@ describe Mongoid::Validations::PresenceValidator do
       end
 
       it "is not a valid document" do
-        product.should_not be_valid
+        expect(product).to_not be_valid
       end
 
       it "includes the proper errors" do
         product.valid?
-        product.errors[:name].should_not be_empty
+        expect(product.errors[:name]).to_not be_empty
       end
     end
 
@@ -398,12 +391,12 @@ describe Mongoid::Validations::PresenceValidator do
       end
 
       it "is not a valid document" do
-        product.should_not be_valid
+        expect(product).to_not be_valid
       end
 
       it "includes the proper errors" do
         product.valid?
-        product.errors[:name].should_not be_empty
+        expect(product.errors[:name]).to_not be_empty
       end
     end
 
@@ -418,12 +411,12 @@ describe Mongoid::Validations::PresenceValidator do
       end
 
       it "is not a valid document" do
-        product.should_not be_valid
+        expect(product).to_not be_valid
       end
 
       it "includes the proper errors" do
         product.valid?
-        product.errors[:name].should_not be_empty
+        expect(product.errors[:name]).to_not be_empty
       end
     end
 
@@ -438,12 +431,12 @@ describe Mongoid::Validations::PresenceValidator do
       end
 
       it "is not a valid document" do
-        product.should_not be_valid
+        expect(product).to_not be_valid
       end
 
       it "includes the proper errors" do
         product.valid?
-        product.errors[:name].should_not be_empty
+        expect(product.errors[:name]).to_not be_empty
       end
     end
 
@@ -458,7 +451,7 @@ describe Mongoid::Validations::PresenceValidator do
       end
 
       it "is a valid document" do
-        product.should be_valid
+        expect(product).to be_valid
       end
     end
   end
@@ -483,7 +476,7 @@ describe Mongoid::Validations::PresenceValidator do
     end
 
     it "persists the changes" do
-      reloaded.products.should eq(updated_products)
+      expect(reloaded.products).to eq(updated_products)
     end
   end
 
@@ -506,11 +499,11 @@ describe Mongoid::Validations::PresenceValidator do
       end
 
       it "does not destroy the models change list" do
-        manufacturer.changes.should_not be_empty
+        expect(manufacturer.changes).to_not be_empty
       end
 
       it "maintains the list of changes" do
-        manufacturer.changes.should eq({
+        expect(manufacturer.changes).to eq({
           "products" => [
             [ "Laptop", "Tablet" ],
             [ "Laptop", "Tablet", "Smartphone", "Desktop" ]
@@ -529,7 +522,7 @@ describe Mongoid::Validations::PresenceValidator do
     context "when the value is false" do
 
       it "is a valid document" do
-        template.should be_valid
+        expect(template).to be_valid
       end
     end
 
@@ -540,7 +533,7 @@ describe Mongoid::Validations::PresenceValidator do
       end
 
       it "is a valid document" do
-        template.should be_valid
+        expect(template).to be_valid
       end
     end
   end
@@ -556,7 +549,7 @@ describe Mongoid::Validations::PresenceValidator do
     end
 
     it "adds the validation only to the instance" do
-      validators.should eq([ described_class ])
+      expect(validators).to eq([ described_class ])
     end
   end
 
@@ -584,7 +577,7 @@ describe Mongoid::Validations::PresenceValidator do
         end
 
         it "adds the errors to the document" do
-          person.errors[:aliases].should_not be_empty
+          expect(person.errors[:aliases]).to_not be_empty
         end
       end
     end

data/spec/mongoid/{validations → validatable}/uniqueness_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Validations::UniquenessValidator do
+describe Mongoid::Validatable::UniquenessValidator do
 
   describe "#valid?" do
 
@@ -29,17 +29,17 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "performs the validation on the correct collection" do
-              websters.should_not be_valid
+              expect(websters).to_not be_valid
             end
 
             it "adds the uniqueness error" do
               websters.valid?
-              websters.errors[:name].should_not be_nil
+              expect(websters.errors[:name]).to_not be_nil
             end
 
             it "clears the persistence options in the thread local" do
               websters.valid?
-              Dictionary.persistence_options.should be_nil
+              expect(Dictionary.persistence_options).to be_nil
             end
           end
 
@@ -50,65 +50,8 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "performs the validation on the correct collection" do
-              oxford.should be_valid
+              expect(oxford).to be_valid
             end
-
-            it "does not clear the persistence options in the thread local" do
-              oxford.valid?
-              Dictionary.persistence_options.should_not be_nil
-            end
-          end
-        end
-      end
-
-      context "when the document is paranoid" do
-
-        before do
-          ParanoidPost.validates_uniqueness_of :title
-        end
-
-        after do
-          ParanoidPost.reset_callbacks(:validate)
-        end
-
-        let!(:post) do
-          ParanoidPost.create(title: "testing")
-        end
-
-        context "when the field is unique" do
-
-          let(:new_post) do
-            ParanoidPost.new(title: "test")
-          end
-
-          it "returns true" do
-            new_post.should be_valid
-          end
-        end
-
-        context "when the field is unique for non soft deleted docs" do
-
-          before do
-            post.delete
-          end
-
-          let(:new_post) do
-            ParanoidPost.new(title: "testing")
-          end
-
-          it "returns true" do
-            new_post.should be_valid
-          end
-        end
-
-        context "when the field is not unique" do
-
-          let(:new_post) do
-            ParanoidPost.new(title: "testing")
-          end
-
-          it "returns false" do
-            new_post.should_not be_valid
           end
         end
       end
@@ -136,7 +79,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              word.should be_valid
+              expect(word).to be_valid
             end
           end
         end
@@ -209,7 +152,7 @@ describe Mongoid::Validations::UniquenessValidator do
                 context "when single localization" do
 
                   before do
-                    Dictionary.with(safe: true).create(description: "english")
+                    Dictionary.create(description: "english")
                   end
 
                   let(:dictionary) do
@@ -224,7 +167,7 @@ describe Mongoid::Validations::UniquenessValidator do
                 context "when multiple localizations" do
 
                   before do
-                    Dictionary.with(safe: true).
+                    Dictionary.
                         create(description_translations: { "en" => "english", "de" => "german" })
                   end
 
@@ -245,7 +188,7 @@ describe Mongoid::Validations::UniquenessValidator do
                   context "when single localization" do
 
                     before do
-                      Dictionary.with(safe: true).create(description: "english")
+                      Dictionary.create(description: "english")
                     end
 
                     let(:dictionary) do
@@ -265,7 +208,7 @@ describe Mongoid::Validations::UniquenessValidator do
                   context "when multiple localizations" do
 
                     before do
-                      Dictionary.with(safe: true).
+                      Dictionary.
                           create(description_translations: { "en" => "english", "de" => "german" })
                     end
 
@@ -301,7 +244,7 @@ describe Mongoid::Validations::UniquenessValidator do
                 context "when there are no special characters" do
 
                   before do
-                    Dictionary.with(safe: true).create(description: "english")
+                    Dictionary.create(description: "english")
                   end
 
                   let(:dictionary) do
@@ -316,7 +259,7 @@ describe Mongoid::Validations::UniquenessValidator do
                 context "when special characters exist" do
 
                   before do
-                    Dictionary.with(safe: true).create(description: "english")
+                    Dictionary.create(description: "english")
                   end
 
                   let(:dictionary) do
@@ -336,7 +279,7 @@ describe Mongoid::Validations::UniquenessValidator do
                   context "when signle localization" do
 
                     before do
-                      Dictionary.with(safe: true).create(description: "english")
+                      Dictionary.create(description: "english")
                     end
 
                     let(:dictionary) do
@@ -356,7 +299,7 @@ describe Mongoid::Validations::UniquenessValidator do
                   context "when multiple localizations" do
 
                     before do
-                      Dictionary.with(safe: true).
+                      Dictionary.
                           create(description_translations: { "en" => "english", "de" => "german" })
                     end
 
@@ -378,7 +321,7 @@ describe Mongoid::Validations::UniquenessValidator do
                 context "when the document is the match in the database" do
 
                   let!(:dictionary) do
-                    Dictionary.with(safe: true).create(description: "english")
+                    Dictionary.create(description: "english")
                   end
 
                   it "returns true" do
@@ -404,7 +347,7 @@ describe Mongoid::Validations::UniquenessValidator do
               context "when the document is not the match" do
 
                 before do
-                  Dictionary.with(safe: true).
+                  Dictionary.
                     create(description: "english", name: "test")
                 end
 
@@ -413,12 +356,12 @@ describe Mongoid::Validations::UniquenessValidator do
                 end
 
                 it "returns false" do
-                  dictionary.should_not be_valid
+                  expect(dictionary).to_not be_valid
                 end
 
                 it "adds the uniqueness error" do
                   dictionary.valid?
-                  dictionary.errors[:description].should eq([ "is already taken" ])
+                  expect(dictionary.errors[:description]).to eq([ "is already taken" ])
                 end
               end
             end
@@ -446,7 +389,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              dictionary.should be_valid
+              expect(dictionary).to be_valid
             end
 
             context "when subsequently cloning the document" do
@@ -456,7 +399,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false for the clone" do
-                clone.should_not be_valid
+                expect(clone).to_not be_valid
               end
             end
           end
@@ -474,12 +417,12 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false" do
-                dictionary.should_not be_valid
+                expect(dictionary).to_not be_valid
               end
 
               it "adds the uniqueness error" do
                 dictionary.valid?
-                dictionary.errors[:name].should eq([ "is already taken" ])
+                expect(dictionary.errors[:name]).to eq([ "is already taken" ])
               end
             end
 
@@ -492,7 +435,7 @@ describe Mongoid::Validations::UniquenessValidator do
                 end
 
                 it "returns true" do
-                  dictionary.should be_valid
+                  expect(dictionary).to be_valid
                 end
               end
 
@@ -511,7 +454,7 @@ describe Mongoid::Validations::UniquenessValidator do
                 end
 
                 it "returns true" do
-                  from_db.should be_valid
+                  expect(from_db).to be_valid
                 end
 
                 it "does not touch the database" do
@@ -540,7 +483,7 @@ describe Mongoid::Validations::UniquenessValidator do
             context "when the attribute is not unique" do
 
               before do
-                Dictionary.with(safe: true).create(name: "Oxford")
+                Dictionary.create(name: "Oxford")
               end
 
               let(:dictionary) do
@@ -548,7 +491,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false" do
-                dictionary.should_not be_valid
+                expect(dictionary).to_not be_valid
               end
             end
           end
@@ -575,7 +518,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              dictionary.should be_valid
+              expect(dictionary).to be_valid
             end
           end
 
@@ -590,7 +533,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              dictionary.should be_valid
+              expect(dictionary).to be_valid
             end
           end
 
@@ -605,7 +548,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              dictionary.should be_valid
+              expect(dictionary).to be_valid
             end
           end
 
@@ -620,7 +563,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              dictionary.should be_valid
+              expect(dictionary).to be_valid
             end
           end
 
@@ -637,12 +580,12 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false" do
-                dictionary.should_not be_valid
+                expect(dictionary).to_not be_valid
               end
 
               it "adds the uniqueness errors" do
                 dictionary.valid?
-                dictionary.errors[:name].should eq([ "is already taken" ])
+                expect(dictionary.errors[:name]).to eq([ "is already taken" ])
               end
             end
 
@@ -653,7 +596,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                dictionary.should be_valid
+                expect(dictionary).to be_valid
               end
             end
           end
@@ -680,7 +623,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              dictionary.should be_valid
+              expect(dictionary).to be_valid
             end
           end
 
@@ -695,7 +638,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              dictionary.should be_valid
+              expect(dictionary).to be_valid
             end
           end
 
@@ -720,7 +663,7 @@ describe Mongoid::Validations::UniquenessValidator do
 
             it "should set an error for associated object not being unique" do
               item.update_attributes(folder_id: personal_folder.id)
-              item.errors.messages[:name].first.should eq("is already taken")
+              expect(item.errors.messages[:name].first).to eq("is already taken")
             end
           end
 
@@ -735,7 +678,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              dictionary.should be_valid
+              expect(dictionary).to be_valid
             end
           end
 
@@ -750,7 +693,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              dictionary.should be_valid
+              expect(dictionary).to be_valid
             end
           end
 
@@ -767,12 +710,12 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false" do
-                dictionary.should_not be_valid
+                expect(dictionary).to_not be_valid
               end
 
               it "adds the uniqueness errors" do
                 dictionary.valid?
-                dictionary.errors[:name].should eq([ "is already taken" ])
+                expect(dictionary.errors[:name]).to eq([ "is already taken" ])
               end
             end
 
@@ -783,7 +726,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                dictionary.should be_valid
+                expect(dictionary).to be_valid
               end
             end
 
@@ -806,12 +749,12 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false" do
-                dictionary.should_not be_valid
+                expect(dictionary).to_not be_valid
               end
 
               it "adds the uniqueness errors" do
                 dictionary.valid?
-                dictionary.errors[:name].should eq([ "is already taken" ])
+                expect(dictionary.errors[:name]).to eq([ "is already taken" ])
               end
             end
           end
@@ -838,7 +781,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              dictionary.should be_valid
+              expect(dictionary).to be_valid
             end
           end
 
@@ -861,7 +804,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              dictionary.should be_valid
+              expect(dictionary).to be_valid
             end
           end
 
@@ -876,7 +819,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              dictionary.should be_valid
+              expect(dictionary).to be_valid
             end
           end
 
@@ -899,7 +842,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              dictionary.should be_valid
+              expect(dictionary).to be_valid
             end
           end
 
@@ -924,12 +867,12 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false" do
-                dictionary.should_not be_valid
+                expect(dictionary).to_not be_valid
               end
 
               it "adds the uniqueness errors" do
                 dictionary.valid?
-                dictionary.errors[:name].should eq([ "is already taken" ])
+                expect(dictionary.errors[:name]).to eq([ "is already taken" ])
               end
             end
 
@@ -944,7 +887,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                dictionary.should be_valid
+                expect(dictionary).to be_valid
               end
             end
           end
@@ -971,7 +914,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              dictionary.should be_valid
+              expect(dictionary).to be_valid
             end
           end
 
@@ -988,12 +931,12 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false" do
-                dictionary.should_not be_valid
+                expect(dictionary).to_not be_valid
               end
 
               it "adds the uniqueness error" do
                 dictionary.valid?
-                dictionary.errors[:name].should eq([ "is already taken" ])
+                expect(dictionary.errors[:name]).to eq([ "is already taken" ])
               end
             end
 
@@ -1004,7 +947,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                dictionary.should be_valid
+                expect(dictionary).to be_valid
               end
             end
           end
@@ -1033,7 +976,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                dictionary.should be_valid
+                expect(dictionary).to be_valid
               end
             end
 
@@ -1048,7 +991,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                dictionary.should be_valid
+                expect(dictionary).to be_valid
               end
             end
           end
@@ -1066,12 +1009,12 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false" do
-                dictionary.should_not be_valid
+                expect(dictionary).to_not be_valid
               end
 
               it "adds the uniqueness error" do
                 dictionary.valid?
-                dictionary.errors[:name].should eq([ "is already taken" ])
+                expect(dictionary.errors[:name]).to eq([ "is already taken" ])
               end
             end
 
@@ -1082,7 +1025,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                dictionary.should be_valid
+                expect(dictionary).to be_valid
               end
             end
           end
@@ -1109,7 +1052,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              dictionary.should be_valid
+              expect(dictionary).to be_valid
             end
           end
         end
@@ -1135,7 +1078,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              dictionary.should be_valid
+              expect(dictionary).to be_valid
             end
           end
         end
@@ -1164,7 +1107,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              login.should be_valid
+              expect(login).to be_valid
             end
           end
 
@@ -1181,12 +1124,12 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false" do
-                login.should_not be_valid
+                expect(login).to_not be_valid
               end
 
               it "adds the uniqueness error" do
                 login.valid?
-                login.errors[:username].should eq([ "is already taken" ])
+                expect(login.errors[:username]).to eq([ "is already taken" ])
               end
             end
 
@@ -1197,7 +1140,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                login.should be_valid
+                expect(login).to be_valid
               end
             end
           end
@@ -1224,7 +1167,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              login.should be_valid
+              expect(login).to be_valid
             end
           end
 
@@ -1239,7 +1182,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              login.should be_valid
+              expect(login).to be_valid
             end
           end
 
@@ -1254,7 +1197,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              login.should be_valid
+              expect(login).to be_valid
             end
           end
 
@@ -1269,7 +1212,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              login.should be_valid
+              expect(login).to be_valid
             end
           end
 
@@ -1286,12 +1229,12 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false" do
-                login.should_not be_valid
+                expect(login).to_not be_valid
               end
 
               it "adds the uniqueness errors" do
                 login.valid?
-                login.errors[:username].should eq([ "is already taken" ])
+                expect(login.errors[:username]).to eq([ "is already taken" ])
               end
             end
 
@@ -1302,7 +1245,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                login.should be_valid
+                expect(login).to be_valid
               end
             end
           end
@@ -1329,7 +1272,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              login.should be_valid
+              expect(login).to be_valid
             end
           end
 
@@ -1346,12 +1289,12 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false" do
-                login.should_not be_valid
+                expect(login).to_not be_valid
               end
 
               it "adds the uniqueness error" do
                 login.valid?
-                login.errors[:username].should eq([ "is already taken" ])
+                expect(login.errors[:username]).to eq([ "is already taken" ])
               end
             end
 
@@ -1362,7 +1305,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                login.should be_valid
+                expect(login).to be_valid
               end
             end
           end
@@ -1391,7 +1334,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                login.should be_valid
+                expect(login).to be_valid
               end
             end
 
@@ -1406,7 +1349,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                login.should be_valid
+                expect(login).to be_valid
               end
             end
           end
@@ -1424,12 +1367,12 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false" do
-                login.should_not be_valid
+                expect(login).to_not be_valid
               end
 
               it "adds the uniqueness error" do
                 login.valid?
-                login.errors[:username].should eq([ "is already taken" ])
+                expect(login.errors[:username]).to eq([ "is already taken" ])
               end
             end
 
@@ -1440,7 +1383,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                login.should be_valid
+                expect(login).to be_valid
               end
             end
           end
@@ -1467,7 +1410,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              login.should be_valid
+              expect(login).to be_valid
             end
           end
         end
@@ -1493,7 +1436,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              login.should be_valid
+              expect(login).to be_valid
             end
           end
         end
@@ -1587,7 +1530,7 @@ describe Mongoid::Validations::UniquenessValidator do
           end
 
           it "returns true" do
-            def_two.should be_valid
+            expect(def_two).to be_valid
           end
         end
       end
@@ -1615,7 +1558,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              definition.should be_valid
+              expect(definition).to be_valid
             end
           end
 
@@ -1632,12 +1575,12 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false" do
-                definition.should_not be_valid
+                expect(definition).to_not be_valid
               end
 
               it "adds the uniqueness error" do
                 definition.valid?
-                definition.errors[:description].should eq([ "is already taken" ])
+                expect(definition.errors[:description]).to eq([ "is already taken" ])
               end
             end
 
@@ -1648,7 +1591,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                definition.should be_valid
+                expect(definition).to be_valid
               end
             end
           end
@@ -1677,7 +1620,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              definition.should be_valid
+              expect(definition).to be_valid
             end
           end
 
@@ -1698,7 +1641,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              definition.should be_valid
+              expect(definition).to be_valid
             end
           end
 
@@ -1716,7 +1659,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              definition.should be_valid
+              expect(definition).to be_valid
             end
           end
 
@@ -1737,7 +1680,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              definition.should be_valid
+              expect(definition).to be_valid
             end
           end
 
@@ -1760,12 +1703,12 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false" do
-                definition.should_not be_valid
+                expect(definition).to_not be_valid
               end
 
               it "adds the uniqueness errors" do
                 definition.valid?
-                definition.errors[:description].should eq([ "is already taken" ])
+                expect(definition.errors[:description]).to eq([ "is already taken" ])
               end
             end
 
@@ -1779,7 +1722,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                definition.should be_valid
+                expect(definition).to be_valid
               end
             end
           end
@@ -1809,7 +1752,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              definition.should be_valid
+              expect(definition).to be_valid
             end
           end
 
@@ -1832,7 +1775,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              definition.should be_valid
+              expect(definition).to be_valid
             end
           end
 
@@ -1850,7 +1793,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              definition.should be_valid
+              expect(definition).to be_valid
             end
           end
 
@@ -1873,7 +1816,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              definition.should be_valid
+              expect(definition).to be_valid
             end
           end
 
@@ -1898,12 +1841,12 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false" do
-                definition.should_not be_valid
+                expect(definition).to_not be_valid
               end
 
               it "adds the uniqueness errors" do
                 definition.valid?
-                definition.errors[:description].should eq([ "is already taken" ])
+                expect(definition.errors[:description]).to eq([ "is already taken" ])
               end
             end
 
@@ -1918,7 +1861,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                definition.should be_valid
+                expect(definition).to be_valid
               end
             end
           end
@@ -1945,7 +1888,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              definition.should be_valid
+              expect(definition).to be_valid
             end
           end
 
@@ -1962,12 +1905,12 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false" do
-                definition.should_not be_valid
+                expect(definition).to_not be_valid
               end
 
               it "adds the uniqueness error" do
                 definition.valid?
-                definition.errors[:description].should eq([ "is already taken" ])
+                expect(definition.errors[:description]).to eq([ "is already taken" ])
               end
             end
 
@@ -1978,7 +1921,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                definition.should be_valid
+                expect(definition).to be_valid
               end
             end
           end
@@ -2007,7 +1950,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                definition.should be_valid
+                expect(definition).to be_valid
               end
             end
 
@@ -2022,7 +1965,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                definition.should be_valid
+                expect(definition).to be_valid
               end
             end
           end
@@ -2040,12 +1983,12 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false" do
-                definition.should_not be_valid
+                expect(definition).to_not be_valid
               end
 
               it "adds the uniqueness error" do
                 definition.valid?
-                definition.errors[:description].should eq([ "is already taken" ])
+                expect(definition.errors[:description]).to eq([ "is already taken" ])
               end
             end
 
@@ -2056,7 +1999,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                definition.should be_valid
+                expect(definition).to be_valid
               end
             end
           end
@@ -2083,7 +2026,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              definition.should be_valid
+              expect(definition).to be_valid
             end
           end
         end
@@ -2109,7 +2052,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              definition.should be_valid
+              expect(definition).to be_valid
             end
           end
         end
@@ -2224,7 +2167,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              word_origin.should be_valid
+              expect(word_origin).to be_valid
             end
           end
 
@@ -2241,12 +2184,12 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns false" do
-                word_origin.should_not be_valid
+                expect(word_origin).to_not be_valid
               end
 
               it "adds the uniqueness error" do
                 word_origin.valid?
-                word_origin.errors[:origin_id].should eq([ "is already taken" ])
+                expect(word_origin.errors[:origin_id]).to eq([ "is already taken" ])
               end
             end
 
@@ -2257,7 +2200,7 @@ describe Mongoid::Validations::UniquenessValidator do
               end
 
               it "returns true" do
-                word_origin.should be_valid
+                expect(word_origin).to be_valid
               end
             end
           end
@@ -2284,7 +2227,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              word_origin.should be_valid
+              expect(word_origin).to be_valid
             end
           end
         end
@@ -2310,7 +2253,7 @@ describe Mongoid::Validations::UniquenessValidator do
             end
 
             it "returns true" do
-              word_origin.should be_valid
+              expect(word_origin).to be_valid
             end
           end
         end
@@ -2332,7 +2275,7 @@ describe Mongoid::Validations::UniquenessValidator do
       end
 
       it "always returns true" do
-        pronunciation.should be_valid
+        expect(pronunciation).to be_valid
       end
     end
   end
@@ -2348,7 +2291,7 @@ describe Mongoid::Validations::UniquenessValidator do
     end
 
     it "adds the validation only to the instance" do
-      validators.should eq([ described_class ])
+      expect(validators).to eq([ described_class ])
     end
   end
 
@@ -2369,8 +2312,8 @@ describe Mongoid::Validations::UniquenessValidator do
 
     it "should be invalid" do
       subclass_document_with_duplicated_name.tap do |d|
-        d.should be_invalid
-        d.errors[:name].should eq([ "is already taken" ])
+        expect(d).to be_invalid
+        expect(d.errors[:name]).to eq([ "is already taken" ])
       end
     end
   end
@@ -2383,7 +2326,7 @@ describe Mongoid::Validations::UniquenessValidator do
     end
 
     let!(:person) do
-      Person.create(ssn: "132-11-1111", username: "testing-1234")
+      Person.create(ssn: "132-11-1111", username: "aaasdaffff")
     end
 
     after do
@@ -2392,8 +2335,8 @@ describe Mongoid::Validations::UniquenessValidator do
 
     it "transfers the options to the cloned session" do
       expect {
-        Person.with(safe: true).create!(ssn: "132-11-1111", username: "testing-121111")
-      }.to raise_error(Moped::Errors::OperationFailure)
+        Person.create!(ssn: "132-11-1111", username: "asdfsdfA")
+      }.to raise_error
     end
   end
 end