mongoid 4.0.2 → 5.0.0.beta

data/spec/mongoid/scopable_spec.rb

@@ -144,11 +144,11 @@ describe Mongoid::Scopable do
       end
 
       before do
-        Band.scope_stack.push(criteria)
+        Mongoid::Threaded.current_scope = criteria
       end
 
       after do
-        Band.scope_stack.clear
+        Mongoid::Threaded.current_scope = nil
       end
 
       it "returns the criteria on the stack" do
@@ -567,13 +567,9 @@ describe Mongoid::Scopable do
 
       context "when both scopes are or queries" do
 
-        let(:time) do
-          Time.now
-        end
-
         before do
           Band.scope(:xxx, ->{ Band.any_of({ :aaa.gt => 0 }, { :bbb.gt => 0 }) })
-          Band.scope(:yyy, ->{ Band.any_of({ :ccc => nil }, { :ccc.gt => time }) })
+          Band.scope(:yyy, ->{ Band.any_of({ :ccc => nil }, { :ccc.gt => 1 }) })
         end
 
         after do
@@ -592,7 +588,7 @@ describe Mongoid::Scopable do
           expect(criteria.selector).to eq({
             "$or" => [
               { "ccc" => nil },
-              { "ccc" => { "$gt" => time }},
+              { "ccc" => { "$gt" => 1.0 }},
               { "aaa" => { "$gt" => 0.0 }},
               { "bbb" => { "$gt" => 0.0 }}
             ]
@@ -644,33 +640,34 @@ describe Mongoid::Scopable do
         expect(circle_scope_keys).to match_array([:located_at, :with_radius])
       end
     end
-  end
-
-  describe ".scope_stack" do
-
-    context "when the scope stack has not been accessed" do
-
-      it "returns an empty array" do
-        expect(Band.scope_stack).to eq([])
-      end
-    end
 
-    context "when a criteria exists on the current thread" do
-
-      let(:criteria) do
-        Band.where(active: true)
-      end
+    context "when calling a scope defined in a parent class" do
 
       before do
-        Mongoid::Threaded.scope_stack[Band.object_id] = [ criteria ]
+        Shape.class_eval do
+          scope :visible, -> { large }
+          scope :large, -> { all }
+        end
+        Circle.class_eval do
+          scope :large, -> { where(radius: 5) }
+        end
       end
 
       after do
-        Mongoid::Threaded.scope_stack[Band.object_id].clear
+        class << Shape
+          undef_method :visible
+          undef_method :large
+        end
+        Shape._declared_scopes.clear
+
+        class << Circle
+          undef_method :large
+        end
+        Circle._declared_scopes.clear
       end
 
-      it "returns the criteria in the array" do
-        expect(Band.scope_stack).to eq([ criteria ])
+      it "uses sublcass context for all the other used scopes" do
+        expect(Circle.visible.selector).to eq("radius" => 5)
       end
     end
   end
@@ -784,6 +781,22 @@ describe Mongoid::Scopable do
           expect(unscoped.selector).to be_empty
         end
       end
+
+      context "when default scope is in a super class" do
+
+        before do
+          Band.scope(:active, ->{ Band.where(active: true) })
+        end
+
+        let(:unscoped) do
+          class U2 < Band; end
+          U2.unscoped.active
+        end
+
+        it "clears default scope" do
+          expect(unscoped.selector).to eq({ "active" => true })
+        end
+      end
     end
 
     context "when used with a block" do
@@ -888,7 +901,7 @@ describe Mongoid::Scopable do
 
     it "pops the criteria off the stack" do
       Band.with_scope(criteria) {}
-      expect(Band.scope_stack).to be_empty
+      expect(Mongoid::Threaded.current_scope).to be_nil
     end
   end
 

data/spec/mongoid/selectable_spec.rb

@@ -82,10 +82,8 @@ describe Mongoid::Selectable do
           person.create_name(first_name: "test", last_name: "user")
         end
 
-        it "returns the hash with the selector" do
-          expect(name.atomic_selector).to eq(
-            { "_id" => person.id, "name._id" => name.id }
-          )
+        it "returns the hash with the root selector" do
+          expect(name.atomic_selector).to eq({ "_id" => person.id })
         end
       end
 
@@ -95,10 +93,8 @@ describe Mongoid::Selectable do
           person.addresses.create(street: "kreuzbergstr")
         end
 
-        it "returns the hash with the selector" do
-          expect(address.atomic_selector).to eq(
-            { "_id" => person.id, "addresses._id" => address.id }
-          )
+        it "returns the hash with the root selector" do
+          expect(address.atomic_selector).to eq({ "_id" => person.id })
         end
 
         context "when the document's id changes" do
@@ -118,14 +114,8 @@ describe Mongoid::Selectable do
             address.locations.create
           end
 
-          it "returns a hash with the selector" do
-            expect(location.atomic_selector).to eq(
-              {
-                "_id" => person.id,
-                "addresses._id" => address.id,
-                "addresses.0.locations._id" => location.id
-              }
-            )
+          it "returns a hash with the root selector" do
+            expect(location.atomic_selector).to eq({ "_id" => person.id })
           end
         end
       end

data/spec/mongoid/tasks/database_rake_spec.rb

@@ -45,7 +45,7 @@ shared_context "rails rake task" do
   end
 end
 
-describe "db:drop" do
+describe "db:drop", if: non_legacy_server? do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -58,7 +58,7 @@ describe "db:drop" do
   end
 end
 
-describe "db:purge" do
+describe "db:purge", if: non_legacy_server? do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -71,7 +71,7 @@ describe "db:purge" do
   end
 end
 
-describe "db:seed" do
+describe "db:seed", if: non_legacy_server? do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -85,7 +85,7 @@ describe "db:seed" do
   end
 end
 
-describe "db:setup" do
+describe "db:setup", if: non_legacy_server? do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -117,7 +117,7 @@ describe "db:setup" do
   end
 end
 
-describe "db:reset" do
+describe "db:reset", if: non_legacy_server? do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -135,7 +135,7 @@ describe "db:reset" do
   end
 end
 
-describe "db:create" do
+describe "db:create", if: non_legacy_server? do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -144,7 +144,7 @@ describe "db:create" do
   end
 end
 
-describe "db:migrate" do
+describe "db:migrate", if: non_legacy_server? do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -153,7 +153,7 @@ describe "db:migrate" do
   end
 end
 
-describe "db:test:prepare" do
+describe "db:test:prepare", if: non_legacy_server? do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -174,7 +174,7 @@ describe "db:test:prepare" do
   end
 end
 
-describe "db:mongoid:create_indexes" do
+describe "db:mongoid:create_indexes", if: non_legacy_server? do
   include_context "rake task"
 
   it_behaves_like "create_indexes"
@@ -198,7 +198,7 @@ describe "db:mongoid:create_indexes" do
   end
 end
 
-describe "db:mongoid:remove_undefined_indexes" do
+describe "db:mongoid:remove_undefined_indexes", if: non_legacy_server? do
   include_context "rake task"
 
   it "receives remove_undefined_indexes" do
@@ -224,7 +224,7 @@ describe "db:mongoid:remove_undefined_indexes" do
   end
 end
 
-describe "db:mongoid:remove_indexes" do
+describe "db:mongoid:remove_indexes", if: non_legacy_server? do
   include_context "rake task"
 
   it "receives remove_indexes" do
@@ -250,7 +250,7 @@ describe "db:mongoid:remove_indexes" do
   end
 end
 
-describe "db:mongoid:drop" do
+describe "db:mongoid:drop", if: non_legacy_server? do
   include_context "rake task"
 
   it "works" do
@@ -266,7 +266,7 @@ describe "db:mongoid:drop" do
   end
 end
 
-describe "db:mongoid:purge" do
+describe "db:mongoid:purge", if: non_legacy_server? do
   include_context "rake task"
 
   it "receives a purge" do

data/spec/mongoid/tasks/database_spec.rb

@@ -100,7 +100,7 @@ describe "Mongoid::Tasks::Database" do
     context "with extra index on model collection" do
 
       before(:each) do
-        User.collection.indexes.create(account_expires: 1)
+        User.collection.indexes.create_one(account_expires: 1)
       end
 
       let(:names) do
@@ -121,7 +121,7 @@ describe "Mongoid::Tasks::Database" do
 
     before(:each) do
       Mongoid::Tasks::Database.create_indexes(models)
-      indexes.create(account_expires: 1)
+      indexes.create_one(account_expires: 1)
       Mongoid::Tasks::Database.remove_undefined_indexes(models)
     end
 

data/spec/mongoid/threaded_spec.rb

@@ -106,13 +106,6 @@ describe Mongoid::Threaded do
     end
   end
 
-  describe "#scope_stack" do
-
-    it "returns the default with the scope stack key" do
-      expect(described_class.scope_stack).to be_a(Hash)
-    end
-  end
-
   describe "#begin_validate" do
 
     let(:person) do

data/spec/mongoid/traversable_spec.rb

@@ -71,14 +71,14 @@ describe Mongoid::Traversable do
     context "when the document is a subclass" do
 
       it "returns true" do
-        expect(Circle).to be_hereditary
+        expect(Circle.hereditary?).to be true
       end
     end
 
     context "when the document is not a subclass" do
 
       it "returns false" do
-        expect(Shape).to_not be_hereditary
+        expect(Shape.hereditary?).to be false
       end
     end
   end

data/spec/mongoid/validatable/uniqueness_spec.rb

@@ -147,6 +147,35 @@ describe Mongoid::Validatable::UniquenessValidator do
                 Dictionary.reset_callbacks(:validate)
               end
 
+              context "when no attribute is set" do
+
+                context "when no document with no value exists in the database" do
+
+                  let(:dictionary) do
+                    Dictionary.new
+                  end
+
+                  it "returns true" do
+                    expect(dictionary).to be_valid
+                  end
+                end
+
+                context "when a document with no value exists in the database" do
+
+                  before do
+                    Dictionary.create
+                  end
+
+                  let(:dictionary) do
+                    Dictionary.new
+                  end
+
+                  it "returns false" do
+                    expect(dictionary).to_not be_valid
+                  end
+                end
+              end
+
               context "when the attribute is unique" do
 
                 context "when single localization" do
@@ -2382,7 +2411,7 @@ describe Mongoid::Validatable::UniquenessValidator do
       Person.reset_callbacks(:validate)
     end
 
-    it "transfers the options to the cloned session" do
+    it "transfers the options to the cloned client" do
       expect {
         Person.create!(ssn: "132-11-1111", username: "asdfsdfA")
       }.to raise_error

data/spec/mongoid_spec.rb

@@ -31,37 +31,35 @@ describe Mongoid do
     end
   end
 
-  describe ".default_session" do
+  describe ".default_client" do
 
-    it "returns the default session" do
-      expect(Mongoid.default_session).to eq(Mongoid::Sessions.default)
+    it "returns the default client" do
+      expect(Mongoid.default_client).to eq(Mongoid::Clients.default)
     end
   end
 
-  describe ".disconnect_sessions" do
+  describe ".disconnect_clients" do
 
-    let(:sessions) do
-      Mongoid::Threaded.sessions.values
+    let(:clients) do
+      Mongoid::Clients.clients.values
     end
 
     before do
       Band.all.entries
-      Mongoid.disconnect_sessions
     end
 
-    it "disconnects from all active sessions" do
-      sessions.each do |session|
-        session.cluster.nodes.each do |node|
-          expect(node.send(:connected?)).to be false
-        end
+    it "disconnects from all active clients" do
+      clients.each do |client|
+        expect(client.cluster).to receive(:disconnect!).and_call_original
       end
+      Mongoid.disconnect_clients
     end
   end
 
-  describe ".session" do
+  describe ".client" do
 
-    it "returns the named session" do
-      expect(Mongoid.session(:default)).to eq(Mongoid::Sessions.default)
+    it "returns the named client" do
+      expect(Mongoid.client(:default)).to eq(Mongoid::Clients.default)
     end
   end
 

data/spec/rails/mongoid_spec.rb

@@ -5,7 +5,7 @@ describe "Rails::Mongoid" do
   before(:all) do
     require "rails/mongoid"
     ::Mongoid.models.delete_if do |model|
-      ![ User, Account, Address ].include?(model)
+      ![ User, Account, Address, AddressNumber ].include?(model)
     end
   end
 
@@ -20,7 +20,11 @@ describe "Rails::Mongoid" do
     end
 
     let(:paths) do
-      { "app/models" => [ "/rails/root/app/models" ] }
+      double('[]' => path)
+    end
+
+    let(:path) do
+      double(expanded: [ "/rails/root/app/models" ])
     end
 
     context "when preload models config is false" do
@@ -98,7 +102,11 @@ describe "Rails::Mongoid" do
     end
 
     let(:paths) do
-      { "app/models" => [ "/rails/root/app/models" ] }
+      double('[]' => path)
+    end
+
+    let(:path) do
+      double(expanded: [ "/rails/root/app/models" ])
     end
 
     context "even when preload models config is false" do
@@ -132,12 +140,13 @@ describe "Rails::Mongoid" do
       end
 
       before(:all) do
-        Mongoid.preload_models = ["user"]
+        Mongoid.preload_models = ["user", "AddressNumber"]
       end
 
       it "loads selected models only" do
         allow(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
         expect(Rails::Mongoid).to receive(:load_model).with("user")
+        expect(Rails::Mongoid).to receive(:load_model).with("address_number")
         expect(Rails::Mongoid).to receive(:load_model).with("address").never
         Rails::Mongoid.load_models(app)
       end