mongoid 7.0.13 → 7.1.0.rc0

data/spec/mongoid/query_cache_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::QueryCache do
@@ -7,20 +10,6 @@ describe Mongoid::QueryCache do
     Mongoid::QueryCache.cache { spec.run }
   end
 
-  before(:all) do
-    # It is likely that there are other session leaks in the driver
-    # and/or Mongoid that are unrelated to the query cache. Clear the
-    # SessionRegistry at the start of these tests in order to detect leaks that
-    # occur only within the scope of these tests.
-    #
-    # Other session leaks will be detected and addressed as part of RUBY-2391.
-    SessionRegistry.instance.clear_registry
-  end
-
-  after do
-    SessionRegistry.instance.verify_sessions_ended!
-  end
-
   context 'when iterating over objects sharing the same base' do
 
     let(:server) do
@@ -194,8 +183,7 @@ describe Mongoid::QueryCache do
         end
       end
 
-      context 'when the first query has a collation' do
-        min_server_version '3.4'
+      context 'when the first query has a collation', if: collation_supported? do
 
         before do
           Band.where(name: 'DEPECHE MODE').collation(locale: 'en_US', strength: 2).to_a
@@ -236,10 +224,6 @@ describe Mongoid::QueryCache do
         end
 
         before do
-          10.times do |i|
-            game.ratings << Rating.create!(value: i+1)
-          end
-
           game.ratings.where(:value.gt => 5).asc(:id).all.to_a
         end
 
@@ -247,9 +231,7 @@ describe Mongoid::QueryCache do
 
           it "uses the cache" do
             expect_no_queries do
-              result = game.ratings.where(:value.gt => 5).limit(2).asc(:id).to_a
-              expect(result.length).to eq(2)
-              expect(result.map { |r| r['value'] }).to eq([6, 7])
+              game.ratings.where(:value.gt => 5).limit(2).asc(:id).to_a
             end
           end
         end
@@ -262,23 +244,14 @@ describe Mongoid::QueryCache do
         end
 
         before do
-          10.times do |i|
-            game.ratings << Rating.create!(value: i+1)
-          end
-
           game.ratings.where(:value.gt => 5).limit(3).asc(:id).all.to_a
         end
 
         context "when the next query has a limit" do
-          # Server versions older than 3.2 also perform a killCursors operation,
-          # which causes this test to fail.
-          min_server_version '3.2'
 
           it "queries again" do
             expect_query(1) do
-              result = game.ratings.where(:value.gt => 5).limit(2).asc(:id).to_a
-              expect(result.length).to eq(2)
-              expect(result.map { |r| r['value'] }).to eq([6, 7])
+              game.ratings.where(:value.gt => 5).limit(2).asc(:id).to_a
             end
           end
         end
@@ -287,9 +260,7 @@ describe Mongoid::QueryCache do
 
           it "queries again" do
             expect_query(1) do
-              result = game.ratings.where(:value.gt => 5).asc(:id).to_a
-              expect(result.length).to eq(5)
-              expect(result.map { |r| r['value'] }).to eq([6, 7, 8, 9, 10])
+              game.ratings.where(:value.gt => 5).asc(:id).to_a
             end
           end
         end
@@ -302,34 +273,21 @@ describe Mongoid::QueryCache do
         end
 
         before do
-          10.times do |i|
-            game.ratings << Rating.create!(value: i+1)
-          end
-
           game.ratings.where(:value.gt => 5).asc(:id).all.to_a
         end
 
         it "does not query again" do
           expect_no_queries do
-            result = game.ratings.where(:value.gt => 5).asc(:id).first
-            expect(result['value']).to eq(6)
+            game.ratings.where(:value.gt => 5).asc(:id).first
           end
         end
       end
 
       context "when limiting the result" do
-        before do
-          Band.destroy_all
-
-          5.times { |i| Band.create!(name: "Band #{i}") }
-          Band.all.to_a
-        end
 
         it "does not query again" do
           expect_query(0) do
-            result = Band.limit(2).all.to_a
-            expect(result.length).to eq(2)
-            expect(result.map { |r| r["name"] }).to eq(["Band 0", "Band 1"])
+            Band.limit(2).all.to_a
           end
         end
       end
@@ -337,16 +295,12 @@ describe Mongoid::QueryCache do
       context "when specifying a different skip value" do
 
         before do
-          Band.destroy_all
-
-          5.times { |i| Band.create!(name: "Band #{i}") }
+          Band.limit(2).skip(1).all.to_a
         end
 
         it "queries again" do
           expect_query(1) do
-            result = Band.limit(2).skip(3).all.to_a
-            expect(result.length).to eq(2)
-            expect(result.map { |r| r["name"] }).to eq(["Band 3", "Band 4"])
+            Band.limit(2).skip(3).all.to_a
           end
         end
       end
@@ -382,25 +336,6 @@ describe Mongoid::QueryCache do
       end
     end
 
-    context 'when querying colleciton larger than the batch size' do
-      before do
-        Band.destroy_all
-        101.times { |i| Band.create!(_id: i) }
-      end
-
-      it 'does not raise an exception when querying multiple times' do
-        expect do
-          results1 = Band.all.to_a
-          expect(results1.length).to eq(101)
-          expect(results1.map { |band| band["_id"] }).to eq([*0..100])
-
-          results2 = Band.all.to_a
-          expect(results2.length).to eq(101)
-          expect(results2.map { |band| band["_id"] }).to eq([*0..100])
-        end.not_to raise_error
-      end
-    end
-
     context "when query caching is enabled and the batch_size is set" do
 
       around(:each) do |example|
@@ -554,7 +489,7 @@ describe Mongoid::QueryCache do
       Mongoid::QueryCache.enabled = true
       10.times { Band.create! }
 
-      Band.batch_size(4).all.to_a
+      Band.batch_size(4).all.any?
     end
 
     it 'does not cache the result' do
@@ -572,47 +507,3 @@ describe Mongoid::QueryCache do
     end
   end
 end
-
-describe Mongoid::QueryCache::Middleware do
-
-  let :middleware do
-    Mongoid::QueryCache::Middleware.new(app)
-  end
-
-  context "when not touching mongoid on the app" do
-
-    let(:app) do
-      ->(env) { @enabled = Mongoid::QueryCache.enabled?; [200, env, "app"] }
-    end
-
-    it "returns success" do
-      code, _ = middleware.call({})
-      expect(code).to eq(200)
-    end
-
-    it "enableds the query cache" do
-      middleware.call({})
-      expect(@enabled).to be true
-    end
-  end
-
-  context "when querying on the app" do
-
-    let(:app) do
-      ->(env) {
-        Band.all.to_a
-        [200, env, "app"]
-      }
-    end
-
-    it "returns success" do
-      code, _ = middleware.call({})
-      expect(code).to eq(200)
-    end
-
-    it "cleans the query cache after reponds" do
-      middleware.call({})
-      expect(Mongoid::QueryCache.cache_table).to be_empty
-    end
-  end
-end

data/spec/mongoid/relations/proxy_spec.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 # require "spec_helper"
 #
 # describe Mongoid::Relations::Proxy do
 #
-#   describe '#with' do
+#   describe '#with', if: non_legacy_server? do
 #
 #     let(:circus) do
 #       Circus.new

data/spec/mongoid/reloadable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Reloadable do

data/spec/mongoid/scopable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Scopable do
@@ -227,8 +230,7 @@ describe Mongoid::Scopable do
 
     context "when provided a criteria" do
 
-      context 'when a collation is defined on the criteria' do
-        min_server_version '3.4'
+      context 'when a collation is defined on the criteria', if: collation_supported? do
 
         before do
           Band.scope(:tests, ->{ Band.where(name: 'TESTING').collation(locale: 'en_US', strength: 2) })

data/spec/mongoid/selectable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Selectable do

data/spec/mongoid/serializable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Serializable do

data/spec/mongoid/shardable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Shardable do

data/spec/mongoid/stateful_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Stateful do

data/spec/mongoid/tasks/database_rake_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "rake"
 require "spec_helper"
 
@@ -45,7 +48,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 +61,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 +74,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 +88,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 +120,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 +138,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 +147,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 +156,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 +177,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 +201,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 +227,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 +253,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 +269,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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe "Mongoid::Tasks::Database" do
@@ -133,7 +136,7 @@ describe "Mongoid::Tasks::Database" do
       expect(removed_indexes).to be_empty
     end
 
-    context 'when the index is a text index' do
+    context 'when the index is a text index', if: non_legacy_server? do
 
       before do
         class Band

data/spec/mongoid/threaded_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Threaded do

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Timestamps::Created::Short do