mongoid 3.1.6 → 4.0.2

data/spec/mongoid/log_subscriber_spec.rb

@@ -0,0 +1,75 @@
+require "spec_helper"
+
+describe Mongoid::LogSubscriber do
+
+  describe ".query" do
+
+    let!(:subscribe) do
+      Mongoid::LogSubscriber.log_subscribers.first
+    end
+
+    before do
+      @old_level, Moped.logger.level = Moped.logger.level, 0
+    end
+
+    after do
+      Moped.logger.level = @old_level
+    end
+
+    context "when quering the database" do
+
+      it "logs the operation" do
+        expect(subscribe).to receive(:debug).once
+        Band.all.to_a
+      end
+    end
+
+    context "when creating a new subscriber" do
+
+      class TestLogSubscriber < ActiveSupport::LogSubscriber
+        attr_reader :debugs
+
+        def initialize
+          super
+          @debugs = []
+        end
+
+        def query(event)
+          @debugs << event
+        end
+
+        def logger
+          Moped.logger
+        end
+      end
+
+      let(:test_subscriber) do
+        TestLogSubscriber.new
+      end
+
+      before do
+        ActiveSupport::LogSubscriber.attach_to :moped, test_subscriber
+      end
+
+      after do
+        TestLogSubscriber.log_subscribers.pop
+      end
+
+      it "pushes the new log subscriber" do
+        expect(Mongoid::LogSubscriber.subscribers.last).to be_a TestLogSubscriber
+      end
+
+      context "when quering the database" do
+
+        before do
+          expect(subscribe).to receive(:debug).once
+          PetOwner.all.to_a
+        end
+
+        it "sends operations logs to TestLogSubscriber" do
+          expect(test_subscriber.debugs.size).to eq(1)
+        end
+      end
+    end
+  end
+end

data/spec/mongoid/loggable_spec.rb

@@ -15,7 +15,7 @@ describe Mongoid::Loggable do
     end
 
     it "sets the logger" do
-      Mongoid.logger.should eq(logger)
+      expect(Mongoid.logger).to eq(logger)
     end
   end
 end

data/spec/mongoid/{matchers → matchable}/all_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Matchers::All do
+describe Mongoid::Matchable::All do
 
   let(:matcher) do
     described_class.new(["first", "second", "third"])
@@ -11,20 +11,20 @@ describe Mongoid::Matchers::All do
     context "when the attribute includes all of the values" do
 
       it "returns true" do
-        matcher.matches?("$all" => ["first", /\Asec.*\z/]).should be_true
+        expect(matcher.matches?("$all" => ["first", /\Asec.*\z/])).to be true
       end
     end
 
     context "when the attributes doesn't include all of the values" do
 
       it "returns false" do
-        matcher.matches?("$all" => ["second", "third", "fourth"]).should be_false
+        expect(matcher.matches?("$all" => ["second", "third", "fourth"])).to be false
       end
     end
 
     context "when the value is empty" do
       it "returns false" do
-        matcher.matches?("$all" => []).should be_false
+        expect(matcher.matches?("$all" => [])).to be false
       end
     end
   end

data/spec/mongoid/{matchers → matchable}/and_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Matchers::And do
+describe Mongoid::Matchable::And do
 
   let(:person) do
     Person.new
@@ -27,7 +27,7 @@ describe Mongoid::Matchers::And do
           end
 
           it "returns true" do
-            matches.should be_true
+            expect(matches).to be true
           end
         end
 
@@ -38,7 +38,7 @@ describe Mongoid::Matchers::And do
           end
 
           it "returns false" do
-            matches.should be_false
+            expect(matches).to be false
           end
         end
       end
@@ -58,7 +58,7 @@ describe Mongoid::Matchers::And do
           end
 
           it "returns true" do
-            matches.should be_true
+            expect(matches).to be true
           end
         end
 
@@ -66,7 +66,7 @@ describe Mongoid::Matchers::And do
 
           let(:matches) do
             matcher.matches?(
-              [ { title: "Sir" }, { _id: Moped::BSON::ObjectId.new } ]
+              [ { title: "Sir" }, { _id: BSON::ObjectId.new } ]
             )
           end
 
@@ -75,7 +75,7 @@ describe Mongoid::Matchers::And do
           end
 
           it "returns false" do
-            matches.should be_false
+            expect(matches).to be false
           end
         end
 
@@ -86,7 +86,7 @@ describe Mongoid::Matchers::And do
           end
 
           it "returns true" do
-            matches.should be_true
+            expect(matches).to be true
           end
         end
       end
@@ -110,7 +110,7 @@ describe Mongoid::Matchers::And do
         end
 
         it "returns true" do
-          matches.should be_true
+          expect(matches).to be true
         end
       end
 
@@ -120,7 +120,7 @@ describe Mongoid::Matchers::And do
           matcher.matches?(
             [
               { title: { "$in" => [ "Prince", "Madam" ] } },
-              { _id: Moped::BSON::ObjectId.new }
+              { _id: BSON::ObjectId.new }
             ]
           )
         end
@@ -130,7 +130,7 @@ describe Mongoid::Matchers::And do
         end
 
         it "returns false" do
-          matches.should be_false
+          expect(matches).to be false
         end
       end
 
@@ -153,7 +153,7 @@ describe Mongoid::Matchers::And do
           end
 
           it "returns true" do
-            matches.should be_true
+            expect(matches).to be true
           end
         end
       end

data/spec/mongoid/{matchers → matchable}/default_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Matchers::Default do
+describe Mongoid::Matchable::Default do
 
   describe "#matches?" do
 
@@ -13,14 +13,14 @@ describe Mongoid::Matchers::Default do
       context "when the values are equal" do
 
         it "returns true" do
-          matcher.matches?("Testing").should be_true
+          expect(matcher.matches?("Testing")).to be true
         end
       end
 
       context "when the values are not equal" do
 
         it "returns false" do
-          matcher.matches?("Other").should be_false
+          expect(matcher.matches?("Other")).to be false
         end
       end
     end
@@ -28,7 +28,7 @@ describe Mongoid::Matchers::Default do
     context "when comparing object ids" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:matcher) do
@@ -38,14 +38,14 @@ describe Mongoid::Matchers::Default do
       context "when the values are equal" do
 
         it "returns true" do
-          matcher.matches?(object_id).should be_true
+          expect(matcher.matches?(object_id)).to be true
         end
       end
 
       context "when the values are not equal" do
 
         it "returns false" do
-          matcher.matches?(Moped::BSON::ObjectId.new).should be_false
+          expect(matcher.matches?(BSON::ObjectId.new)).to be false
         end
       end
     end
@@ -61,14 +61,14 @@ describe Mongoid::Matchers::Default do
         context "when the value is a string" do
 
           it "returns true" do
-            matcher.matches?("Test1").should be_true
+            expect(matcher.matches?("Test1")).to be true
           end
         end
 
         context "when the value is a regexp" do
 
           it "returns true" do
-            matcher.matches?(/^Test[3-5]$/).should be_true
+            expect(matcher.matches?(/^Test[3-5]$/)).to be true
           end
         end
       end
@@ -76,7 +76,7 @@ describe Mongoid::Matchers::Default do
       context "when the attribute does not contain the value" do
 
         it "returns false" do
-          matcher.matches?("Test4").should be_false
+          expect(matcher.matches?("Test4")).to be false
         end
       end
     end
@@ -84,24 +84,24 @@ describe Mongoid::Matchers::Default do
     context "when comparing an object id to an array" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:matcher) do
-        described_class.new([ object_id, Moped::BSON::ObjectId.new ])
+        described_class.new([ object_id, BSON::ObjectId.new ])
       end
 
       context "when the attribute contains the value" do
 
         it "returns true" do
-          matcher.matches?(object_id).should be_true
+          expect(matcher.matches?(object_id)).to be true
         end
       end
 
       context "when the attribute does not contain the value" do
 
         it "returns false" do
-          matcher.matches?(Moped::BSON::ObjectId.new).should be_false
+          expect(matcher.matches?(BSON::ObjectId.new)).to be false
         end
       end
     end
@@ -115,14 +115,14 @@ describe Mongoid::Matchers::Default do
       context "when the attribute contains the value" do
 
         it "returns true" do
-          matcher.matches?(["Test1", "Test2", "Test3"]).should be_true
+          expect(matcher.matches?(["Test1", "Test2", "Test3"])).to be true
         end
       end
 
       context "when the attribute does not contain the value" do
 
         it "returns false" do
-          matcher.matches?(["Test1", "Test2"]).should be_false
+          expect(matcher.matches?(["Test1", "Test2"])).to be false
         end
       end
     end

data/spec/mongoid/{matchers → matchable}/exists_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Matchers::Exists do
+describe Mongoid::Matchable::Exists do
 
   describe "#matches?" do
 
@@ -13,7 +13,7 @@ describe Mongoid::Matchers::Exists do
         end
 
         it "returns true" do
-          matcher.matches?("$exists" => true).should be_true
+          expect(matcher.matches?("$exists" => true)).to be true
         end
       end
 
@@ -24,7 +24,7 @@ describe Mongoid::Matchers::Exists do
         end
 
         it "returns false" do
-          matcher.matches?("$exists" => true).should be_false
+          expect(matcher.matches?("$exists" => true)).to be false
         end
       end
     end
@@ -38,7 +38,7 @@ describe Mongoid::Matchers::Exists do
         end
 
         it "returns false" do
-          matcher.matches?("$exists" => false).should be_false
+          expect(matcher.matches?("$exists" => false)).to be false
         end
       end
 
@@ -49,7 +49,7 @@ describe Mongoid::Matchers::Exists do
         end
 
         it "returns true" do
-          matcher.matches?("$exists" => false).should be_true
+          expect(matcher.matches?("$exists" => false)).to be true
         end
       end
     end

data/spec/mongoid/{matchers → matchable}/gt_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Matchers::Gt do
+describe Mongoid::Matchable::Gt do
 
   describe "#matches?" do
 
@@ -11,7 +11,7 @@ describe Mongoid::Matchers::Gt do
       end
 
       it "returns true" do
-        matcher.matches?("$gt" => 3).should be_true
+        expect(matcher.matches?("$gt" => 3)).to be true
       end
     end
 
@@ -22,7 +22,7 @@ describe Mongoid::Matchers::Gt do
       end
 
       it "returns false" do
-        matcher.matches?("$gt" => 3).should be_false
+        expect(matcher.matches?("$gt" => 3)).to be false
       end
     end
 
@@ -33,7 +33,7 @@ describe Mongoid::Matchers::Gt do
       end
 
       it "returns false" do
-        matcher.matches?("$gt" => 10).should be_false
+        expect(matcher.matches?("$gt" => 10)).to be false
       end
     end
 
@@ -44,30 +44,31 @@ describe Mongoid::Matchers::Gt do
       end
 
       it "returns false" do
-        matcher.matches?("$gt" => 5).should be_false
+        expect(matcher.matches?("$gt" => 5)).to be false
       end
     end
 
     context "when the value is an array" do
+
       context "there are value valid" do
         let(:matcher) do
           described_class.new([6,4])
         end
 
         it "returns false" do
-          matcher.matches?("$gt" => 5).should be_true
+          expect(matcher.matches?("$gt" => 5)).to be true
         end
       end
 
       context "there are not value valid" do
+
         let(:matcher) do
           described_class.new([3,4])
         end
 
         it "returns false" do
-          matcher.matches?("$gt" => 5).should be_false
+          expect(matcher.matches?("$gt" => 5)).to be false
         end
-
       end
     end
   end

data/spec/mongoid/{matchers → matchable}/gte_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Matchers::Gte do
+describe Mongoid::Matchable::Gte do
 
   describe "#matches?" do
 
@@ -11,7 +11,7 @@ describe Mongoid::Matchers::Gte do
       end
 
       it "returns true" do
-        matcher.matches?("$gte" => 3).should be_true
+        expect(matcher.matches?("$gte" => 3)).to be true
       end
     end
 
@@ -22,7 +22,7 @@ describe Mongoid::Matchers::Gte do
       end
 
       it "returns false" do
-        matcher.matches?("$gte" => 10).should be_false
+        expect(matcher.matches?("$gte" => 10)).to be false
       end
     end
 
@@ -33,7 +33,7 @@ describe Mongoid::Matchers::Gte do
       end
 
       it "returns true" do
-        matcher.matches?("$gte" => 5).should be_true
+        expect(matcher.matches?("$gte" => 5)).to be true
       end
     end
 
@@ -44,7 +44,7 @@ describe Mongoid::Matchers::Gte do
       end
 
       it "returns false" do
-        matcher.matches?("$gte" => 5).should be_false
+        expect(matcher.matches?("$gte" => 5)).to be false
       end
     end
 
@@ -55,7 +55,7 @@ describe Mongoid::Matchers::Gte do
         end
 
         it "returns false" do
-          matcher.matches?("$gte" => 5).should be_true
+          expect(matcher.matches?("$gte" => 5)).to be true
         end
       end
 
@@ -65,7 +65,7 @@ describe Mongoid::Matchers::Gte do
         end
 
         it "returns false" do
-          matcher.matches?("$gte" => 5).should be_false
+          expect(matcher.matches?("$gte" => 5)).to be false
         end
 
       end