mongoid 3.1.7 → 4.0.0.alpha1

data/spec/mongoid/{components_spec.rb → composable_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Components do
+describe Mongoid::Composable do
 
   describe ".prohibited_methods" do
 
@@ -8,14 +8,14 @@ describe Mongoid::Components do
       described_class.prohibited_methods
     end
 
-    Mongoid::Components::MODULES.each do |mod|
+    Mongoid::Composable::MODULES.each do |mod|
 
       context "when checking in #{mod}" do
 
         mod.instance_methods.each do |method|
 
           it "includes #{method}" do
-            methods.should include(method.to_sym)
+            expect(methods).to include(method.to_sym)
           end
         end
       end

data/spec/mongoid/config/environment_spec.rb

@@ -25,7 +25,7 @@ describe Mongoid::Config::Environment do
       end
 
       it "returns the rails environment" do
-        described_class.env_name.should eq("production")
+        expect(described_class.env_name).to eq("production")
       end
     end
 
@@ -47,7 +47,7 @@ describe Mongoid::Config::Environment do
       end
 
       it "returns the sinatra environment" do
-        described_class.env_name.should eq("staging")
+        expect(described_class.env_name).to eq("staging")
       end
     end
 
@@ -63,7 +63,7 @@ describe Mongoid::Config::Environment do
       end
 
       it "returns the rack environment" do
-        described_class.env_name.should eq("acceptance")
+        expect(described_class.env_name).to eq("acceptance")
       end
     end
 

data/spec/mongoid/config/options_spec.rb

@@ -9,7 +9,7 @@ describe Mongoid::Config::Options do
   describe "#defaults" do
 
     it "returns the default options" do
-      config.defaults.should_not be_empty
+      expect(config.defaults).to_not be_empty
     end
   end
 
@@ -22,15 +22,15 @@ describe Mongoid::Config::Options do
       end
 
       it "defines a getter" do
-        config.preload_models.should be_false
+        expect(config.preload_models).to be false
       end
 
       it "defines a setter" do
-        (config.preload_models = true).should be_true
+        (config.preload_models = expect(true)).to be true
       end
 
       it "defines a presence check" do
-        config.should_not be_preload_models
+        expect(config).to_not be_preload_models
       end
     end
   end
@@ -43,14 +43,14 @@ describe Mongoid::Config::Options do
     end
 
     it "resets the settings to the defaults" do
-      config.preload_models.should be_false
+      expect(config.preload_models).to be false
     end
   end
 
   describe "#settings" do
 
     it "returns the settings" do
-      config.settings.should_not be_empty
+      expect(config.settings).to_not be_empty
     end
   end
 end

data/spec/mongoid/config_spec.rb

@@ -12,7 +12,7 @@ describe Mongoid::Config do
   describe "#configured?" do
 
     after do
-      described_class.connect_to(database_id, consistency: :strong)
+      described_class.connect_to(database_id, read: :primary)
     end
 
     context "when a default session config exists" do
@@ -33,7 +33,7 @@ describe Mongoid::Config do
         end
 
         it "returns true" do
-          described_class.should be_configured
+          expect(described_class).to be_configured
         end
       end
     end
@@ -45,17 +45,17 @@ describe Mongoid::Config do
       end
 
       it "returns false" do
-        described_class.should_not be_configured
+        expect(described_class).to_not be_configured
       end
     end
   end
 
   describe "#destructive_fields" do
 
-    Mongoid::Components.prohibited_methods.each do |method|
+    Mongoid::Composable.prohibited_methods.each do |method|
 
       it "contains #{method}" do
-        described_class.destructive_fields.should include(method)
+        expect(described_class.destructive_fields).to include(method)
       end
     end
   end
@@ -99,44 +99,32 @@ describe Mongoid::Config do
         described_class.reset
       end
 
-      it "sets the allow dynamic fields option" do
-        described_class.allow_dynamic_fields.should be_true
-      end
-
-      it "sets the identity map option" do
-        described_class.identity_map_enabled.should be_false
-      end
-
       it "sets the include root in json option" do
-        described_class.include_root_in_json.should be_false
+        expect(described_class.include_root_in_json).to be false
       end
 
       it "sets the include type with serialization option" do
-        described_class.include_type_for_serialization.should be_false
+        expect(described_class.include_type_for_serialization).to be false
       end
 
       it "sets the scope overwrite option" do
-        described_class.scope_overwrite_exception.should be_false
+        expect(described_class.scope_overwrite_exception).to be false
       end
 
       it "sets the preload models option" do
-        described_class.preload_models.should be_false
+        expect(described_class.preload_models).to be false
       end
 
       it "sets the raise not found error option" do
-        described_class.raise_not_found_error.should be_true
-      end
-
-      it "sets the skip version check option" do
-        described_class.skip_version_check.should be_true
+        expect(described_class.raise_not_found_error).to be true
       end
 
       it "sets the use activesupport time zone option" do
-        described_class.use_activesupport_time_zone.should be_true
+        expect(described_class.use_activesupport_time_zone).to be true
       end
 
       it "sets the use utc option" do
-        described_class.use_utc.should be_false
+        expect(described_class.use_utc).to be false
       end
     end
 
@@ -157,44 +145,32 @@ describe Mongoid::Config do
           described_class.load!(file)
         end
 
-        it "sets the allow dynamic fields option" do
-          described_class.allow_dynamic_fields.should be_true
-        end
-
-        it "sets the identity map option" do
-          described_class.identity_map_enabled.should be_false
-        end
-
         it "sets the include root in json option" do
-          described_class.include_root_in_json.should be_false
+          expect(described_class.include_root_in_json).to be false
         end
 
         it "sets the include type with serialization option" do
-          described_class.include_type_for_serialization.should be_false
+          expect(described_class.include_type_for_serialization).to be false
         end
 
         it "sets the scope overwrite option" do
-          described_class.scope_overwrite_exception.should be_false
+          expect(described_class.scope_overwrite_exception).to be false
         end
 
         it "sets the preload models option" do
-          described_class.preload_models.should be_false
+          expect(described_class.preload_models).to be false
         end
 
         it "sets the raise not found error option" do
-          described_class.raise_not_found_error.should be_true
-        end
-
-        it "sets the skip version check option" do
-          described_class.skip_version_check.should be_true
+          expect(described_class.raise_not_found_error).to be true
         end
 
         it "sets the use activesupport time zone option" do
-          described_class.use_activesupport_time_zone.should be_true
+          expect(described_class.use_activesupport_time_zone).to be true
         end
 
         it "sets the use utc option" do
-          described_class.use_utc.should be_false
+          expect(described_class.use_utc).to be false
         end
       end
 
@@ -211,7 +187,7 @@ describe Mongoid::Config do
           end
 
           it "sets the default hosts" do
-            default[:hosts].should eq(["#{HOST}:#{PORT}"])
+            expect(default[:hosts]).to eq(["#{HOST}:#{PORT}"])
           end
 
           context "when the default has options" do
@@ -220,8 +196,8 @@ describe Mongoid::Config do
               default["options"]
             end
 
-            it "sets the consistency option" do
-              options["consistency"].should eq(:strong)
+            it "sets the read option" do
+              expect(options["read"]).to eq("primary")
             end
           end
         end
@@ -237,7 +213,7 @@ describe Mongoid::Config do
           end
 
           it "sets the secondary host" do
-            secondary["hosts"].should eq([ ENV["MONGOHQ_SINGLE_URL"] ])
+            expect(secondary["hosts"]).to eq([ ENV["MONGOHQ_SINGLE_URL"] ])
           end
         end
       end
@@ -253,7 +229,7 @@ describe Mongoid::Config do
       end
 
       it "does not try to assign options" do
-        described_class.allow_dynamic_fields.should be_true
+        expect(described_class.preload_models).to be false
       end
     end
 

data/spec/mongoid/contextual/aggregable/memory_spec.rb

@@ -33,7 +33,7 @@ describe Mongoid::Contextual::Aggregable::Memory do
           end
 
           it "returns the avg of the provided field" do
-            avg.should eq(750)
+            expect(avg).to eq(750)
           end
         end
 
@@ -62,7 +62,7 @@ describe Mongoid::Contextual::Aggregable::Memory do
           end
 
           it "returns the avg of the provided field" do
-            avg.should eq(7.5)
+            expect(avg).to eq(7.5)
           end
         end
       end
@@ -86,7 +86,7 @@ describe Mongoid::Contextual::Aggregable::Memory do
         end
 
         it "returns nil" do
-          avg.should be_nil
+          expect(avg).to be_nil
         end
       end
     end
@@ -121,7 +121,7 @@ describe Mongoid::Contextual::Aggregable::Memory do
         end
 
         it "returns the max of the provided field" do
-          max.should eq(1000)
+          expect(max).to eq(1000)
         end
 
         context "when no documents match" do
@@ -139,7 +139,7 @@ describe Mongoid::Contextual::Aggregable::Memory do
           end
 
           it "returns nil" do
-            max.should be_nil
+            expect(max).to be_nil
           end
         end
       end
@@ -153,7 +153,7 @@ describe Mongoid::Contextual::Aggregable::Memory do
         end
 
         it "returns the document with the max value for the field" do
-          max.should eq(depeche)
+          expect(max).to eq(depeche)
         end
       end
     end
@@ -188,7 +188,7 @@ describe Mongoid::Contextual::Aggregable::Memory do
         end
 
         it "returns the min of the provided field" do
-          min.should eq(500)
+          expect(min).to eq(500)
         end
 
         context "when no documents match" do
@@ -206,7 +206,7 @@ describe Mongoid::Contextual::Aggregable::Memory do
           end
 
           it "returns nil" do
-            min.should be_nil
+            expect(min).to be_nil
           end
         end
       end
@@ -220,7 +220,7 @@ describe Mongoid::Contextual::Aggregable::Memory do
         end
 
         it "returns the document with the min value for the field" do
-          min.should eq(tool)
+          expect(min).to eq(tool)
         end
       end
     end
@@ -255,7 +255,7 @@ describe Mongoid::Contextual::Aggregable::Memory do
         end
 
         it "returns the sum of the provided field" do
-          sum.should eq(1500)
+          expect(sum).to eq(1500)
         end
 
         context "when no documents match" do
@@ -273,7 +273,7 @@ describe Mongoid::Contextual::Aggregable::Memory do
           end
 
           it "returns zero" do
-            sum.should eq(0)
+            expect(sum).to eq(0)
           end
         end
       end
@@ -285,7 +285,7 @@ describe Mongoid::Contextual::Aggregable::Memory do
         end
 
         it "returns the sum for the provided block" do
-          sum.should eq(1500)
+          expect(sum).to eq(1500)
         end
       end
     end

data/spec/mongoid/contextual/aggregable/mongo_spec.rb

@@ -31,23 +31,23 @@ describe Mongoid::Contextual::Aggregable::Mongo do
           end
 
           it "returns an avg" do
-            aggregates["avg"].should eq(900)
+            expect(aggregates["avg"]).to eq(900)
           end
 
-          it "returns a count" do
-            aggregates["count"].should eq(2)
+          it "returns a count of documents with that field" do
+            expect(aggregates["count"]).to eq(2)
           end
 
           it "returns a max" do
-            aggregates["max"].should eq(1000)
+            expect(aggregates["max"]).to eq(1000)
           end
 
           it "returns a min" do
-            aggregates["min"].should eq(800)
+            expect(aggregates["min"]).to eq(800)
           end
 
           it "returns a sum" do
-            aggregates["sum"].should eq(1800)
+            expect(aggregates["sum"]).to eq(1800)
           end
         end
 
@@ -58,23 +58,23 @@ describe Mongoid::Contextual::Aggregable::Mongo do
           end
 
           it "returns an avg" do
-            aggregates["avg"].should eq(750)
+            expect(aggregates["avg"]).to eq(750)
           end
 
-          it "returns a count" do
-            aggregates["count"].should eq(2)
+          it "returns a count of documents with that field" do
+            expect(aggregates["count"]).to eq(2)
           end
 
           it "returns a max" do
-            aggregates["max"].should eq(1000)
+            expect(aggregates["max"]).to eq(1000)
           end
 
           it "returns a min" do
-            aggregates["min"].should eq(500)
+            expect(aggregates["min"]).to eq(500)
           end
 
           it "returns a sum" do
-            aggregates["sum"].should eq(1500)
+            expect(aggregates["sum"]).to eq(1500)
           end
         end
 
@@ -89,23 +89,23 @@ describe Mongoid::Contextual::Aggregable::Mongo do
           end
 
           it "returns an avg" do
-            aggregates["avg"].should eq(1000)
+            expect(aggregates["avg"]).to eq(1000)
           end
 
-          it "returns a count" do
-            aggregates["count"].should eq(1)
+          it "returns a count of documents with that field" do
+            expect(aggregates["count"]).to eq(1)
           end
 
           it "returns a max" do
-            aggregates["max"].should eq(1000)
+            expect(aggregates["max"]).to eq(1000)
           end
 
           it "returns a min" do
-            aggregates["min"].should eq(1000)
+            expect(aggregates["min"]).to eq(1000)
           end
 
           it "returns a sum" do
-            aggregates["sum"].should eq(1000)
+            expect(aggregates["sum"]).to eq(1000)
           end
         end
 
@@ -149,23 +149,23 @@ describe Mongoid::Contextual::Aggregable::Mongo do
         end
 
         it "returns an avg" do
-          aggregates["avg"].should eq(0)
+          expect(aggregates["avg"]).to be_nil
         end
 
-        it "returns a count" do
-          aggregates["count"].should eq(2)
+        it "returns a count of documents with that field" do
+          expect(aggregates["count"]).to eq(0)
         end
 
         it "returns a max" do
-          aggregates["max"].should be_nil
+          expect(aggregates["max"]).to be_nil
         end
 
         it "returns a min" do
-          aggregates["min"].should be_nil
+          expect(aggregates["min"]).to be_nil
         end
 
         it "returns a sum" do
-          aggregates["sum"].should eq(0)
+          expect(aggregates["sum"]).to be_nil
         end
       end
 
@@ -192,7 +192,11 @@ describe Mongoid::Contextual::Aggregable::Mongo do
           end
 
           it "returns a min" do
-            aggregates["min"].should eq(50)
+            expect(aggregates["min"]).to eq(50)
+          end
+
+          it "returns a count of documents with that field" do
+            expect(aggregates["count"]).to eq(3)
           end
         end
 
@@ -214,7 +218,11 @@ describe Mongoid::Contextual::Aggregable::Mongo do
           end
 
           it "returns a min" do
-            aggregates["min"].should eq(50)
+            expect(aggregates["min"]).to eq(50)
+          end
+
+          it "returns a count of documents with that field" do
+            expect(aggregates["count"]).to eq(4)
           end
         end
       end
@@ -230,7 +238,7 @@ describe Mongoid::Contextual::Aggregable::Mongo do
         end
 
         it "returns nil" do
-          aggregates.should eq({ "count" => 0 })
+          expect(aggregates).to eq({ "count" => 0, "sum" => nil, "avg" => nil, "min" => nil, "max" => nil })
         end
       end
     end
@@ -263,7 +271,7 @@ describe Mongoid::Contextual::Aggregable::Mongo do
         end
 
         it "returns the avg of the provided field" do
-          avg.should eq(750)
+          expect(avg).to eq(750)
         end
       end
 
@@ -286,7 +294,7 @@ describe Mongoid::Contextual::Aggregable::Mongo do
         end
 
         it "returns nil" do
-          avg.should be_nil
+          expect(avg).to be_nil
         end
       end
     end
@@ -319,7 +327,7 @@ describe Mongoid::Contextual::Aggregable::Mongo do
         end
 
         it "returns the max of the provided field" do
-          max.should eq(1000)
+          expect(max).to eq(1000)
         end
 
         context "when no documents match" do
@@ -337,7 +345,7 @@ describe Mongoid::Contextual::Aggregable::Mongo do
           end
 
           it "returns nil" do
-            max.should be_nil
+            expect(max).to be_nil
           end
         end
       end
@@ -351,7 +359,7 @@ describe Mongoid::Contextual::Aggregable::Mongo do
         end
 
         it "returns the document with the max value for the field" do
-          max.should eq(depeche)
+          expect(max).to eq(depeche)
         end
       end
     end
@@ -384,7 +392,7 @@ describe Mongoid::Contextual::Aggregable::Mongo do
         end
 
         it "returns the min of the provided field" do
-          min.should eq(500)
+          expect(min).to eq(500)
         end
 
         context "when no documents match" do
@@ -402,7 +410,7 @@ describe Mongoid::Contextual::Aggregable::Mongo do
           end
 
           it "returns nil" do
-            min.should be_nil
+            expect(min).to be_nil
           end
         end
       end
@@ -416,7 +424,7 @@ describe Mongoid::Contextual::Aggregable::Mongo do
         end
 
         it "returns the document with the min value for the field" do
-          min.should eq(tool)
+          expect(min).to eq(tool)
         end
       end
     end
@@ -449,7 +457,7 @@ describe Mongoid::Contextual::Aggregable::Mongo do
         end
 
         it "returns the sum of the provided field" do
-          sum.should eq(1500)
+          expect(sum).to eq(1500)
         end
 
         context "when no documents match" do
@@ -467,7 +475,7 @@ describe Mongoid::Contextual::Aggregable::Mongo do
           end
 
           it "returns zero" do
-            sum.should eq(0)
+            expect(sum).to eq(0)
           end
         end
       end
@@ -479,7 +487,7 @@ describe Mongoid::Contextual::Aggregable::Mongo do
         end
 
         it "returns the sum for the provided block" do
-          sum.should eq(1500)
+          expect(sum).to eq(1500)
         end
       end
     end