activeadmin 0.3.4 → 0.4.0

data/spec/unit/arbre/html/tag_spec.rb

@@ -19,7 +19,7 @@ describe Arbre::HTML::Tag do
   end
 
   describe "creating a tag 'for' an object" do
-    let(:model_name){ mock(:singular => "resource_class")}
+    let(:model_name){ mock(:singular => "resource_class", :param_key => 'resource_class')}
     let(:resource_class){ mock(:model_name => model_name) }
     let(:resource){ mock(:class => resource_class, :to_key => ['5'])}
 

data/spec/unit/arbre/html_spec.rb

@@ -6,7 +6,7 @@ describe Arbre do
 
   it "should render a single element" do
     content = span("Hello World")
-    content.to_html.should == <<-HTML
+    content.to_s.should == <<-HTML
 <span>Hello World</span>
 HTML
   end
@@ -15,7 +15,7 @@ HTML
     content = span do
       span "Hello World"
     end
-    content.to_html.should == <<-HTML
+    content.to_s.should == <<-HTML
 <span>
   <span>Hello World</span>
 </span>
@@ -28,7 +28,7 @@ HTML
       li "Second"
       li "Third"
     end
-    content.to_html.should == <<-HTML
+    content.to_s.should == <<-HTML
 <ul>
   <li>First</li>
   <li>Second</li>
@@ -51,7 +51,7 @@ HTML
       li first
       li second
     end
-    content.to_html.should == <<-EOS
+    content.to_s.should == <<-EOS
 <ul>
   <li>First</li>
   <li>Second</li>
@@ -66,7 +66,7 @@ EOS
         li
       end
     end
-    content.to_html.should == <<-HTML
+    content.to_s.should == <<-HTML
 <div>
   <ul></ul>
   <li>
@@ -82,7 +82,7 @@ HTML
         li
       end
     end
-    content.to_html.should == <<-HTML
+    content.to_s.should == <<-HTML
 <div>
   <ul>
     <li></li>
@@ -95,7 +95,7 @@ HTML
     content = div do
       span(ul(li))
     end
-    content.to_html.should == <<-HTML
+    content.to_s.should == <<-HTML
 <div>
   <span>
     <ul>
@@ -113,7 +113,7 @@ HTML
         li
       end
     end
-    content.to_html.should == <<-HTML
+    content.to_s.should == <<-HTML
 <div id="my-tag">
   <ul>
     <li></li>
@@ -131,12 +131,22 @@ HTML
     item.parent.should == list
   end
 
-  it "should set a string content return value with no children" do
-    li do
-      "Hello World"
-    end.to_html.should == <<-HTML
-<li>Hello World</li>
-HTML
+
+  ["Hello World", 1, 1.5].each do |value|
+    it "should append the return value of '#{value}' when no other children added to the DOM" do
+      li do
+        value
+      end.to_s.should == "<li>#{value}</li>\n"
+    end
+  end
+
+  ["Hello World", 1, 1.5].each do |value|
+    it "should not append the return value of '#{value}' when children have been added to the DOM" do
+      li do
+        text_node("Already Added")
+        value
+      end.to_s.should == "<li>Already Added</li>\n"
+    end
   end
 
   describe "text nodes" do
@@ -150,19 +160,19 @@ HTML
   describe "self-closing nodes" do
     it "should not self-close script tags" do
       tag = script :type => 'text/javascript'
-      tag.to_html.should == <<-HTML
+      tag.to_s.should == <<-HTML
 <script type="text/javascript"></script>
 HTML
     end
     it "should self-close meta tags" do
       tag = meta :content => "text/html; charset=utf-8"
-      tag.to_html.should == <<-HTML
+      tag.to_s.should == <<-HTML
 <meta content="text/html; charset=utf-8\"/>
 HTML
     end
     it "should self-close link tags" do
       tag = link :rel => "stylesheet"
-      tag.to_html.should == <<-HTML
+      tag.to_s.should == <<-HTML
 <link rel="stylesheet"/>
 HTML
     end
@@ -170,17 +180,17 @@ HTML
 
   describe "html safe" do
     it "should escape the contents" do
-      span("<br />").to_html.should == <<-HTML
+      span("<br />").to_s.should == <<-HTML
 <span>&lt;br /&gt;</span>
 HTML
     end
 
     it "should return html safe strings" do
-      span("<br />").to_html.should be_html_safe
+      span("<br />").to_s.should be_html_safe
     end
 
     it "should not escape html passed in" do
-      span(span("<br />")).to_html.should == <<-HTML
+      span(span("<br />")).to_s.should == <<-HTML
 <span>
   <span>&lt;br /&gt;</span>
 </span>
@@ -192,7 +202,7 @@ HTML
         span {
           "<br />"
         }
-      }.to_html.should == <<-HTML
+      }.to_s.should == <<-HTML
 <span>
   <span>&lt;br /&gt;</span>
 </span>
@@ -200,7 +210,7 @@ HTML
     end
 
     it "should escape the contents of attributes" do
-      span(:class => "<br />").to_html.should == <<-HTML
+      span(:class => "<br />").to_s.should == <<-HTML
 <span class="&lt;br /&gt;"></span>
 HTML
     end

data/spec/unit/asset_registration_spec.rb

@@ -13,14 +13,20 @@ describe ActiveAdmin::AssetRegistration do
 
   it "should register a stylesheet file" do
     MockRegistration.register_stylesheet "active_admin.css"
-    MockRegistration.stylesheets.should == ["active_admin.css"]
+    MockRegistration.stylesheets.length.should == 1
+    MockRegistration.stylesheets.first.path.should == "active_admin.css"
   end
 
   it "should clear all existing stylesheets" do
     MockRegistration.register_stylesheet "active_admin.css"
-    MockRegistration.stylesheets.should == ["active_admin.css"]    
+    MockRegistration.stylesheets.length.should == 1
     MockRegistration.clear_stylesheets!
-    MockRegistration.stylesheets.should == []
+    MockRegistration.stylesheets.length.should == 0
+  end
+  
+  it "should allow media option when registering stylesheet" do
+    MockRegistration.register_stylesheet "active_admin.css", :media => :print
+    MockRegistration.stylesheets.first.options[:media].should == :print
   end
 
   it "should register a javascript file" do

data/spec/unit/auto_link_spec.rb

@@ -13,7 +13,7 @@ describe "auto linking resources" do
   include ActiveAdmin::ViewHelpers::DisplayHelper
 
   let(:active_admin_config) { AutoLinkMockResource.new(namespace) }
-  let(:namespace){ ActiveAdmin::Namespace.new(ActiveAdmin::Application.new, :admin) }
+  let(:active_admin_namespace){ ActiveAdmin::Namespace.new(ActiveAdmin::Application.new, :admin) }
   let(:post){ Post.create! :title => "Hello World" }
 
   def admin_post_path(post)
@@ -28,7 +28,7 @@ describe "auto linking resources" do
 
   context "when the resource is registered" do
     before do
-      namespace.register Post
+      active_admin_namespace.register Post
     end
     it "should return a link with the display name of the object" do
       self.should_receive(:link_to).with("Hello World", admin_post_path(post))

data/spec/unit/base_controller_shared_examples.rb

@@ -0,0 +1,28 @@
+# Required methods:
+#   * controller_class
+#   * controller
+#
+shared_examples_for "BaseController" do
+  let(:controller_class) { described_class }
+
+  describe "Menu" do
+    describe "setting the current tab" do
+      before do 
+        controller.stub!(:active_admin_config => resource, :parent? => true)
+        controller.send :set_current_tab # Run the before filter
+      end
+      subject{ controller.instance_variable_get(:@current_tab) }
+
+      context "when menu item name is 'Resources' without a parent menu item" do
+        let(:resource){ mock(:menu_item_name => "Resources", :parent_menu_item_name => nil, :belongs_to? => false) }
+        it { should == "Resources" }
+      end
+
+      context "when there is a parent menu item of 'Admin'" do
+        let(:resource){ mock(:parent_menu_item_name => "Admin", :menu_item_name => "Resources", :belongs_to? => false) }
+        it { should == "Admin/Resources" }
+      end
+    end
+  end
+
+end

data/spec/unit/base_controller_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+require File.expand_path('base_controller_shared_examples', File.dirname(__FILE__))
+
+describe ActiveAdmin::BaseController do
+  let(:controller) { ActiveAdmin::BaseController.new }
+
+  it_should_behave_like "BaseController"
+end

data/spec/unit/belongs_to_spec.rb

@@ -1,45 +1,42 @@
 require 'spec_helper' 
 
-module ActiveAdmin
-  class Resource
-    describe BelongsTo do
+describe ActiveAdmin::Resource::BelongsTo do
 
-      let(:application){ ActiveAdmin::Application.new }
-      let(:namespace){ Namespace.new(application, :admin) }
-      let(:post){ namespace.register(Post) }
-      let(:belongs_to){ BelongsTo.new(post, :user) }
 
-      it "should have an owner" do
-        belongs_to.owner.should == post
-      end
+  let(:application){ ActiveAdmin::Application.new }
+  let(:namespace){ Namespace.new(application, :admin) }
+  let(:post){ namespace.register(Post) }
+  let(:belongs_to){ ActiveAdmin::Resource::BelongsTo.new(post, :user) }
 
-      it "should have a namespace" do
-        belongs_to.namespace.should == namespace
-      end
+  it "should have an owner" do
+    belongs_to.owner.should == post
+  end
+
+  it "should have a namespace" do
+    belongs_to.namespace.should == namespace
+  end
 
-      describe "finding the target" do
-        context "when the resource has been registered" do
-          let(:user){ namespace.register(User) }
-          before { user } # Ensure user is registered
-
-          it "should return the target resource" do
-            belongs_to.target.should == user
-          end
-        end
-
-        context "when the resource has not been registered" do
-          it "should raise a ActiveAdmin::BelongsTo::TargetNotFound" do
-            lambda {
-              belongs_to.target
-            }.should raise_error(ActiveAdmin::Resource::BelongsTo::TargetNotFound)
-          end
-        end
+  describe "finding the target" do
+    context "when the resource has been registered" do
+      let(:user){ namespace.register(User) }
+      before { user } # Ensure user is registered
+
+      it "should return the target resource" do
+        belongs_to.target.should == user
       end
+    end
 
-      it "should be optional" do
-        belongs_to = BelongsTo.new post, :user, :optional => true
-        belongs_to.should be_optional
+    context "when the resource has not been registered" do
+      it "should raise a ActiveAdmin::BelongsTo::TargetNotFound" do
+        lambda {
+          belongs_to.target
+        }.should raise_error(ActiveAdmin::Resource::BelongsTo::TargetNotFound)
       end
     end
   end
+
+  it "should be optional" do
+    belongs_to = ActiveAdmin::Resource::BelongsTo.new post, :user, :optional => true
+    belongs_to.should be_optional
+  end
 end

data/spec/unit/comments_spec.rb

@@ -3,38 +3,68 @@ require 'spec_helper'
 describe "Comments" do
   let(:application){ ActiveAdmin::Application.new }
 
-  describe "Configuration" do
-    it "should have an array of namespaces which allow comments" do
-      application.allow_comments_in.should be_an_instance_of(Array)
-    end
-
-    it "should allow comments in the default namespace by default" do
-      application.allow_comments_in.should include(application.default_namespace)
-    end
-  end
-
   describe ActiveAdmin::Comment do
     describe "Associations and Validations" do
       it { should belong_to :resource }
       it { should belong_to :author }
 
-      it { should validate_presence_of :resource_id }
-      it { should validate_presence_of :resource_type }
+      it { should validate_presence_of :resource }
       it { should validate_presence_of :body }
       it { should validate_presence_of :namespace }
     end
+
+    describe ".find_for_resource_in_namespace" do
+      let(:post){ Post.create!(:title => "Hello World") }
+      let(:namespace_name){ "admin" }
+
+      before do
+        @comment = ActiveAdmin::Comment.create! :resource => post,
+                                                :body => "A Comment",
+                                                :namespace => namespace_name
+      end
+
+      it "should return a comment for the resource in the same namespace" do
+        ActiveAdmin::Comment.find_for_resource_in_namespace(post, namespace_name).should == [@comment]
+      end
+
+      it "should not return a comment for the same resource in a different namespace" do
+        ActiveAdmin::Comment.find_for_resource_in_namespace(post, 'public').should == []
+      end
+
+      it "should not return a comment for a different resource" do
+        another_post = Post.create! :title => "Another Hello World"
+        ActiveAdmin::Comment.find_for_resource_in_namespace(another_post, namespace_name).should == []
+      end
+    end
   end
 
   describe ActiveAdmin::Comments::NamespaceHelper do
     describe "#comments?" do
-      it "should have comments if the namespace is in the settings" do
+
+      it "should have comments when the namespace allows comments" do
         ns = ActiveAdmin::Namespace.new(application, :admin)
+        ns.allow_comments = true
         ns.comments?.should be_true
       end
-      it "should not have comments if the namespace is not in the settings" do
-        ns = ActiveAdmin::Namespace.new(application, :not_in_comments)
+
+      it "should not have comments when the namespace does not allow comments" do
+        ns = ActiveAdmin::Namespace.new(application, :admin)
+        ns.allow_comments = false
         ns.comments?.should be_false
       end
+
+      it "should have comments when the application allows comments and no local namespace config" do
+        application.allow_comments = true
+        ns = ActiveAdmin::Namespace.new(application, :admin)
+        ns.comments?.should be_true
+      end
+
+      it "should not have comments when the application does not allow commands and no local namespace config" do
+        application.allow_comments = false
+        ns = ActiveAdmin::Namespace.new(application, :admin)
+        ns.comments?.should be_false
+      end
+
     end
   end
 

data/spec/unit/config_shared_examples.rb

@@ -0,0 +1,119 @@
+shared_examples_for "ActiveAdmin::Config" do
+  describe "namespace" do
+    it "should return the namespace" do
+      config.namespace.should == namespace
+    end
+  end
+
+  describe "page_presenters" do
+    it "should return an empty hash by default" do
+      config.page_presenters.should == {}
+    end
+  end
+
+  it { respond_to :controller_name }
+  it { respond_to :controller }
+  it { respond_to :route_prefix }
+  it { respond_to :route_collection_path }
+  it { respond_to :comments? }
+  it { respond_to :belongs_to? }
+  it { respond_to :action_items? }
+  it { respond_to :sidebar_sections? }
+
+  describe "Naming" do
+    it "implements #resource_name" do
+      expect { config.resource_name }.should_not raise_error
+    end
+
+    it "implements #plural_resource_name" do
+      expect { config.plural_resource_name }.should_not raise_error
+    end
+
+    it "implements #safe_resource_name" do
+      expect { config.safe_resource_name }.should_not raise_error
+    end
+
+    describe "#camelized_resource_name" do
+      it "returns a camelized version of the safe_resource_name" do
+        config.should_receive(:safe_resource_name).and_return "My resource"
+        config.camelized_resource_name.should == "MyResource"
+      end
+    end
+
+    describe "#plural_camelized_resource_name" do
+      it "returns a camelized version of the plural_safe_resource_name" do
+        config.should_receive(:safe_resource_name).and_return "My resource"
+        config.camelized_resource_name.should == "MyResource"
+      end
+    end
+
+    describe "#underscored_resource_name" do
+      it "returns the camelized_resource_name underscored" do
+        config.should_receive(:camelized_resource_name).and_return "MyResource"
+        config.underscored_resource_name.should == "my_resource"
+      end
+    end
+
+    describe "#plural_underscored_resource_name" do
+      it "returns the plural_camelized_resource_name underscored" do
+        config.should_receive(:plural_camelized_resource_name).and_return "MyResources"
+        config.plural_underscored_resource_name.should == "my_resources"
+      end
+    end
+  end
+
+  describe "Menu" do
+    describe "menu item name" do
+      it "should be the plural resource name when not set" do
+        config.menu_item_name.should == config.plural_resource_name
+      end
+      it "should be settable" do
+        config.menu :label => "My Label"
+        config.menu_item_name.should == "My Label"
+      end
+    end
+
+    describe "#include_in_menu?" do
+      it "should be included in menu by default" do
+        config.include_in_menu?.should == true
+      end
+
+      it "should not be included in menu when menu set to false" do
+        config.menu false
+        config.include_in_menu?.should == false
+      end
+    end
+
+    describe "parent menu item name" do
+      it "should be nil when not set" do
+        config.parent_menu_item_name.should == nil
+      end
+      it "should return the name if set" do
+        config.tap do |c|
+          c.menu :parent => "Blog"
+        end.parent_menu_item_name.should == "Blog"
+      end
+    end
+
+    describe "menu item priority" do
+      it "should be 10 when not set" do
+        config.menu_item_priority.should == 10
+      end
+      it "should be settable" do
+        config.menu :priority => 2
+        config.menu_item_priority.should == 2
+      end
+    end
+
+    describe "menu item display if" do
+      it "should be a proc always returning true if not set" do
+        config.menu_item_display_if.should be_instance_of(Proc)
+        config.menu_item_display_if.call.should == true
+      end
+      it "should be settable" do
+        config.menu :if => proc { false }
+        config.menu_item_display_if.call.should == false
+      end
+    end
+  end
+end