mongoid 3.1.7 → 4.0.0.alpha1

data/spec/mongoid/{sharding_spec.rb → shardable_spec.rb}

@@ -1,21 +1,21 @@
 require "spec_helper"
 
-describe Mongoid::Sharding do
+describe Mongoid::Shardable do
 
   describe ".included" do
 
     let(:klass) do
       Class.new do
-        include Mongoid::Sharding
+        include Mongoid::Shardable
       end
     end
 
     it "adds an shard_key_fields accessor" do
-      klass.should respond_to(:shard_key_fields)
+      expect(klass).to respond_to(:shard_key_fields)
     end
 
     it "defaults shard_key_fields to an empty array" do
-      klass.shard_key_fields.should be_empty
+      expect(klass.shard_key_fields).to be_empty
     end
   end
 
@@ -23,7 +23,7 @@ describe Mongoid::Sharding do
 
     let(:klass) do
       Class.new do
-        include Mongoid::Sharding
+        include Mongoid::Shardable
       end
     end
 
@@ -32,7 +32,7 @@ describe Mongoid::Sharding do
     end
 
     it "specifies a shard key on the collection" do
-      klass.shard_key_fields.should eq([:name])
+      expect(klass.shard_key_fields).to eq([:name])
     end
   end
 
@@ -40,7 +40,7 @@ describe Mongoid::Sharding do
 
     let(:klass) do
       Class.new do
-        include Mongoid::Sharding
+        include Mongoid::Shardable
         attr_accessor :name
       end
     end
@@ -55,7 +55,7 @@ describe Mongoid::Sharding do
     end
 
     it "returns a hash of shard key names and values" do
-      object.shard_key_selector.should eq({ "name" => "Jo" })
+      expect(object.shard_key_selector).to eq({ "name" => "Jo" })
     end
   end
 end

data/spec/mongoid/state_spec.rb

@@ -7,22 +7,22 @@ describe Mongoid::State do
     context "when calling new on the document" do
 
       let(:person) do
-        Person.new("_id" => Moped::BSON::ObjectId.new)
+        Person.new("_id" => BSON::ObjectId.new)
       end
 
       it "returns true" do
-        person.should be_a_new_record
+        expect(person).to be_a_new_record
       end
     end
 
     context "when the object has been saved" do
 
       let(:person) do
-        Person.instantiate("_id" => Moped::BSON::ObjectId.new)
+        Person.instantiate("_id" => BSON::ObjectId.new)
       end
 
       it "returns false" do
-        person.should_not be_a_new_record
+        expect(person).to_not be_a_new_record
       end
     end
 
@@ -33,7 +33,7 @@ describe Mongoid::State do
       end
 
       it "returns true" do
-        person.should be_a_new_record
+        expect(person).to be_a_new_record
       end
     end
   end
@@ -45,7 +45,7 @@ describe Mongoid::State do
     end
 
     it "delegates to new_record?" do
-      person.should_not be_persisted
+      expect(person).to_not be_persisted
     end
 
     context "when the object has been destroyed" do
@@ -55,7 +55,7 @@ describe Mongoid::State do
       end
 
       it "returns false" do
-        person.should_not be_persisted
+        expect(person).to_not be_persisted
       end
     end
   end
@@ -73,7 +73,7 @@ describe Mongoid::State do
       end
 
       it "returns true" do
-        person.should be_destroyed
+        expect(person).to be_destroyed
       end
     end
 
@@ -84,7 +84,7 @@ describe Mongoid::State do
       end
 
       it "returns true" do
-        person.should_not be_destroyed
+        expect(person).to_not be_destroyed
       end
     end
 
@@ -95,7 +95,7 @@ describe Mongoid::State do
       end
 
       it "returns false" do
-        person.should_not be_destroyed
+        expect(person).to_not be_destroyed
       end
     end
   end

data/spec/mongoid/threaded_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Mongoid::Threaded do
 
   let(:object) do
-    stub
+    double
   end
 
   describe "#begin" do
@@ -17,7 +17,7 @@ describe Mongoid::Threaded do
     end
 
     it "adds a boolen to the load stack" do
-      described_class.stack("load").should eq([ true ])
+      expect(described_class.stack("load")).to eq([ true ])
     end
   end
 
@@ -26,7 +26,7 @@ describe Mongoid::Threaded do
     context "when loading is not set" do
 
       it "returns false" do
-        described_class.should_not be_executing(:load)
+        expect(described_class).to_not be_executing(:load)
       end
     end
 
@@ -41,7 +41,7 @@ describe Mongoid::Threaded do
       end
 
       it "returns true" do
-        described_class.should be_executing(:load)
+        expect(described_class).to be_executing(:load)
       end
     end
 
@@ -52,7 +52,7 @@ describe Mongoid::Threaded do
       end
 
       it "returns false" do
-        described_class.should_not be_executing(:load)
+        expect(described_class).to_not be_executing(:load)
       end
     end
   end
@@ -66,7 +66,7 @@ describe Mongoid::Threaded do
       end
 
       it "returns an empty stack" do
-        loading.should be_empty
+        expect(loading).to be_empty
       end
     end
 
@@ -85,7 +85,7 @@ describe Mongoid::Threaded do
       end
 
       it "returns the stack" do
-        loading.should eq([ true ])
+        expect(loading).to eq([ true ])
       end
     end
   end
@@ -102,67 +102,14 @@ describe Mongoid::Threaded do
     end
 
     it "removes a boolen from the stack" do
-      described_class.stack("load").should be_empty
-    end
-  end
-
-  describe "#clear_persistence_options" do
-
-    before do
-      described_class.set_persistence_options(Band, { safe: { w: 3 }})
-    end
-
-    let!(:cleared) do
-      described_class.clear_persistence_options(Band)
-    end
-
-    it "removes all persistence options" do
-      described_class.persistence_options(Band).should be_nil
-    end
-
-    it "returns true" do
-      cleared.should be_true
-    end
-  end
-
-  describe "#identity_map" do
-
-    before do
-      Thread.current["[mongoid]:identity-map"] = object
-    end
-
-    after do
-      Thread.current["[mongoid]:identity-map"] = nil
-    end
-
-    it "returns the object with the identity map key" do
-      described_class.identity_map.should eq(object)
-    end
-  end
-
-  describe "#persistence_options" do
-
-    before do
-      described_class.set_persistence_options(Band, { safe: { w: 3 }})
-    end
-
-    after do
-      described_class.set_persistence_options(Band, nil)
-    end
-
-    let(:options) do
-      described_class.persistence_options(Band)
-    end
-
-    it "sets the persistence options" do
-      options.should eq({ safe: { w: 3 }})
+      expect(described_class.stack("load")).to be_empty
     end
   end
 
   describe "#scope_stack" do
 
     it "returns the default with the scope stack key" do
-      described_class.scope_stack.should be_a(Hash)
+      expect(described_class.scope_stack).to be_a(Hash)
     end
   end
 
@@ -181,7 +128,7 @@ describe Mongoid::Threaded do
     end
 
     it "marks the document as being validated" do
-      described_class.validations_for(Person).should eq([ person.id ])
+      expect(described_class.validations_for(Person)).to eq([ person.id ])
     end
   end
 
@@ -197,7 +144,7 @@ describe Mongoid::Threaded do
     end
 
     it "unmarks the document as being validated" do
-      described_class.validations_for(Person).should be_empty
+      expect(described_class.validations_for(Person)).to be_empty
     end
   end
 
@@ -218,14 +165,14 @@ describe Mongoid::Threaded do
       end
 
       it "returns true" do
-        described_class.validated?(person).should be_true
+        expect(described_class.validated?(person)).to be true
       end
     end
 
     context "when the document is not validated" do
 
       it "returns false" do
-        described_class.validated?(person).should be_false
+        expect(described_class.validated?(person)).to be false
       end
     end
   end
@@ -245,7 +192,7 @@ describe Mongoid::Threaded do
     end
 
     it "marks the document as being autosaved" do
-      described_class.autosaves_for(Person).should eq([ person.id ])
+      expect(described_class.autosaves_for(Person)).to eq([ person.id ])
     end
   end
 
@@ -261,7 +208,7 @@ describe Mongoid::Threaded do
     end
 
     it "unmarks the document as being autosaved" do
-      described_class.autosaves_for(Person).should be_empty
+      expect(described_class.autosaves_for(Person)).to be_empty
     end
   end
 
@@ -282,14 +229,14 @@ describe Mongoid::Threaded do
       end
 
       it "returns true" do
-        described_class.autosaved?(person).should be_true
+        expect(described_class.autosaved?(person)).to be true
       end
     end
 
     context "when the document is not autosaved" do
 
       it "returns false" do
-        described_class.autosaved?(person).should be_false
+        expect(described_class.autosaved?(person)).to be false
       end
     end
   end

data/spec/mongoid/timestamps/created/short_spec.rb

@@ -18,19 +18,19 @@ describe Mongoid::Timestamps::Created::Short do
     end
 
     it "adds c_at to the document" do
-      fields["c_at"].should_not be_nil
+      expect(fields["c_at"]).to_not be_nil
     end
 
     it "does not add u_at to the document" do
-      fields["u_at"].should be_nil
+      expect(fields["u_at"]).to be_nil
     end
 
     it "does not add the created_at to the document" do
-      fields["created_at"].should be_nil
+      expect(fields["created_at"]).to be_nil
     end
 
     it "forces the c_at timestamps to UTC" do
-      quiz.created_at.should be_within(10).of(Time.now.utc)
+      expect(quiz.created_at).to be_within(10).of(Time.now.utc)
     end
   end
 
@@ -41,11 +41,11 @@ describe Mongoid::Timestamps::Created::Short do
     end
 
     it "runs the created callbacks" do
-      quiz.created_at.should be_within(10).of(Time.now.utc)
+      expect(quiz.created_at).to be_within(10).of(Time.now.utc)
     end
 
     it "allows access via the raw field" do
-      quiz.c_at.should eq(quiz.created_at)
+      expect(quiz.c_at).to eq(quiz.created_at)
     end
   end
 end

data/spec/mongoid/timestamps/created_spec.rb

@@ -18,15 +18,15 @@ describe Mongoid::Timestamps::Created do
     end
 
     it "adds created_at to the document" do
-      fields["created_at"].should_not be_nil
+      expect(fields["created_at"]).to_not be_nil
     end
 
     it "does not add updated_at to the document" do
-      fields["updated_at"].should be_nil
+      expect(fields["updated_at"]).to be_nil
     end
 
     it "forces the created_at timestamps to UTC" do
-      quiz.created_at.should be_within(10).of(Time.now.utc)
+      expect(quiz.created_at).to be_within(10).of(Time.now.utc)
     end
   end
 
@@ -37,8 +37,8 @@ describe Mongoid::Timestamps::Created do
     end
 
     it "runs the created callbacks" do
-      quiz.created_at.should_not be_nil
-      quiz.created_at.should be_within(10).of(Time.now.utc)
+      expect(quiz.created_at).to_not be_nil
+      expect(quiz.created_at).to be_within(10).of(Time.now.utc)
     end
   end
 end

data/spec/mongoid/timestamps/updated/short_spec.rb

@@ -18,23 +18,23 @@ describe Mongoid::Timestamps::Updated::Short do
     end
 
     it "does not add c_at to the document" do
-      fields["c_at"].should be_nil
+      expect(fields["c_at"]).to be_nil
     end
 
     it "adds u_at to the document" do
-      fields["u_at"].should_not be_nil
+      expect(fields["u_at"]).to_not be_nil
     end
 
     it "does not add the long updated_at" do
-      fields["updated_at"].should be_nil
+      expect(fields["updated_at"]).to be_nil
     end
 
     it "forces the updated_at timestamps to UTC" do
-      agent.updated_at.should be_within(10).of(Time.now.utc)
+      expect(agent.updated_at).to be_within(10).of(Time.now.utc)
     end
 
     it "aliases the raw field" do
-      agent.u_at.should eq(agent.updated_at)
+      expect(agent.u_at).to eq(agent.updated_at)
     end
   end
 
@@ -51,11 +51,11 @@ describe Mongoid::Timestamps::Updated::Short do
       end
 
       it "does not override it with the default" do
-        doc.updated_at.should eq(time)
+        expect(doc.updated_at).to eq(time)
       end
 
       it "does not persist an auto value" do
-        doc.reload.updated_at.should eq(time)
+        expect(doc.reload.updated_at).to eq(time)
       end
     end
   end
@@ -63,7 +63,7 @@ describe Mongoid::Timestamps::Updated::Short do
   context "when the document has not changed" do
 
     let(:agent) do
-      ShortAgent.instantiate("_id" => Moped::BSON::ObjectId.new, "account_ids" => [])
+      ShortAgent.instantiate("_id" => BSON::ObjectId.new, "account_ids" => [])
     end
 
     before do
@@ -83,8 +83,8 @@ describe Mongoid::Timestamps::Updated::Short do
     end
 
     it "runs the update callbacks" do
-      agent.updated_at.should_not be_nil
-      agent.updated_at.should be_within(10).of(Time.now.utc)
+      expect(agent.updated_at).to_not be_nil
+      expect(agent.updated_at).to be_within(10).of(Time.now.utc)
     end
   end
 end