spec/unit/resource_collection_spec.rb in activeadmin-0.6.2 vs spec/unit/resource_collection_spec.rb in activeadmin-0.6.3

@@ -1,15 +1,21 @@
 require 'spec_helper'
 require 'active_admin/resource_collection'
 
-include ActiveAdmin
-
 describe ActiveAdmin::ResourceCollection do
   let(:application) { ActiveAdmin::Application.new }
-  let(:namespace)   { ActiveAdmin::Namespace.new(application, :admin) }
+  let(:namespace)   { ActiveAdmin::Namespace.new application, :admin }
+  let(:collection)  { ActiveAdmin::ResourceCollection.new }
 
-  let(:collection){ ResourceCollection.new }
+  it { should respond_to :[]       }
+  it { should respond_to :add      }
+  it { should respond_to :each     }
+  it { should respond_to :has_key? }
+  it { should respond_to :keys     }
+  it { should respond_to :values   }
+  it { should respond_to :size     }
+  it { should respond_to :to_a     }
 
   it "should have no resources when new" do
     collection.should be_empty
   end
 
@@ -23,11 +29,11 @@
     resource = mock :resource_name => "MyResource"
     collection.add resource
     collection.keys.should == [resource.resource_name]
   end
 
-  describe "adding a new resource" do
+  describe "#add" do
     let(:resource){ mock :resource_name => "MyResource" }
 
     it "should return the resource" do
       collection.add(resource).should == resource
     end
@@ -48,15 +54,46 @@
 
     it "should not add a new resource" do
       collection.add(resource); collection.add(resource)
       collection.values.should == [resource]
     end
+
+    it "shouldn't allow a resource name mismatch to occur" do
+      expect {
+        ActiveAdmin.register Category
+        ActiveAdmin.register Post, as: "Category"
+      }.to raise_error ActiveAdmin::ResourceCollection::ConfigMismatch
+    end
+
+    it "shouldn't allow a Page/Resource mismatch to occur" do
+      expect {
+        ActiveAdmin.register User
+        ActiveAdmin.register_page 'User'
+      }.to raise_error ActiveAdmin::ResourceCollection::IncorrectClass
+    end
+
+    describe "should store both renamed and non-renamed resources" do
+      let(:resource) { ActiveAdmin::Resource.new namespace, Category }
+      let(:renamed)  { ActiveAdmin::Resource.new namespace, Category, as: "Subcategory" }
+
+      it "when the renamed version is added first" do
+        collection.add renamed
+        collection.add resource
+        collection.values.should include(resource, renamed)
+      end
+
+      it "when the renamed version is added last" do
+        collection.add resource
+        collection.add renamed
+        collection.values.should include(resource, renamed)
+      end
+    end
   end
 
   describe "#[]" do
-    let(:resource)              { Resource.new(namespace, resource_class) }
-    let(:inherited_resource)    { Resource.new(namespace, inherited_resource_class) }
+    let(:resource)              { ActiveAdmin::Resource.new namespace, resource_class }
+    let(:inherited_resource)    { ActiveAdmin::Resource.new namespace, inherited_resource_class }
 
     let(:resource_class)           { User }
     let(:inherited_resource_class) { Publisher }
     let(:unregistered_class)       { Category }
 
@@ -100,11 +137,11 @@
         collection[inherited_resource_class].should == resource
       end
     end
 
     context "with a renamed resource" do
-      let(:renamed_resource) { Resource.new(namespace, resource_class, :as => name) }
+      let(:renamed_resource) { ActiveAdmin::Resource.new namespace, resource_class, as: name }
       let(:name)             { "Administrators" }
 
       before do
         collection.add renamed_resource
       end
@@ -121,33 +158,8 @@
         collection[name].should == renamed_resource
       end
     end
   end
 
-  describe ".add" do
-    let(:resource)         { Resource.new(namespace, Category) }
-    let(:resource_renamed) { Resource.new(namespace, Category, as: "Subcategory") }
-
-    context "when renamed resource is added first" do
-      before do
-        collection.add(resource_renamed)
-        collection.add(resource)
-      end
-
-      it "contains both resources" do
-        collection.values.should include(resource, resource_renamed)
-      end
-    end
-
-    context "when resource is added first" do
-      before do
-        collection.add(resource)
-        collection.add(resource_renamed)
-      end
-
-      it "contains both resources" do
-        collection.values.should include(resource, resource_renamed)
-      end
-    end
-  end
+  pending "specs for subclasses of Page and Resource"
 
 end