mongoid 3.1.6 → 4.0.2

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

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Validations::FormatValidator do
+describe Mongoid::Validatable::FormatValidator do
 
   describe "#validate_each" do
 
@@ -21,7 +21,7 @@ describe Mongoid::Validations::FormatValidator 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::FormatValidator do
         end
 
         it "adds errors" do
-          product.errors[:brand_name].should eq(["is invalid"])
+          expect(product.errors[:brand_name]).to eq(["is invalid"])
         end
       end
     end
@@ -50,7 +50,7 @@ describe Mongoid::Validations::FormatValidator do
         end
 
         it "adds no errors" do
-          product.errors[:website].should be_empty
+          expect(product.errors[:website]).to be_empty
         end
       end
 
@@ -64,7 +64,7 @@ describe Mongoid::Validations::FormatValidator do
         end
 
         it "adds errors" do
-          product.errors[:website].should eq(["is invalid"])
+          expect(product.errors[:website]).to eq(["is invalid"])
         end
       end
 
@@ -75,7 +75,7 @@ describe Mongoid::Validations::FormatValidator do
         end
 
         it "adds errors" do
-          product.errors[:website].should eq(["is invalid"])
+          expect(product.errors[:website]).to eq(["is invalid"])
         end
       end
     end

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

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Validations::LengthValidator do
+describe Mongoid::Validatable::LengthValidator do
 
   describe "#validate_each" do
 
@@ -21,7 +21,7 @@ describe Mongoid::Validations::LengthValidator 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::LengthValidator do
         end
 
         it "adds errors" do
-          product.errors[:brand_name].should eq(
+          expect(product.errors[:brand_name]).to eq(
             ["is too long (maximum is 5 characters)"]
           )
         end
@@ -52,7 +52,7 @@ describe Mongoid::Validations::LengthValidator do
         end
 
         it "adds no errors" do
-          product.errors[:website].should be_empty
+          expect(product.errors[:website]).to be_empty
         end
       end
 
@@ -66,7 +66,7 @@ describe Mongoid::Validations::LengthValidator do
         end
 
         it "adds errors" do
-          product.errors[:website].should eq(
+          expect(product.errors[:website]).to eq(
             ["is too long (maximum is 5 characters)"]
           )
         end
@@ -79,7 +79,7 @@ describe Mongoid::Validations::LengthValidator do
         end
 
         it "adds errors" do
-          product.errors[:website].should eq(
+          expect(product.errors[:website]).to eq(
             ["is too long (maximum is 5 characters)"]
           )
         end
@@ -101,7 +101,7 @@ describe Mongoid::Validations::LengthValidator do
           end
 
           it "adds no errors" do
-            product.errors[:sku].should be_empty
+            expect(product.errors[:sku]).to be_empty
           end
         end
 
@@ -112,7 +112,7 @@ describe Mongoid::Validations::LengthValidator do
           end
 
           it "adds errors" do
-            product.errors[:sku].should eq(["is too long (maximum is 5 characters)"])
+            expect(product.errors[:sku]).to eq(["is too long (maximum is 5 characters)"])
           end
         end
       end
@@ -130,7 +130,7 @@ describe Mongoid::Validations::LengthValidator do
           end
 
           it "adds no errors" do
-            product.errors[:stock_keeping_unit].should be_empty
+            expect(product.errors[:stock_keeping_unit]).to be_empty
           end
         end
 
@@ -141,7 +141,7 @@ describe Mongoid::Validations::LengthValidator do
           end
 
           it "adds errors" do
-            product.errors[:stock_keeping_unit].should eq(["is too long (maximum is 5 characters)"])
+            expect(product.errors[:stock_keeping_unit]).to eq(["is too long (maximum is 5 characters)"])
           end
         end
       end
@@ -159,7 +159,7 @@ describe Mongoid::Validations::LengthValidator do
           end
 
           it "adds no errors" do
-            product.errors[:tagline].should be_empty
+            expect(product.errors[:tagline]).to be_empty
           end
         end
 
@@ -173,7 +173,7 @@ describe Mongoid::Validations::LengthValidator do
           end
 
           it "adds errors" do
-            product.errors[:tagline].should eq(["is too long (maximum is 5 characters)"])
+            expect(product.errors[:tagline]).to eq(["is too long (maximum is 5 characters)"])
           end
         end
 
@@ -184,7 +184,7 @@ describe Mongoid::Validations::LengthValidator do
           end
 
           it "adds errors" do
-            product.errors[:tagline].should eq(["is too long (maximum is 5 characters)"])
+            expect(product.errors[:tagline]).to eq(["is too long (maximum is 5 characters)"])
           end
         end
       end
@@ -215,7 +215,7 @@ describe Mongoid::Validations::LengthValidator 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}/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
@@ -136,7 +136,7 @@ describe Mongoid::Validations::PresenceValidator do
           end
 
           it "adds no errors" do
-            product.errors[:sku].should be_empty
+            expect(product.errors[:sku]).to be_empty
           end
         end
 
@@ -147,7 +147,7 @@ describe Mongoid::Validations::PresenceValidator do
           end
 
           it "adds errors" do
-            product.errors[:sku].should eq(["can't be blank"])
+            expect(product.errors[:sku]).to eq(["can't be blank"])
           end
         end
       end
@@ -161,7 +161,7 @@ describe Mongoid::Validations::PresenceValidator do
           end
 
           it "adds no errors" do
-            product.errors[:stock_keeping_unit].should be_empty
+            expect(product.errors[:stock_keeping_unit]).to be_empty
           end
         end
 
@@ -172,7 +172,7 @@ describe Mongoid::Validations::PresenceValidator do
           end
 
           it "adds errors" do
-            product.errors[:stock_keeping_unit].should eq(["can't be blank"])
+            expect(product.errors[:stock_keeping_unit]).to eq(["can't be blank"])
           end
         end
       end
@@ -186,7 +186,7 @@ describe Mongoid::Validations::PresenceValidator do
           end
 
           it "adds no errors" do
-            product.errors[:tagline].should be_empty
+            expect(product.errors[:tagline]).to be_empty
           end
         end
 
@@ -200,7 +200,7 @@ describe Mongoid::Validations::PresenceValidator do
           end
 
           it "adds errors" do
-            product.errors[:tagline].should eq(["can't be blank in fr"])
+            expect(product.errors[:tagline]).to eq(["can't be blank in fr"])
           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