mongoid 3.1.6 → 4.0.2

data/spec/mongoid/fields/internal/foreign_keys/array_spec.rb

@@ -47,7 +47,7 @@ require "spec_helper"
       # end
 
       # it "adds the current to the modifications" do
-        # mods["preference_ids"].should eq(
+        # expect(mods["preference_ids"]).to eq(
           # [ preference_one.id, preference_three.id ]
         # )
       # end
@@ -57,7 +57,7 @@ require "spec_helper"
   # describe "#eval_default" do
 
     # let(:default) do
-      # [ Moped::BSON::ObjectId.new ]
+      # [ BSON::ObjectId.new ]
     # end
 
     # let(:field) do
@@ -71,11 +71,11 @@ require "spec_helper"
     # end
 
     # it "dups the default value" do
-      # field.eval_default(nil).should_not equal(default)
+      # expect(field.eval_default(nil)).to_not equal(default)
     # end
 
     # it "returns the correct value" do
-      # field.eval_default(nil).should eq(default)
+      # expect(field.eval_default(nil)).to eq(default)
     # end
   # end
 
@@ -92,7 +92,7 @@ require "spec_helper"
     # end
 
     # it "returns true" do
-      # field.should be_foreign_key
+      # expect(field).to be_foreign_key
     # end
   # end
 
@@ -121,7 +121,7 @@ require "spec_helper"
       # context "when provided nil" do
 
         # it "returns an empty array" do
-          # field.serialize(nil).should be_empty
+          # expect(field.serialize(nil)).to be_empty
         # end
       # end
 
@@ -132,29 +132,29 @@ require "spec_helper"
         # end
 
         # it "returns an empty array" do
-          # field.serialize(array).should eq(array)
+          # expect(field.serialize(array)).to eq(array)
         # end
 
         # it "returns the same instance" do
-          # field.serialize(array).should equal(array)
+          # expect(field.serialize(array)).to equal(array)
         # end
       # end
 
       # context "when using object ids" do
 
         # let(:object_id) do
-          # Moped::BSON::ObjectId.new
+          # BSON::ObjectId.new
         # end
 
         # it "performs conversion on the ids if strings" do
-          # field.serialize([object_id.to_s]).should eq([object_id])
+          # expect(field.serialize([object_id.to_s])).to eq([object_id])
         # end
       # end
 
       # context "when not using object ids" do
 
         # let(:object_id) do
-          # Moped::BSON::ObjectId.new
+          # BSON::ObjectId.new
         # end
 
         # before do
@@ -162,21 +162,21 @@ require "spec_helper"
             # :_id,
             # type: String,
             # pre_processed: true,
-            # default: ->{ Moped::BSON::ObjectId.new.to_s }
+            # default: ->{ BSON::ObjectId.new.to_s }
           # )
         # end
 
         # after do
           # Person.field(
             # :_id,
-            # type: Moped::BSON::ObjectId,
+            # type: BSON::ObjectId,
             # pre_processed: true,
-            # default: ->{ Moped::BSON::ObjectId.new }
+            # default: ->{ BSON::ObjectId.new }
           # )
         # end
 
         # it "does not convert" do
-          # field.serialize([object_id.to_s]).should eq([object_id.to_s])
+          # expect(field.serialize([object_id.to_s])).to eq([object_id.to_s])
         # end
       # end
     # end

data/spec/mongoid/fields/internal/foreign_keys/object_spec.rb

@@ -15,7 +15,7 @@ require "spec_helper"
     # end
 
     # it "returns true" do
-      # field.should be_foreign_key
+      # expect(field).to be_foreign_key
     # end
   # end
 
@@ -44,11 +44,11 @@ require "spec_helper"
       # context "when using object ids" do
 
         # let(:object_id) do
-          # Moped::BSON::ObjectId.new
+          # BSON::ObjectId.new
         # end
 
         # it "performs conversion on the ids if strings" do
-          # field.serialize(object_id.to_s).should eq(object_id)
+          # expect(field.serialize(object_id.to_s)).to eq(object_id)
         # end
       # end
 
@@ -59,7 +59,7 @@ require "spec_helper"
           # context "when provided a string" do
 
             # let(:object_id) do
-              # Moped::BSON::ObjectId.new
+              # BSON::ObjectId.new
             # end
 
             # before do
@@ -67,28 +67,28 @@ require "spec_helper"
                 # :_id,
                 # type: String,
                 # pre_processed: true,
-                # default: ->{ Moped::BSON::ObjectId.new.to_s }
+                # default: ->{ BSON::ObjectId.new.to_s }
               # )
             # end
 
             # after do
               # Person.field(
                 # :_id,
-                # type: Moped::BSON::ObjectId,
+                # type: BSON::ObjectId,
                 # pre_processed: true,
-                # default: ->{ Moped::BSON::ObjectId.new }
+                # default: ->{ BSON::ObjectId.new }
               # )
             # end
 
             # it "does not convert" do
-              # field.serialize(object_id.to_s).should eq(object_id.to_s)
+              # expect(field.serialize(object_id.to_s)).to eq(object_id.to_s)
             # end
           # end
 
           # context "when provided a hash" do
 
             # let(:object_id) do
-              # Moped::BSON::ObjectId.new
+              # BSON::ObjectId.new
             # end
 
             # before do
@@ -96,16 +96,16 @@ require "spec_helper"
                 # :_id,
                 # type: String,
                 # pre_processed: true,
-                # default: ->{ Moped::BSON::ObjectId.new.to_s }
+                # default: ->{ BSON::ObjectId.new.to_s }
               # )
             # end
 
             # after do
               # Person.field(
                 # :_id,
-                # type: Moped::BSON::ObjectId,
+                # type: BSON::ObjectId,
                 # pre_processed: true,
-                # default: ->{ Moped::BSON::ObjectId.new }
+                # default: ->{ BSON::ObjectId.new }
               # )
             # end
 
@@ -114,7 +114,7 @@ require "spec_helper"
             # end
 
             # it "does not convert" do
-              # field.serialize(criterion).should eq(
+              # expect(field.serialize(criterion)).to eq(
                 # criterion
               # )
             # end
@@ -132,14 +132,14 @@ require "spec_helper"
             # after do
               # Person.field(
                 # :_id,
-                # type: Moped::BSON::ObjectId,
+                # type: BSON::ObjectId,
                 # pre_processed: true,
-                # default: ->{ Moped::BSON::ObjectId.new }
+                # default: ->{ BSON::ObjectId.new }
               # )
             # end
 
             # it "does not convert" do
-              # field.serialize("1").should eq(1)
+              # expect(field.serialize("1")).to eq(1)
             # end
           # end
 
@@ -152,9 +152,9 @@ require "spec_helper"
             # after do
               # Person.field(
                 # :_id,
-                # type: Moped::BSON::ObjectId,
+                # type: BSON::ObjectId,
                 # pre_processed: true,
-                # default: ->{ Moped::BSON::ObjectId.new }
+                # default: ->{ BSON::ObjectId.new }
               # )
             # end
 
@@ -163,7 +163,7 @@ require "spec_helper"
             # end
 
             # it "does not convert" do
-              # field.serialize(criterion).should eq(
+              # expect(field.serialize(criterion)).to eq(
                 # { "$eq" => 1 }
               # )
             # end
@@ -178,9 +178,9 @@ require "spec_helper"
             # after do
               # Person.field(
                 # :_id,
-                # type: Moped::BSON::ObjectId,
+                # type: BSON::ObjectId,
                 # pre_processed: true,
-                # default: ->{ Moped::BSON::ObjectId.new }
+                # default: ->{ BSON::ObjectId.new }
               # )
             # end
 
@@ -189,7 +189,7 @@ require "spec_helper"
             # end
 
             # it "does not convert" do
-              # field.serialize(criterion).should eq(
+              # expect(field.serialize(criterion)).to eq(
                 # { "$in" => [ 1 ] }
               # )
             # end

data/spec/mongoid/fields/localized_spec.rb

@@ -9,7 +9,7 @@ describe Mongoid::Fields::Localized do
     end
 
     it "defaults to nil" do
-      field.default_val.should be_nil
+      expect(field.default_val).to be_nil
     end
   end
 
@@ -27,7 +27,7 @@ describe Mongoid::Fields::Localized do
       end
 
       it "defaults to the value" do
-        field.default_val.should eq("No translation")
+        expect(field.default_val).to eq("No translation")
       end
     end
 
@@ -43,7 +43,7 @@ describe Mongoid::Fields::Localized do
       end
 
       it "keeps the default in the proper type" do
-        field.default_val.should eq(1)
+        expect(field.default_val).to eq(1)
       end
     end
   end
@@ -63,7 +63,7 @@ describe Mongoid::Fields::Localized do
         end
 
         it "returns nil" do
-          value.should be_nil
+          expect(value).to be_nil
         end
       end
 
@@ -74,7 +74,7 @@ describe Mongoid::Fields::Localized do
         end
 
         it "returns the string from the default locale" do
-          value.should eq("This is a test")
+          expect(value).to eq("This is a test")
         end
       end
 
@@ -95,7 +95,7 @@ describe Mongoid::Fields::Localized do
           end
 
           it "returns the string from the set locale" do
-            value.should eq("This is a test")
+            expect(value).to eq("This is a test")
           end
         end
 
@@ -108,7 +108,7 @@ describe Mongoid::Fields::Localized do
             end
 
             it "returns nil" do
-              value.should be_nil
+              expect(value).to be_nil
             end
           end
 
@@ -132,7 +132,7 @@ describe Mongoid::Fields::Localized do
                 end
 
                 it "returns the fallback translation" do
-                  value.should eq("testing")
+                  expect(value).to eq("testing")
                 end
               end
 
@@ -143,7 +143,7 @@ describe Mongoid::Fields::Localized do
                 end
 
                 it "returns the fallback translation" do
-                  value.should eq("pruebas")
+                  expect(value).to eq("pruebas")
                 end
               end
 
@@ -154,7 +154,7 @@ describe Mongoid::Fields::Localized do
                 end
 
                 it "returns nil" do
-                  value.should be_nil
+                  expect(value).to be_nil
                 end
               end
             end
@@ -170,7 +170,7 @@ describe Mongoid::Fields::Localized do
               end
 
               it "returns nil" do
-                value.should be_nil
+                expect(value).to be_nil
               end
             end
           end
@@ -178,6 +178,21 @@ describe Mongoid::Fields::Localized do
       end
     end
 
+    context "when no type is provided" do
+
+      let(:field) do
+        described_class.new(:description, localize: true)
+      end
+
+      let(:value) do
+        field.demongoize({ "en" => false })
+      end
+
+      it "allows booleans to be returned" do
+        expect(value).to eq(false)
+      end
+    end
+
     context "when the type is not a string" do
 
       let(:field) do
@@ -191,7 +206,7 @@ describe Mongoid::Fields::Localized do
         end
 
         it "returns nil" do
-          value.should be_nil
+          expect(value).to be_nil
         end
       end
 
@@ -202,7 +217,7 @@ describe Mongoid::Fields::Localized do
         end
 
         it "returns the value from the default locale" do
-          value.should eq(100)
+          expect(value).to eq(100)
         end
       end
 
@@ -223,7 +238,7 @@ describe Mongoid::Fields::Localized do
           end
 
           it "returns the value from the set locale" do
-            value.should eq(100)
+            expect(value).to eq(100)
           end
         end
 
@@ -236,7 +251,7 @@ describe Mongoid::Fields::Localized do
             end
 
             it "returns nil" do
-              value.should be_nil
+              expect(value).to be_nil
             end
           end
 
@@ -260,7 +275,7 @@ describe Mongoid::Fields::Localized do
                 end
 
                 it "returns the fallback translation" do
-                  value.should eq(1)
+                  expect(value).to eq(1)
                 end
               end
 
@@ -271,7 +286,7 @@ describe Mongoid::Fields::Localized do
                 end
 
                 it "returns the fallback translation" do
-                  value.should eq(100)
+                  expect(value).to eq(100)
                 end
               end
 
@@ -282,7 +297,7 @@ describe Mongoid::Fields::Localized do
                 end
 
                 it "returns nil" do
-                  value.should be_nil
+                  expect(value).to be_nil
                 end
               end
             end
@@ -298,7 +313,7 @@ describe Mongoid::Fields::Localized do
               end
 
               it "returns nil" do
-                value.should be_nil
+                expect(value).to be_nil
               end
             end
           end
@@ -322,7 +337,7 @@ describe Mongoid::Fields::Localized do
         end
 
         it "returns the string in the default locale" do
-          value.should eq({ "en" => "This is a test" })
+          expect(value).to eq({ "en" => "This is a test" })
         end
       end
 
@@ -341,7 +356,7 @@ describe Mongoid::Fields::Localized do
         end
 
         it "returns the string in the set locale" do
-          value.should eq({ "de" => "This is a test" })
+          expect(value).to eq({ "de" => "This is a test" })
         end
       end
     end
@@ -359,7 +374,7 @@ describe Mongoid::Fields::Localized do
         end
 
         it "returns the value in the default locale" do
-          value.should eq({ "en" => 100 })
+          expect(value).to eq({ "en" => 100 })
         end
       end
 
@@ -378,7 +393,7 @@ describe Mongoid::Fields::Localized do
         end
 
         it "returns the string in the set locale" do
-          value.should eq({ "de" => 100 })
+          expect(value).to eq({ "de" => 100 })
         end
       end
     end