mongoid 4.0.2 → 5.0.0.beta

data/spec/mongoid/document_spec.rb

@@ -251,7 +251,7 @@ describe Mongoid::Document do
         end
 
         it "does not set the default scoping" do
-          expect(audio.likes).to be_nil
+          expect(audio.attributes.except('_id')).to be_empty
         end
       end
     end

data/spec/mongoid/errors/{mixed_session_configuration_spec.rb → mixed_client_configuration_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Errors::MixedSessionConfiguration do
+describe Mongoid::Errors::MixedClientConfiguration do
 
   describe "#message" do
 

data/spec/mongoid/errors/{no_session_config_spec.rb → no_client_config_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Errors::NoSessionConfig do
+describe Mongoid::Errors::NoClientConfig do
 
   describe "#message" do
 
@@ -10,19 +10,19 @@ describe Mongoid::Errors::NoSessionConfig do
 
     it "contains the problem in the message" do
       expect(error.message).to include(
-        "No configuration could be found for a session named 'secondary'."
+        "No configuration could be found for a client named 'secondary'."
       )
     end
 
     it "contains the summary in the message" do
       expect(error.message).to include(
-        "When attempting to create the new session, Mongoid could not find a session"
+        "When attempting to create the new client, Mongoid could not find a client"
       )
     end
 
     it "contains the resolution in the message" do
       expect(error.message).to include(
-        "Double check your mongoid.yml to make sure under the sessions"
+        "Double check your mongoid.yml to make sure under the clients"
       )
     end
   end

data/spec/mongoid/errors/{no_session_database_spec.rb → no_client_database_spec.rb}

@@ -1,22 +1,22 @@
 require "spec_helper"
 
-describe Mongoid::Errors::NoSessionDatabase do
+describe Mongoid::Errors::NoClientDatabase do
 
   describe "#message" do
 
     let(:error) do
-      described_class.new(:secondary, { hosts: [ "localhost:27017" ] })
+      described_class.new(:secondary, { hosts: [ "127.0.0.1:27017" ] })
     end
 
     it "contains the problem in the message" do
       expect(error.message).to include(
-        "No database provided for session configuration: :secondary."
+        "No database provided for client configuration: :secondary."
       )
     end
 
     it "contains the summary in the message" do
       expect(error.message).to include(
-        "Each session configuration must provide a database so Mongoid"
+        "Each client configuration must provide a database so Mongoid"
       )
     end
 

data/spec/mongoid/errors/{no_session_hosts_spec.rb → no_client_hosts_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Errors::NoSessionHosts do
+describe Mongoid::Errors::NoClientHosts do
 
   describe "#message" do
 
@@ -10,13 +10,13 @@ describe Mongoid::Errors::NoSessionHosts do
 
     it "contains the problem in the message" do
       expect(error.message).to include(
-        "No hosts provided for session configuration: :secondary."
+        "No hosts provided for client configuration: :secondary."
       )
     end
 
     it "contains the summary in the message" do
       expect(error.message).to include(
-        "Each session configuration must provide hosts so Mongoid"
+        "Each client configuration must provide hosts so Mongoid"
       )
     end
 

data/spec/mongoid/errors/{no_sessions_config_spec.rb → no_clients_config_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Errors::NoSessionsConfig do
+describe Mongoid::Errors::NoClientsConfig do
 
   describe "#message" do
 
@@ -10,7 +10,7 @@ describe Mongoid::Errors::NoSessionsConfig do
 
     it "contains the problem in the message" do
       expect(error.message).to include(
-        "No sessions configuration provided."
+        "No clients configuration provided."
       )
     end
 

data/spec/mongoid/fields/localized_spec.rb

@@ -81,6 +81,7 @@ describe Mongoid::Fields::Localized do
       context "when a locale is provided" do
 
         before do
+          I18n.enforce_available_locales = false
           ::I18n.locale = :de
         end
 

data/spec/mongoid/fields_spec.rb

@@ -18,6 +18,7 @@ describe Mongoid::Fields do
 
         before do
           product.description = "test"
+          I18n.enforce_available_locales = false
           ::I18n.locale = :de
           product.description = "The best"
         end

data/spec/mongoid/findable_spec.rb

@@ -40,14 +40,14 @@ describe Mongoid::Findable do
     end
   end
 
-  describe ".find_and_modify" do
+  describe ".find_one_and_update" do
 
     let!(:person) do
       Person.create(title: "Senior")
     end
 
     it "returns the document" do
-      expect(Person.find_and_modify(title: "Junior")).to eq(person)
+      expect(Person.find_one_and_update(title: "Junior")).to eq(person)
     end
   end
 
@@ -485,25 +485,4 @@ describe Mongoid::Findable do
       end
     end
   end
-
-  describe "#text_search" do
-
-    before do
-      Word.with(database: "admin").mongo_session.command(setParameter: 1, textSearchEnabled: true)
-      Word.create_indexes
-      Word.create!(name: "phase", origin: "latin")
-    end
-
-    after(:all) do
-      Word.remove_indexes
-    end
-
-    let(:search) do
-      Word.text_search("phase")
-    end
-
-    it "returns all fields" do
-      expect(search.first.origin).to eq("latin")
-    end
-  end
 end

data/spec/mongoid/indexable_spec.rb

@@ -41,13 +41,13 @@ describe Mongoid::Indexable do
       end
     end
 
-    context "when database specific options exist" do
+    context "when database specific options exist", if: non_legacy_server? do
 
       let(:klass) do
         Class.new do
           include Mongoid::Document
           store_in collection: "test_db_remove"
-          index({ test: 1 }, { database: "mia_2" })
+          index({ test: 1 }, { database: "mongoid_optional" })
           index({ name: 1 }, { background: true })
         end
       end
@@ -58,7 +58,7 @@ describe Mongoid::Indexable do
       end
 
       let(:indexes) do
-        klass.with(database: "mia_2").collection.indexes
+        klass.with(database: "mongoid_optional").collection.indexes
       end
 
       it "creates the indexes" do
@@ -84,17 +84,17 @@ describe Mongoid::Indexable do
       end
 
       it "creates the indexes" do
-        expect(klass.collection.indexes[_type: 1]).to_not be_nil
+        expect(klass.collection.indexes.get(_type: 1)).to_not be_nil
       end
     end
 
-    context "when database options are specified" do
+    context "when database options are specified", if: non_legacy_server? do
 
       let(:klass) do
         Class.new do
           include Mongoid::Document
           store_in collection: "test_db_indexes"
-          index({ _type: 1 }, { database: "mia_1" })
+          index({ _type: 1 }, { database: "mongoid_optional" })
         end
       end
 
@@ -102,12 +102,16 @@ describe Mongoid::Indexable do
         klass.create_indexes
       end
 
+      after do
+        klass.remove_indexes
+      end
+
       let(:indexes) do
-        klass.with(database: "mia_1").collection.indexes
+        klass.with(database: "mongoid_optional").collection.indexes
       end
 
       it "creates the indexes" do
-        expect(indexes[_type: 1]).to_not be_nil
+        expect(indexes.get(_type: 1)).to_not be_nil
       end
     end
   end

data/spec/mongoid/interceptable_spec.rb

@@ -929,6 +929,21 @@ describe Mongoid::Interceptable do
             expect(band.reload.records.first.before_save_called).to be true
           end
         end
+
+        context "when the child is created" do
+
+          let!(:band) do
+            Band.create
+          end
+
+          let!(:label) do
+            band.create_label(name: 'Label')
+          end
+
+          it "only executes callback once" do
+            expect(label.before_save_count).to be 1
+          end
+        end
       end
 
       describe "#before_update" do

data/spec/mongoid/persistable/settable_spec.rb

@@ -159,4 +159,20 @@ describe Mongoid::Persistable::Settable do
       expect(person.reload.somethingnew).to eq "somethingnew"
     end
   end
+
+  context "with an attribute with private setter" do
+    let(:agent) do
+      Agent.create
+    end
+
+    let(:title) do
+      "Double-Oh Seven"
+    end
+
+    it "updates the attribute" do
+      agent.singleton_class.send :private, :title=
+      agent.set(title: title)
+      expect(agent.reload.title).to eq title
+    end
+  end
 end

data/spec/mongoid/persistable/updatable_spec.rb

@@ -217,6 +217,7 @@ describe Mongoid::Persistable::Updatable do
       end
 
       before do
+        I18n.enforce_available_locales = false
         ::I18n.locale = :de
         product.update_attribute(:description, "Die Bombe")
       end
@@ -283,7 +284,7 @@ describe Mongoid::Persistable::Updatable do
         it "raises an error" do
           expect {
             person.update_attributes(map: { "bad.key" => "value" })
-          }.to raise_error(Moped::Errors::OperationFailure)
+          }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
 
@@ -319,7 +320,7 @@ describe Mongoid::Persistable::Updatable do
         it "raises an error" do
           expect {
             person.send(method, map: { "bad.key" => "value" })
-          }.to raise_error(Moped::Errors::OperationFailure)
+          }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
 

data/spec/mongoid/persistable_spec.rb

@@ -61,7 +61,7 @@ describe Mongoid::Persistable do
         end
 
         before do
-          expect_any_instance_of(Moped::Query).to receive(:update).with(operations).and_call_original
+          expect_any_instance_of(Mongo::Collection::View).to receive(:update_one).with(operations).and_call_original
         end
 
         let!(:update) do
@@ -88,7 +88,7 @@ describe Mongoid::Persistable do
         end
 
         before do
-          expect_any_instance_of(Moped::Query).to receive(:update).with(operations).and_call_original
+          expect_any_instance_of(Mongo::Collection::View).to receive(:update_one).with(operations).and_call_original
         end
 
         let!(:update) do
@@ -116,7 +116,7 @@ describe Mongoid::Persistable do
         end
 
         before do
-          expect_any_instance_of(Moped::Query).to receive(:update).with(operations).and_call_original
+          expect_any_instance_of(Mongo::Collection::View).to receive(:update_one).with(operations).and_call_original
         end
 
         let!(:update) do
@@ -153,7 +153,7 @@ describe Mongoid::Persistable do
         end
 
         before do
-          expect_any_instance_of(Moped::Query).to receive(:update).with(operations).and_call_original
+          expect_any_instance_of(Mongo::Collection::View).to receive(:update_one).with(operations).and_call_original
         end
 
         let!(:update) do

data/spec/mongoid/query_cache_spec.rb

@@ -15,7 +15,7 @@ describe Mongoid::QueryCache do
         Band.all.send(method)
       end
 
-      context "when query cache disable" do
+      context "when query cache is disabled" do
 
         before do
           Mongoid::QueryCache.enabled = false
@@ -54,7 +54,7 @@ describe Mongoid::QueryCache do
       Band.all.to_a
     end
 
-    context "when query cache disable" do
+    context "when query cache is disabled" do
 
       before do
         Mongoid::QueryCache.enabled = false
@@ -76,20 +76,24 @@ describe Mongoid::QueryCache do
       end
 
       context "when querying only the first" do
-        let(:game) { Game.create!(name: "2048") }
+
+        let(:game) do
+          Game.create!(name: "2048")
+        end
 
         before do
           game.ratings.where(:value.gt => 5).asc(:id).all.to_a
         end
 
-        it "queries again" do
-          expect_query(1) do
+        it "does not query again" do
+          expect_no_queries do
             game.ratings.where(:value.gt => 5).asc(:id).first
           end
         end
       end
 
-      context "limiting the result" do
+      context "when limiting the result" do
+
         it "queries again" do
           expect_query(1) do
             Band.limit(2).all.to_a
@@ -97,7 +101,8 @@ describe Mongoid::QueryCache do
         end
       end
 
-      context "specifying a different skip value" do
+      context "when specifying a different skip value" do
+
         before do
           Band.limit(2).skip(1).all.to_a
         end
@@ -213,7 +218,7 @@ describe Mongoid::QueryCache do
 
     it "does not cache the query" do
       expect(Mongoid::QueryCache).to receive(:cache_table).never
-      Band.collection.indexes.create(name: 1)
+      Band.collection.indexes.create_one(name: 1)
     end
   end
 end

data/spec/mongoid/relations/auto_save_spec.rb

@@ -150,7 +150,7 @@ describe Mongoid::Relations::AutoSave do
           end
         end
 
-        context "when updating the child" do
+        pending "when updating the child" do
 
           before do
             person.account = account

data/spec/mongoid/relations/counter_cache_spec.rb

@@ -287,4 +287,38 @@ describe Mongoid::Relations::CounterCache do
       end
     end
   end
+
+  describe "#add_counter_cache_callbacks" do
+
+    let(:person) do
+      Person.create
+    end
+
+    let!(:drug) do
+      person.drugs.create
+    end
+
+    context "when parent is not frozen" do
+
+      before do
+        drug.destroy
+      end
+
+      it "before_destroy updates counter cache" do
+        expect(person.drugs_count).to eq(0)
+      end
+    end
+
+    context "when parent is frozen" do
+
+      before do
+        person.destroy
+        drug.destroy
+      end
+
+      it "before_destroy doesn't update counter cache" do
+        expect(person.drugs_count).to eq(1)
+      end
+    end
+  end
 end