mongoid 3.1.7 → 4.0.2

data/spec/mongoid/sessions/factory_spec.rb

@@ -30,11 +30,11 @@ describe Mongoid::Sessions::Factory do
           end
 
           it "returns a session" do
-            session.should be_a(Moped::Session)
+            expect(session).to be_a(Moped::Session)
           end
 
           it "sets the cluster's seeds" do
-            cluster.seeds.should eq([ "localhost:27017" ])
+            expect(cluster.seeds.first.address.resolved).to eq("127.0.0.1:27017")
           end
         end
 
@@ -64,15 +64,15 @@ describe Mongoid::Sessions::Factory do
           end
 
           it "returns a session" do
-            session.should be_a(Moped::Session)
+            expect(session).to be_a(Moped::Session)
           end
 
           it "sets the cluster's seed ports to 27017" do
-            cluster.seeds.should eq([ "localhost:27017" ])
+            expect(cluster.seeds.first.address.original).to eq("localhost:27017")
           end
 
           it "sets ips with no ports to 27017" do
-            default.cluster.seeds.should eq([ "127.0.0.1:27017" ])
+            expect(default.cluster.seeds.first.address.original).to eq("127.0.0.1:27017")
           end
         end
 
@@ -100,30 +100,30 @@ describe Mongoid::Sessions::Factory do
             end
 
             it "returns a session" do
-              session.should be_a(Moped::Session)
+              expect(session).to be_a(Moped::Session)
             end
 
             it "sets the cluster's seeds" do
-              cluster.seeds.should eq([ "localhost:27017" ])
+              expect(cluster.seeds.first.address.original).to eq("localhost:27017")
             end
 
             it "sets the database" do
-              session.options[:database].should eq("mongoid_test")
+              expect(session.options[:database]).to eq("mongoid_test")
             end
 
             it "sets the database in the configuration" do
               session
-              Mongoid.sessions[:secondary].should include(:database)
+              expect(Mongoid.sessions[:secondary]).to include(:database)
             end
 
             it "sets the hosts in the configuration" do
               session
-              Mongoid.sessions[:secondary].should include(:hosts)
+              expect(Mongoid.sessions[:secondary]).to include(:hosts)
             end
 
             it "removes the uri from the configuration" do
               session
-              Mongoid.sessions[:secondary].should_not include(:uri)
+              expect(Mongoid.sessions[:secondary]).to_not include(:uri)
             end
           end
 
@@ -148,31 +148,35 @@ describe Mongoid::Sessions::Factory do
               session.cluster
             end
 
+            let(:seeds) do
+              cluster.seeds.map{ |node| node.address.original }
+            end
+
             it "returns a session" do
-              session.should be_a(Moped::Session)
+              expect(session).to be_a(Moped::Session)
             end
 
             it "sets the cluster's seeds" do
-              cluster.seeds.should eq([ "localhost:27017", "localhost:27017" ])
+              expect(seeds).to eq([ "localhost:27017", "localhost:27017" ])
             end
 
             it "sets the database" do
-              session.options[:database].should eq("mongoid_test")
+              expect(session.options[:database]).to eq("mongoid_test")
             end
 
             it "sets the database in the configuration" do
               session
-              Mongoid.sessions[:secondary].should include(:database)
+              expect(Mongoid.sessions[:secondary]).to include(:database)
             end
 
             it "sets the hosts in the configuration" do
               session
-              Mongoid.sessions[:secondary].should include(:hosts)
+              expect(Mongoid.sessions[:secondary]).to include(:hosts)
             end
 
             it "removes the uri from the configuration" do
               session
-              Mongoid.sessions[:secondary].should_not include(:uri)
+              expect(Mongoid.sessions[:secondary]).to_not include(:uri)
             end
           end
         end
@@ -206,12 +210,16 @@ describe Mongoid::Sessions::Factory do
         session.cluster
       end
 
+      let(:seeds) do
+        cluster.seeds.map{ |node| node.address.original }
+      end
+
       it "returns the default session" do
-        session.should be_a(Moped::Session)
+        expect(session).to be_a(Moped::Session)
       end
 
       it "sets the cluster's seeds" do
-        cluster.seeds.should eq([ "localhost:27017" ])
+        expect(seeds).to eq([ "localhost:27017" ])
       end
     end
 
@@ -247,12 +255,16 @@ describe Mongoid::Sessions::Factory do
       session.cluster
     end
 
+    let(:seeds) do
+      cluster.seeds.map{ |node| node.address.original }
+    end
+
     it "returns the default session" do
-      session.should be_a(Moped::Session)
+      expect(session).to be_a(Moped::Session)
     end
 
     it "sets the cluster's seeds" do
-      cluster.seeds.should eq([ "localhost:27017" ])
+      expect(seeds).to eq([ "localhost:27017" ])
     end
   end
 
@@ -267,7 +279,8 @@ describe Mongoid::Sessions::Factory do
             "down_interval" => 10,
             "max_retries" => 5,
             "refresh_interval" => 30,
-            "retry_interval" => 0.1
+            "retry_interval" => 0.1,
+            "write" => { "w" => 1 }
           }
         }
       }
@@ -285,28 +298,36 @@ describe Mongoid::Sessions::Factory do
       session.cluster
     end
 
+    let(:seeds) do
+      cluster.seeds.map{ |node| node.address.original }
+    end
+
     it "returns the default session" do
-      session.should be_a(Moped::Session)
+      expect(session).to be_a(Moped::Session)
     end
 
     it "sets the cluster's seeds" do
-      cluster.seeds.should eq([ "localhost:27017" ])
+      expect(seeds).to eq([ "localhost:27017" ])
     end
 
     it "sets the cluster down interval" do
-      cluster.down_interval.should eq(10)
+      expect(cluster.down_interval).to eq(10)
     end
 
     it "sets the cluster max retries" do
-      cluster.max_retries.should eq(5)
+      expect(cluster.max_retries).to eq(5)
     end
 
     it "sets the cluster refresh interval" do
-      cluster.refresh_interval.should eq(30)
+      expect(cluster.refresh_interval).to eq(30)
     end
 
     it "sets the cluster retry interval" do
-      cluster.retry_interval.should eq(0.1)
+      expect(cluster.retry_interval).to eq(0.1)
+    end
+
+    it "sets the write concern" do
+      expect(session.write_concern).to be_a(Moped::WriteConcern::Propagate)
     end
   end
 end

data/spec/mongoid/sessions/mongo_uri_spec.rb

@@ -17,7 +17,7 @@ describe Mongoid::Sessions::MongoUri do
     end
 
     it "returns the database name" do
-      uri.database.should eq("mongoid_test")
+      expect(uri.database).to eq("mongoid_test")
     end
   end
 
@@ -30,7 +30,7 @@ describe Mongoid::Sessions::MongoUri do
       end
 
       it "returns an array with 1 node" do
-        uri.hosts.should eq([ "localhost:27017" ])
+        expect(uri.hosts).to eq([ "localhost:27017" ])
       end
     end
 
@@ -41,7 +41,7 @@ describe Mongoid::Sessions::MongoUri do
       end
 
       it "returns an array with 2 nodes" do
-        uri.hosts.should eq([ "localhost:27017", "localhost:27017" ])
+        expect(uri.hosts).to eq([ "localhost:27017", "localhost:27017" ])
       end
     end
   end
@@ -53,7 +53,7 @@ describe Mongoid::Sessions::MongoUri do
     end
 
     it "returns the password" do
-      uri.password.should eq("pass")
+      expect(uri.password).to eq("pass")
     end
   end
 
@@ -66,7 +66,7 @@ describe Mongoid::Sessions::MongoUri do
       end
 
       it "does not include the username and password" do
-        uri.to_hash.should eq({
+        expect(uri.to_hash).to eq({
           hosts: [ "localhost:27017", "localhost:27017" ],
           database: "mongoid_test"
         })
@@ -80,7 +80,7 @@ describe Mongoid::Sessions::MongoUri do
       end
 
       it "includes the username and password" do
-        uri.to_hash.should eq({
+        expect(uri.to_hash).to eq({
           hosts: [ "localhost:27017" ],
           database: "mongoid_test",
           username: "user",
@@ -97,7 +97,7 @@ describe Mongoid::Sessions::MongoUri do
     end
 
     it "returns the userame" do
-      uri.username.should eq("user")
+      expect(uri.username).to eq("user")
     end
   end
 end

data/spec/mongoid/sessions/options_spec.rb

@@ -0,0 +1,108 @@
+require "spec_helper"
+
+describe Mongoid::Sessions::Options do
+
+  describe "#with" do
+
+    context "when passing some options" do
+
+      let(:options) { { database: 'test' } }
+
+      let!(:klass) do
+        Band.with(options)
+      end
+
+      it "sets the options into the class" do
+        expect(klass.persistence_options).to eq(options)
+      end
+
+      it "sets the options into the instance" do
+        expect(klass.new.persistence_options).to eq(options)
+      end
+
+      it "doesnt set the options on class level" do
+        expect(Band.new.persistence_options).to be_nil
+      end
+
+      context "when calling .collection method" do
+
+        before do
+          klass.collection
+        end
+
+        it "keeps the options" do
+          expect(klass.persistence_options).to eq(options)
+        end
+      end
+
+      context "when returning a criteria" do
+
+        let(:criteria) do
+          klass.all
+        end
+
+        it "sets the options into the criteria object" do
+          expect(criteria.persistence_options).to eq(options)
+        end
+
+        it "doesnt set the options on class level" do
+          expect(Band.new.persistence_options).to be_nil
+        end
+      end
+    end
+  end
+
+  describe ".with" do
+
+    let(:options) { { database: 'test' } }
+
+    let(:instance) do
+      Band.new.with(options)
+    end
+
+    it "sets the options into" do
+      expect(instance.persistence_options).to eq(options)
+    end
+
+    it "passes down the options to collection" do
+      session = Band.mongo_session
+      expect_any_instance_of(Moped::Session).to receive(:with).with(options).and_return(session)
+      instance.collection
+    end
+  end
+
+  describe "#persistence_options" do
+
+    it "touches the thread local" do
+      expect(Thread.current).to receive(:[]).with("[mongoid][Band]:persistence-options").and_return({foo: :bar})
+      expect(Band.persistence_options).to eq({foo: :bar})
+    end
+
+    it "cannot force a value on thread local" do
+      expect {
+        Band.set_persistence_options(Band, {})
+      }.to raise_error(NoMethodError)
+    end
+  end
+
+  describe ".persistence_options" do
+
+    context "when options exist on the current thread" do
+
+      let(:klass) do
+        Band.with(write: { w: 2 })
+      end
+
+      it "returns the options" do
+        expect(klass.persistence_options).to eq(write: { w: 2 })
+      end
+    end
+
+    context "when there are no options on the current thread" do
+
+      it "returns nil" do
+        expect(Band.persistence_options).to be_nil
+      end
+    end
+  end
+end