mongoid 3.1.7 → 4.0.0.alpha1

data/spec/mongoid/{validations_spec.rb → validatable_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Validations do
+describe Mongoid::Validatable do
 
   let(:account) do
     Account.new(name: "Testing a really long name.")
@@ -23,7 +23,7 @@ describe Mongoid::Validations do
       end
 
       it "returns the value" do
-        value.should eq("Mr")
+        expect(value).to eq("Mr")
       end
     end
 
@@ -42,7 +42,7 @@ describe Mongoid::Validations do
       end
 
       it "returns the value" do
-        value.should eq([ address ])
+        expect(value).to eq([ address ])
       end
     end
 
@@ -57,7 +57,7 @@ describe Mongoid::Validations do
       end
 
       it "does not error on the read" do
-        value.should be_empty
+        expect(value).to be_empty
       end
     end
   end
@@ -67,7 +67,7 @@ describe Mongoid::Validations do
     context "when provided a context" do
 
       it "uses the provided context" do
-        account.should be_valid(:update)
+        expect(account).to be_valid(:update)
       end
     end
 
@@ -76,7 +76,7 @@ describe Mongoid::Validations do
       context "when the document is new" do
 
         it "defaults the context to :create" do
-          account.should_not be_valid
+          expect(account).to_not be_valid
         end
       end
 
@@ -89,7 +89,7 @@ describe Mongoid::Validations do
         end
 
         it "defaults the context to :update" do
-          account.should be_valid
+          expect(account).to be_valid
         end
       end
     end
@@ -110,7 +110,7 @@ describe Mongoid::Validations do
       end
 
       it "loads the required association from the db" do
-        from_db.should be_valid
+        expect(from_db).to be_valid
       end
     end
 
@@ -135,20 +135,20 @@ describe Mongoid::Validations do
           context "when validating once" do
 
             it "returns false" do
-              movie.should_not be_valid
+              expect(movie).to_not be_valid
             end
 
             it "adds the errors to the document" do
               movie.valid?
-              movie.errors[:ratings].should eq([ "is invalid" ])
+              expect(movie.errors[:ratings]).to eq([ "is invalid" ])
             end
           end
 
           context "when validating multiple times" do
 
             it "returns false every time" do
-              movie.should_not be_valid
-              movie.should_not be_valid
+              expect(movie).to_not be_valid
+              expect(movie).to_not be_valid
             end
           end
         end
@@ -181,20 +181,20 @@ describe Mongoid::Validations do
           context "when validating once" do
 
             it "returns false" do
-              person.should_not be_valid
+              expect(person).to_not be_valid
             end
 
             it "adds the errors to the document" do
               person.valid?
-              person.errors[:services].should eq([ "is invalid" ])
+              expect(person.errors[:services]).to eq([ "is invalid" ])
             end
           end
 
           context "when validating multiple times" do
 
             it "returns false every time" do
-              person.should_not be_valid
-              person.should_not be_valid
+              expect(person).to_not be_valid
+              expect(person).to_not be_valid
             end
           end
         end
@@ -217,8 +217,8 @@ describe Mongoid::Validations do
       end
 
       it "adds the validator" do
-        klass.validators.first.should be_a(
-          Mongoid::Validations::AssociatedValidator
+        expect(klass.validators.first).to be_a(
+          Mongoid::Validatable::AssociatedValidator
         )
       end
     end
@@ -230,8 +230,8 @@ describe Mongoid::Validations do
       end
 
       it "adds the validator" do
-        klass.validators.first.should be_a(
-          Mongoid::Validations::AssociatedValidator
+        expect(klass.validators.first).to be_a(
+          Mongoid::Validatable::AssociatedValidator
         )
       end
     end
@@ -252,8 +252,8 @@ describe Mongoid::Validations do
       end
 
       it "adds the validator" do
-        klass.validators.first.should be_a(
-          Mongoid::Validations::UniquenessValidator
+        expect(klass.validators.first).to be_a(
+          Mongoid::Validatable::UniquenessValidator
         )
       end
     end
@@ -265,8 +265,8 @@ describe Mongoid::Validations do
       end
 
       it "adds the validator" do
-        klass.validators.first.should be_a(
-          Mongoid::Validations::UniquenessValidator
+        expect(klass.validators.first).to be_a(
+          Mongoid::Validatable::UniquenessValidator
         )
       end
     end
@@ -287,8 +287,8 @@ describe Mongoid::Validations do
       end
 
       it "adds the validator" do
-        klass.validators.first.should be_a(
-          Mongoid::Validations::PresenceValidator
+        expect(klass.validators.first).to be_a(
+          Mongoid::Validatable::PresenceValidator
         )
       end
     end
@@ -300,8 +300,8 @@ describe Mongoid::Validations do
       end
 
       it "adds the validator" do
-        klass.validators.first.should be_a(
-          Mongoid::Validations::PresenceValidator
+        expect(klass.validators.first).to be_a(
+          Mongoid::Validatable::PresenceValidator
         )
       end
     end

data/spec/mongoid_spec.rb

@@ -7,7 +7,7 @@ describe Mongoid do
     context "when no block supplied" do
 
       it "returns the config singleton" do
-        Mongoid.configure.should eq(Mongoid::Config)
+        expect(Mongoid.configure).to eq(Mongoid::Config)
       end
     end
 
@@ -15,18 +15,18 @@ describe Mongoid do
 
       before do
         Mongoid.configure do |config|
-          config.allow_dynamic_fields = false
+          config.preload_models = true
         end
       end
 
       after do
         Mongoid.configure do |config|
-          config.allow_dynamic_fields = true
+          config.preload_models = false
         end
       end
 
       it "sets the values on the config instance" do
-        Mongoid.allow_dynamic_fields.should be_false
+        expect(Mongoid.preload_models).to be true
       end
     end
   end
@@ -34,7 +34,7 @@ describe Mongoid do
   describe ".default_session" do
 
     it "returns the default session" do
-      Mongoid.default_session.should eq(Mongoid::Sessions.default)
+      expect(Mongoid.default_session).to eq(Mongoid::Sessions.default)
     end
   end
 
@@ -52,7 +52,7 @@ describe Mongoid do
     it "disconnects from all active sessions" do
       sessions.each do |session|
         session.cluster.nodes.each do |node|
-          node.send(:connected?).should be_false
+          expect(node.send(:connected?)).to be false
         end
       end
     end
@@ -61,14 +61,14 @@ describe Mongoid do
   describe ".session" do
 
     it "returns the named session" do
-      Mongoid.session(:default).should eq(Mongoid::Sessions.default)
+      expect(Mongoid.session(:default)).to eq(Mongoid::Sessions.default)
     end
   end
 
   describe ".models" do
 
     it "returns the list of known models" do
-      Mongoid.models.should include(Band)
+      expect(Mongoid.models).to include(Band)
     end
   end
 end

data/spec/rails/mongoid_spec.rb

@@ -4,19 +4,18 @@ describe "Rails::Mongoid" do
 
   before(:all) do
     require "rails/mongoid"
+    ::Mongoid.models.delete_if do |model|
+      ![ User, Account, Address ].include?(model)
+    end
   end
 
   describe ".create_indexes" do
 
-    let(:pattern) do
-      "spec/app/models/**/*.rb"
-    end
-
     let(:logger) do
-      stub
+      double
     end
 
-    let(:klass) do
+    let!(:klass) do
       User
     end
 
@@ -25,11 +24,7 @@ describe "Rails::Mongoid" do
     end
 
     let(:indexes) do
-      Rails::Mongoid.create_indexes(pattern)
-    end
-
-    before do
-      Dir.should_receive(:glob).once.with(pattern).and_return(model_paths)
+      Rails::Mongoid.create_indexes
     end
 
     context "with ordinary Rails models" do
@@ -42,10 +37,6 @@ describe "Rails::Mongoid" do
 
     context "with a model without indexes" do
 
-      let(:model_paths) do
-        [ "spec/app/models/account.rb" ]
-      end
-
       let(:klass) do
         Account
       end
@@ -59,7 +50,6 @@ describe "Rails::Mongoid" do
     context "when an exception is raised" do
 
       it "is not swallowed" do
-        Rails::Mongoid.should_receive(:determine_model).and_return(klass)
         klass.should_receive(:create_indexes).and_raise(ArgumentError)
         expect { indexes }.to raise_error(ArgumentError)
       end
@@ -67,16 +57,12 @@ describe "Rails::Mongoid" do
 
     context "when index is defined on embedded model" do
 
-      let(:klass) do
+      let!(:klass) do
         Address
       end
 
-      let(:model_paths) do
-        [ "spec/app/models/address.rb" ]
-      end
-
       before do
-        klass.index_options = { city: {} }
+        klass.index(street: 1)
       end
 
       it "does nothing, but logging" do
@@ -84,101 +70,98 @@ describe "Rails::Mongoid" do
         indexes
       end
     end
-
-    context "when index is defined on self-embedded (cyclic) model" do
-      let(:klass) do
-        Draft
-      end
-
-      let(:model_paths) do
-        [ "spec/app/models/draft.rb" ]
-      end
-
-      it "creates the indexes for the models" do
-        klass.should_receive(:create_indexes).once
-        indexes
-      end      
-    end
   end
 
-  describe ".remove_indexes" do
+  describe ".undefined_indexes" do
 
-    let(:pattern) do
-      "spec/app/models/**/*.rb"
+    before(:each) do
+      Rails::Mongoid.create_indexes
     end
 
-    let(:logger) do
-      stub
+    let(:indexes) do
+      Rails::Mongoid.undefined_indexes
     end
 
-    let(:klass) do
-      User
+    it "returns the removed indexes" do
+      expect(indexes).to be_empty
     end
 
-    let(:model_paths) do
-      [ "spec/app/models/user.rb" ]
+    context "with extra index on model collection" do
+
+      before(:each) do
+        User.collection.indexes.create(account_expires: 1)
+      end
+
+      let(:names) do
+        indexes[User].map{ |index| index['name'] }
+      end
+
+      it "should have single index returned" do
+        expect(names).to eq(['account_expires_1'])
+      end
     end
+  end
+
+  describe ".remove_undefined_indexes" do
 
-    before do
-      Dir.should_receive(:glob).with(pattern).exactly(2).times.and_return(model_paths)
+    let(:logger) do
+      double
     end
 
     let(:indexes) do
-      klass.collection.indexes
+      User.collection.indexes
     end
 
-    before :each do
-      Rails::Mongoid.create_indexes(pattern)
-      Rails::Mongoid.remove_indexes(pattern)
+    before(:each) do
+      Rails::Mongoid.create_indexes
+      indexes.create(account_expires: 1)
+      Rails::Mongoid.remove_undefined_indexes
     end
 
-    it "removes indexes from klass" do
-      indexes.reject{ |doc| doc["name"] == "_id_" }.should be_empty
+    let(:removed_indexes) do
+      Rails::Mongoid.undefined_indexes
     end
 
-    it "leaves _id index untouched" do
-      indexes.select{ |doc| doc["name"] == "_id_" }.should_not be_empty
+    it "returns the removed indexes" do
+      expect(removed_indexes).to be_empty
     end
   end
 
-  describe ".models" do
-
-    let(:pattern) do
-      "spec/app/models/**/*.rb"
-    end
+  describe ".remove_indexes" do
 
     let(:logger) do
-      stub
+      double
     end
 
-    let(:klass) do
+    let!(:klass) do
       User
     end
 
-    let(:model_paths) do
-      [ "spec/app/models/user.rb" ]
+    let(:indexes) do
+      klass.collection.indexes
     end
 
-    let(:models) do
-      Rails::Mongoid.models(pattern)
+    before :each do
+      Rails::Mongoid.create_indexes
+      Rails::Mongoid.remove_indexes
     end
 
-    before do
-      Dir.should_receive(:glob).with(pattern).once.and_return(model_paths)
+    it "removes indexes from klass" do
+      expect(indexes.reject{ |doc| doc["name"] == "_id_" }).to be_empty
     end
 
-    it "returns models which files matching the pattern" do
-      models.should eq([klass])
+    it "leaves _id index untouched" do
+      expect(indexes.select{ |doc| doc["name"] == "_id_" }).to_not be_empty
     end
   end
 
   describe ".determine_model" do
 
     let(:logger) do
-      stub
+      double
     end
 
-    let(:klass) do
+    let!(:klass) do
       User
     end
 
@@ -212,7 +195,7 @@ describe "Rails::Mongoid" do
       end
 
       it "returns nil" do
-        model.should be_nil
+        expect(model).to be_nil
       end
     end
 
@@ -223,7 +206,7 @@ describe "Rails::Mongoid" do
       end
 
       it "returns nil" do
-        model.should be_nil
+        expect(model).to be_nil
       end
     end
 
@@ -234,7 +217,7 @@ describe "Rails::Mongoid" do
       end
 
       it "returns nil" do
-        model.should be_nil
+        expect(model).to be_nil
       end
     end
 
@@ -249,7 +232,7 @@ describe "Rails::Mongoid" do
       end
 
       it "returns nil" do
-        model.should be_nil
+        expect(model).to be_nil
       end
     end
 
@@ -258,7 +241,7 @@ describe "Rails::Mongoid" do
       context "when file is from normal model" do
 
         it "returns klass" do
-          model.should eq(klass)
+          expect(model).to eq(klass)
         end
       end
 
@@ -274,7 +257,9 @@ describe "Rails::Mongoid" do
 
         it "logs the class without an error" do
           logger.should_receive(:info)
-          expect { model.should eq(klass) }.not_to raise_error(NameError)
+          expect {
+            expect(model).to be_nil
+          }.not_to raise_error
         end
       end
     end
@@ -289,7 +274,7 @@ describe "Rails::Mongoid" do
 
         it "returns klass" do
           logger.should_receive(:info)
-          model.should eq(klass)
+          expect(model).to eq(klass)
         end
       end
 
@@ -304,7 +289,7 @@ describe "Rails::Mongoid" do
         end
 
         it "returns klass in module" do
-          model.should eq(klass)
+          expect(model).to eq(klass)
         end
       end
 
@@ -319,7 +304,7 @@ describe "Rails::Mongoid" do
         end
 
         it "returns klass in module" do
-          model.should eq(klass)
+          expect(model).to eq(klass)
         end
       end
     end
@@ -335,7 +320,7 @@ describe "Rails::Mongoid" do
       end
 
       it "requires the models by base name from the engine's app/models dir" do
-        model.should eq(klass)
+        expect(model).to eq(klass)
       end
     end
   end
@@ -343,11 +328,11 @@ describe "Rails::Mongoid" do
   describe ".preload_models" do
 
     let(:app) do
-      stub(config: config)
+      double(config: config)
     end
 
     let(:config) do
-      stub(paths: paths)
+      double(paths: paths)
     end
 
     let(:paths) do
@@ -421,11 +406,11 @@ describe "Rails::Mongoid" do
   describe ".load_models" do
 
     let(:app) do
-      stub(config: config)
+      double(config: config)
     end
 
     let(:config) do
-      stub(paths: paths)
+      double(paths: paths)
     end
 
     let(:paths) do