mongoid 4.0.0.alpha2 → 4.0.0.beta1

data/spec/mongoid/tasks/database_spec.rb

@@ -0,0 +1,148 @@
+require "spec_helper"
+
+describe "Mongoid::Tasks::Database" do
+
+  let(:logger) do
+    double("logger").tap do |log|
+      allow(log).to receive(:info)
+    end
+  end
+
+  before do
+    allow(Mongoid::Tasks::Database).to receive(:logger).and_return(logger)
+  end
+
+  let(:models) do
+    [ User, Account, Address ]
+  end
+
+  describe ".create_indexes" do
+
+    let!(:klass) do
+      User
+    end
+
+    let(:indexes) do
+      Mongoid::Tasks::Database.create_indexes(models)
+    end
+
+    context "with ordinary Rails models" do
+
+      it "creates the indexes for the models" do
+        expect(klass).to receive(:create_indexes).once
+        indexes
+      end
+    end
+
+    context "with a model without indexes" do
+
+      let(:klass) do
+        Account
+      end
+
+      it "does nothing" do
+        expect(klass).to receive(:create_indexes).never
+        indexes
+      end
+    end
+
+    context "when an exception is raised" do
+
+      it "is not swallowed" do
+        expect(klass).to receive(:create_indexes).and_raise(ArgumentError)
+        expect { indexes }.to raise_error(ArgumentError)
+      end
+    end
+
+    context "when index is defined on embedded model" do
+
+      let!(:klass) do
+        Address
+      end
+
+      before do
+        klass.index(street: 1)
+      end
+
+      it "does nothing, but logging" do
+        expect(klass).to receive(:create_indexes).never
+        indexes
+      end
+    end
+  end
+
+  describe ".undefined_indexes" do
+
+    before(:each) do
+      Mongoid::Tasks::Database.create_indexes(models)
+    end
+
+    let(:indexes) do
+      Mongoid::Tasks::Database.undefined_indexes(models)
+    end
+
+    it "returns the removed indexes" do
+      expect(indexes).to be_empty
+    end
+
+    context "with extra index on model collection" do
+
+      before(:each) do
+        User.collection.indexes.create(account_expires: 1)
+      end
+
+      let(:names) do
+        indexes[User].map{ |index| index['name'] }
+      end
+
+      it "should have single index returned" do
+        expect(names).to eq(['account_expires_1'])
+      end
+    end
+  end
+
+  describe ".remove_undefined_indexes" do
+
+    let(:indexes) do
+      User.collection.indexes
+    end
+
+    before(:each) do
+      Mongoid::Tasks::Database.create_indexes(models)
+      indexes.create(account_expires: 1)
+      Mongoid::Tasks::Database.remove_undefined_indexes(models)
+    end
+
+    let(:removed_indexes) do
+      Mongoid::Tasks::Database.undefined_indexes(models)
+    end
+
+    it "returns the removed indexes" do
+      expect(removed_indexes).to be_empty
+    end
+  end
+
+  describe ".remove_indexes" do
+
+    let!(:klass) do
+      User
+    end
+
+    let(:indexes) do
+      klass.collection.indexes
+    end
+
+    before :each do
+      Mongoid::Tasks::Database.create_indexes(models)
+      Mongoid::Tasks::Database.remove_indexes(models)
+    end
+
+    it "removes indexes from klass" do
+      expect(indexes.reject{ |doc| doc["name"] == "_id_" }).to be_empty
+    end
+
+    it "leaves _id index untouched" do
+      expect(indexes.select{ |doc| doc["name"] == "_id_" }).to_not be_empty
+    end
+  end
+end

data/spec/mongoid/validatable/uniqueness_spec.rb

@@ -1031,6 +1031,13 @@ describe Mongoid::Validatable::UniquenessValidator do
           end
         end
 
+        context "when not allowing nil" do
+
+          it "raises a validation error" do
+            expect { LineItem.create! }.to raise_error Mongoid::Errors::Validations
+          end
+        end
+
         context "when allowing nil" do
 
           before do

data/spec/rails/mongoid_spec.rb

@@ -9,322 +9,6 @@ describe "Rails::Mongoid" do
     end
   end
 
-  describe ".create_indexes" do
-
-    let(:logger) do
-      double
-    end
-
-    let!(:klass) do
-      User
-    end
-
-    let(:model_paths) do
-      [ "spec/app/models/user.rb" ]
-    end
-
-    let(:indexes) do
-      Rails::Mongoid.create_indexes
-    end
-
-    context "with ordinary Rails models" do
-
-      it "creates the indexes for the models" do
-        expect(klass).to receive(:create_indexes).once
-        indexes
-      end
-    end
-
-    context "with a model without indexes" do
-
-      let(:klass) do
-        Account
-      end
-
-      it "does nothing" do
-        expect(klass).to receive(:create_indexes).never
-        indexes
-      end
-    end
-
-    context "when an exception is raised" do
-
-      it "is not swallowed" do
-        expect(klass).to receive(:create_indexes).and_raise(ArgumentError)
-        expect { indexes }.to raise_error(ArgumentError)
-      end
-    end
-
-    context "when index is defined on embedded model" do
-
-      let!(:klass) do
-        Address
-      end
-
-      before do
-        klass.index(street: 1)
-      end
-
-      it "does nothing, but logging" do
-        expect(klass).to receive(:create_indexes).never
-        indexes
-      end
-    end
-  end
-
-  describe ".undefined_indexes" do
-
-    before(:each) do
-      Rails::Mongoid.create_indexes
-    end
-
-    let(:indexes) do
-      Rails::Mongoid.undefined_indexes
-    end
-
-    it "returns the removed indexes" do
-      expect(indexes).to be_empty
-    end
-
-    context "with extra index on model collection" do
-
-      before(:each) do
-        User.collection.indexes.create(account_expires: 1)
-      end
-
-      let(:names) do
-        indexes[User].map{ |index| index['name'] }
-      end
-
-      it "should have single index returned" do
-        expect(names).to eq(['account_expires_1'])
-      end
-    end
-  end
-
-  describe ".remove_undefined_indexes" do
-
-    let(:logger) do
-      double
-    end
-
-    let(:indexes) do
-      User.collection.indexes
-    end
-
-    before(:each) do
-      Rails::Mongoid.create_indexes
-      indexes.create(account_expires: 1)
-      Rails::Mongoid.remove_undefined_indexes
-    end
-
-    let(:removed_indexes) do
-      Rails::Mongoid.undefined_indexes
-    end
-
-    it "returns the removed indexes" do
-      expect(removed_indexes).to be_empty
-    end
-  end
-
-  describe ".remove_indexes" do
-
-    let(:logger) do
-      double
-    end
-
-    let!(:klass) do
-      User
-    end
-
-    let(:indexes) do
-      klass.collection.indexes
-    end
-
-    before :each do
-      Rails::Mongoid.create_indexes
-      Rails::Mongoid.remove_indexes
-    end
-
-    it "removes indexes from klass" do
-      expect(indexes.reject{ |doc| doc["name"] == "_id_" }).to be_empty
-    end
-
-    it "leaves _id index untouched" do
-      expect(indexes.select{ |doc| doc["name"] == "_id_" }).to_not be_empty
-    end
-  end
-
-  describe ".determine_model" do
-
-    let(:logger) do
-      double
-    end
-
-    let!(:klass) do
-      User
-    end
-
-    let(:file) do
-      "app/models/user.rb"
-    end
-
-    let(:model) do
-      Rails::Mongoid.send(:determine_model, file, logger)
-    end
-
-    class EasyURI
-    end
-
-    module Twitter
-      class Follow
-        include Mongoid::Document
-      end
-
-      module List
-        class Tweet
-          include Mongoid::Document
-        end
-      end
-    end
-
-    context "when file is nil" do
-
-      let(:file) do
-        nil
-      end
-
-      it "returns nil" do
-        expect(model).to be_nil
-      end
-    end
-
-    context "when logger is nil" do
-
-      let(:logger) do
-        nil
-      end
-
-      it "returns nil" do
-        expect(model).to be_nil
-      end
-    end
-
-    context "when path is invalid" do
-
-      let(:file) do
-        "fu/bar.rb"
-      end
-
-      it "returns nil" do
-        expect(model).to be_nil
-      end
-    end
-
-    context "when file cannot be constantize" do
-
-      let(:file) do
-        "app/models/easy_uri.rb"
-      end
-
-      before do
-        expect(logger).to receive(:info)
-      end
-
-      it "returns nil" do
-        expect(model).to be_nil
-      end
-    end
-
-    context "when file is not in a subdir" do
-
-      context "when file is from normal model" do
-
-        it "returns klass" do
-          expect(model).to eq(klass)
-        end
-      end
-
-      context "when file is in a module" do
-
-        let(:klass) do
-          Twitter::Follow
-        end
-
-        let(:file) do
-          "app/models/follow.rb"
-        end
-
-        it "logs the class without an error" do
-          expect(logger).to receive(:info)
-          expect {
-            expect(model).to be_nil
-          }.not_to raise_error
-        end
-      end
-    end
-
-    context "when file is in a subdir" do
-
-      context "with file from normal model" do
-
-        let(:file) do
-          "app/models/fu/user.rb"
-        end
-
-        it "returns klass" do
-          expect(logger).to receive(:info)
-          expect(model).to eq(klass)
-        end
-      end
-
-      context "when file is in a module" do
-
-        let(:klass) do
-          Twitter::Follow
-        end
-
-        let(:file) do
-          "app/models/twitter/follow.rb"
-        end
-
-        it "returns klass in module" do
-          expect(model).to eq(klass)
-        end
-      end
-
-      context "when file is in two modules" do
-
-        let(:klass) do
-          Twitter::List::Tweet
-        end
-
-        let(:file) do
-          "app/models/twitter/list/tweet.rb"
-        end
-
-        it "returns klass in module" do
-          expect(model).to eq(klass)
-        end
-      end
-    end
-
-    context "with models present in Rails engines" do
-
-      let(:file) do
-        "/gem_path/engines/some_engine_gem/app/models/user.rb"
-      end
-
-      let(:klass) do
-        User
-      end
-
-      it "requires the models by base name from the engine's app/models dir" do
-        expect(model).to eq(klass)
-      end
-    end
-  end
-
   describe ".preload_models" do
 
     let(:app) do