activeadmin 0.5.1 → 0.6.0

data/spec/unit/form_builder_spec.rb

@@ -408,4 +408,19 @@ describe ActiveAdmin::FormBuilder do
     end
   end
 
+  describe "inputs block with nil return value" do
+    let :body do
+      build_form do |f|
+        f.inputs do
+          f.input :title
+          nil
+        end
+      end
+    end
+
+    it "should generate a single input field" do
+      body.should have_tag("input", :attributes => { :type => "text", :name => "post[title]" })
+    end
+  end
+
 end

data/spec/unit/menu_collection_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+describe ActiveAdmin::MenuCollection do
+
+  let(:menus) { ActiveAdmin::MenuCollection.new }
+
+  describe "#add" do
+
+    it "should initialize a new menu when first item" do
+      menus.add :default, :label => "Hello World"
+
+      menus.fetch(:default).items.size.should == 1
+      menus.fetch(:default)["Hello World"].should be_an_instance_of(ActiveAdmin::MenuItem)
+    end
+
+    it "should add items to an existing menu" do
+      menus.add :default, :label => "Hello World"
+      menus.add :default, :label => "Hello World Again"
+
+      menus.fetch(:default).items.size.should == 2
+    end
+
+  end
+
+  describe "#clear!" do
+
+    it "should remove all menus" do
+      menus.add :default, :label => "Hello World"
+
+      menus.clear!
+
+      expect {
+        menus.fetch(:non_default_menu)
+      }.to raise_error(ActiveAdmin::MenuCollection::NoMenuError)
+
+    end
+
+  end
+
+  describe "#on_build" do
+
+    it "runs a callback when fetching a menu" do
+      menus.on_build do |m|
+        m.add :default, :label => "Hello World"
+      end
+
+      menus.fetch(:default)["Hello World"].should_not be_nil
+    end
+
+    it "re-runs the callbacks when the menu is cleared" do
+      menus.on_build do |m|
+        m.add :default, :label => "Hello World"
+      end
+
+      menus.fetch(:default)["Hello World"].should_not be_nil
+      menus.clear!
+      menus.fetch(:default)["Hello World"].should_not be_nil
+    end
+
+  end
+
+end

data/spec/unit/menu_item_spec.rb

@@ -20,53 +20,71 @@ module ActiveAdmin
       item.priority.should == 10
     end
 
-    it "should have a display if block" do
-      block = lambda{ logged_in? }
-      item = MenuItem.new(:if => block )
-      item.display_if_block.should == block
+    context "conditional display" do
+      it "should store a Proc internally and evaluate it when requested" do
+        item = MenuItem.new
+        item.instance_variable_get(:@should_display).should be_a Proc
+        item.display?.should_not be_a Proc
+      end
+
+      it "should show the item by default" do
+        MenuItem.new.display?.should == true
+      end
+
+      it "should hide the item" do
+        MenuItem.new(:if => proc{false}).display?.should == false
+      end
     end
 
-    it "should have a default display if block always returning true" do
+    it "should default to an empty hash for html_options" do
       item = MenuItem.new
-      item.display_if_block.should be_instance_of(Proc)
-      item.display_if_block.call(self).should == true
+      item.html_options.should be_empty
     end
 
-    context "with no children" do
+    it "should accept an options hash for link_to" do
+      item = MenuItem.new :html_options => { :target => :blank }
+      item.html_options.should include(:target => :blank)
+    end
+
+    context "with no items" do
       it "should be empty" do
         item = MenuItem.new
-        item.children.should == []
+        item.items.should be_empty
       end
 
       it "should accept new children" do
-        item = MenuItem.new
-        item.add MenuItem.new(:label => "Dashboard")
-        item.children.first.should be_an_instance_of(MenuItem)
-        item.children.first.label.should == "Dashboard"
+        item = MenuItem.new :label => "Dashboard"
+        item.add            :label => "My Child Dashboard"
+        item.items.first.should be_a MenuItem
+        item.items.first.label.should == "My Child Dashboard"
       end
     end
 
     context "with many children" do
       let(:item) do
         i = MenuItem.new(:label => "Dashboard")
-        i.add MenuItem.new(:label => "Blog")
-        i.add MenuItem.new(:label => "Cars")
-        i.add MenuItem.new(:label => "Users", :priority => 1)
-        i.add MenuItem.new(:label => "Settings", :priority => 2)
-        i.add MenuItem.new(:label => "Analytics", :priority => 44)
+        i.add :label => "Blog"
+        i.add :label => "Cars"
+        i.add :label => "Users", :priority => 1
+        i.add :label => "Settings", :priority => 2
+        i.add :label => "Analytics", :priority => 44
         i
       end
 
+      it "should contain 5 submenu items" do
+        item.items.count.should == 5
+      end
+
       it "should give access to the menu item as an array" do
         item['Blog'].label.should == 'Blog'
       end
 
       it "should sort items based on priority and name" do    
-        item.children[0].label.should == 'Users'
-        item.children[1].label.should == 'Settings'
-        item.children[2].label.should == 'Blog'
-        item.children[3].label.should == 'Cars'
-        item.children[4].label.should == 'Analytics'
+        item.items[0].label.should == 'Users'
+        item.items[1].label.should == 'Settings'
+        item.items[2].label.should == 'Blog'
+        item.items[3].label.should == 'Cars'
+        item.items[4].label.should == 'Analytics'
       end
 
       it "children should hold a reference to their parent" do
@@ -85,7 +103,7 @@ module ActiveAdmin
 
       context "with one parent" do
         let(:sub_item) do 
-          item.add MenuItem.new(:label => "Create New")
+          item.add :label => "Create New"
           item["Create New"]
         end
         it "should return an array with the parent" do
@@ -95,13 +113,11 @@ module ActiveAdmin
 
       context "with many parents" do
         before(:each) do
-          c1 = MenuItem.new(:label => "C1")
-          c2 = MenuItem.new(:label => "C2")
-          c3 = MenuItem.new(:label => "C3")
+          c1 = {:label => "C1"}
+          c2 = {:label => "C2"}
+          c3 = {:label => "C3"}
 
-          item.add(c1)
-          c1.add c2
-          c2.add c3
+          item.add(c1).add(c2).add(c3)
 
           item
         end
@@ -113,16 +129,14 @@ module ActiveAdmin
     end # accessing ancestory
 
 
-    describe ".generate_item_id" do
-
-      it "downcases the id" do
-        MenuItem.generate_item_id("Identifier").should == "identifier"
+    describe "#id" do
+      it "should be normalized" do
+        MenuItem.new(:id => "Foo Bar").id.should == "foo_bar"
       end
 
-      it "should set underscore any spaces" do
-        MenuItem.generate_item_id("An Id").should == "an_id"
+      it "should not accept Procs" do
+        expect{ MenuItem.new(:id => proc{"Dynamic"}).id }.to raise_error TypeError
       end
-
     end
 
   end

data/spec/unit/menu_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_without_rails'
+require 'spec_helper'
 require 'active_admin/menu'
 require 'active_admin/menu_item'
 
@@ -7,7 +7,6 @@ include ActiveAdmin
 describe ActiveAdmin::Menu do
 
   context "with no items" do
-
     it "should have an empty item collection" do
       menu = Menu.new
       menu.items.should be_empty
@@ -15,18 +14,16 @@ describe ActiveAdmin::Menu do
 
     it "should accept new items" do
       menu = Menu.new
-      item = MenuItem.new
-      menu.add item
-      menu.items.first.should == item
+      menu.add :label => "Dashboard"
+      menu.items.first.label.should == "Dashboard"
     end
-
   end
 
-  context "with many item" do
+  context "with many items" do
     let(:menu) do
       Menu.new do |m|
-        m.add MenuItem.new(:label => "Dashboard")
-        m.add MenuItem.new(:label => "Blog")
+        m.add :label => "Dashboard"
+        m.add :label => "Blog"
       end
     end
 
@@ -35,33 +32,40 @@ describe ActiveAdmin::Menu do
     end
   end
 
-  describe Menu::ItemCollection do
-
-    let(:collection) { Menu::ItemCollection.new }
+  describe "adding items with children" do
+    it "should add an empty item if the parent does not exist" do
+      menu = Menu.new
+      menu.add :parent => "Admin", :label => "Users"
 
-    it "should initialize" do
-      collection.should be_empty
+      menu["Admin"]["Users"].should be_an_instance_of(ActiveAdmin::MenuItem)
     end
 
-    describe "#find_by_id" do
-      let(:menu_item) { MenuItem.new(:id => "an_id") }
-
-      before do
-        collection.push menu_item
-      end
+    it "should add a child to a parent if it exists" do
+      menu = Menu.new
+      menu.add :parent => "Admin", :label => "Users"
+      menu.add :parent => "Admin", :label => "Projects"
 
-      it "retrieve an item id" do
-        MenuItem.should_receive(:generate_item_id).with("an_id").and_return("an_id")
-        collection.find_by_id("an_id").should == menu_item
-      end
+      menu["Admin"]["Projects"].should be_an_instance_of(ActiveAdmin::MenuItem)
+    end
 
-      it "returns nil when no matching ids" do
-        collection.find_by_id("not matching").should == nil
-      end
+    it "should assign children regardless of resource file load order" do
+      menu = Menu.new
+      menu.add :parent => "Users", :label => "Posts"
+      menu.add :label  => "Users", :url   => "/some/url"
 
+      menu["Users"].url.should == "/some/url"
+      menu["Users"]["Posts"].should be_a ActiveAdmin::MenuItem
     end
-
   end
 
-end
+  describe "sorting items" do
+    it "should sort children by the result of their label proc" do
+      menu = Menu.new
+      menu.add :label => proc{ "G" }, :id => "not related 1"
+      menu.add :label => proc{ "B" }, :id => "not related 2"
+      menu.add :label => proc{ "A" }, :id => "not related 3"
 
+      menu.items.map(&:label).should == %w[A B G]
+    end
+  end
+end

data/spec/unit/namespace/authorization_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe ActiveAdmin::Resource, "authorization" do
+
+  let(:app){ ActiveAdmin::Application.new }
+  let(:namespace){ ActiveAdmin::Namespace.new(app, :admin) }
+  let(:mock_auth){ mock }
+
+  describe "authorization_adapter" do
+
+    it "should return AuthorizationAdapter by default" do
+      namespace.authorization_adapter.should == ActiveAdmin::AuthorizationAdapter
+    end
+
+    it "should be settable on the namespace" do
+      namespace.authorization_adapter.should == ActiveAdmin::AuthorizationAdapter
+      namespace.authorization_adapter = mock_auth
+
+      namespace.authorization_adapter.should == mock_auth
+    end
+
+    it "should be settable on the application" do
+      namespace.authorization_adapter.should == ActiveAdmin::AuthorizationAdapter
+      app.authorization_adapter = mock_auth
+
+      namespace.authorization_adapter.should == mock_auth
+    end
+
+  end
+
+end

data/spec/unit/namespace/register_page_spec.rb

@@ -5,6 +5,7 @@ describe ActiveAdmin::Namespace, "registering a page" do
   let(:application){ ActiveAdmin::Application.new }
 
   let(:namespace){ ActiveAdmin::Namespace.new(application, :admin) }
+  let(:menu){ namespace.fetch_menu(:default) }
 
   context "with no configuration" do
     before do
@@ -20,7 +21,7 @@ describe ActiveAdmin::Namespace, "registering a page" do
     end
 
     it "should create a menu item" do
-      namespace.menu["Status"].should be_an_instance_of(ActiveAdmin::MenuItem)
+      menu["Status"].should be_an_instance_of(ActiveAdmin::MenuItem)
     end
   end # context "with no configuration"
 
@@ -41,7 +42,7 @@ describe ActiveAdmin::Namespace, "registering a page" do
       end
 
       it "should add a new menu item" do
-        namespace.menu['Status'].should_not be_nil
+        menu['Status'].should_not be_nil
       end
     end # describe "adding as a top level item"
 
@@ -52,10 +53,10 @@ describe ActiveAdmin::Namespace, "registering a page" do
         end
       end
       it "should generate the parent menu item" do
-        namespace.menu['Extra'].should_not be_nil
+        menu['Extra'].should_not be_nil
       end
       it "should generate its own child item" do
-        namespace.menu['Extra']['Status'].should_not be_nil
+        menu['Extra']['Status'].should_not be_nil
       end
     end # describe "adding as a child"
 
@@ -66,31 +67,8 @@ describe ActiveAdmin::Namespace, "registering a page" do
         end
       end
       it "should not create a menu item" do
-        namespace.menu["Status"].should be_nil
+        menu["Status"].should be_nil
       end
     end # describe "disabling the menu"
-    
-    describe "setting menu priority" do
-      before do
-        namespace.register_page "Status" do
-          menu :priority => 2
-        end
-      end
-      it "should have a custom priority of 2" do
-        namespace.menu["Status"].priority.should == 2
-      end
-    end # describe "setting menu priority"
-    
-    describe "setting a condition for displaying" do
-      before do
-        namespace.register_page "Status" do
-          menu :if => proc { false }
-        end
-      end
-      it "should have a proc returning false" do
-        namespace.menu["Status"].display_if_block.should be_instance_of(Proc)
-        namespace.menu["Status"].display_if_block.call.should == false
-      end
-    end # describe "setting a condition for displaying"
   end # describe "adding to the menu"
 end

data/spec/unit/namespace/register_resource_spec.rb

@@ -6,6 +6,8 @@ describe ActiveAdmin::Namespace, "registering a resource" do
 
   let(:namespace){ ActiveAdmin::Namespace.new(application, :admin) }
 
+  let(:menu){ namespace.fetch_menu(:default) }
+
   context "with no configuration" do
     before do
       namespace.register Category
@@ -20,8 +22,8 @@ describe ActiveAdmin::Namespace, "registering a resource" do
       defined?(Admin::DashboardController).should be_true
     end
     it "should create a menu item" do
-      namespace.menu["Categories"].should be_an_instance_of(ActiveAdmin::MenuItem)
-      namespace.menu["Categories"].url.should == :admin_categories_path
+      menu["Categories"].should be_a ActiveAdmin::MenuItem
+      menu["Categories"].instance_variable_get(:@url).should be_a Proc
     end
   end # context "with no configuration"
 
@@ -48,13 +50,12 @@ describe ActiveAdmin::Namespace, "registering a resource" do
       defined?(Admin::MockResourcesController).should be_true
     end
     it "should create a menu item" do
-      namespace.menu["Mock Resources"].should be_an_instance_of(ActiveAdmin::MenuItem)
+      menu["Mock Resources"].should be_an_instance_of(ActiveAdmin::MenuItem)
     end
 
     it "should use the resource as the model in the controller" do
       Admin::MockResourcesController.resource_class.should == Mock::Resource
     end
-
   end # context "with a resource that's namespaced"
 
   describe "finding resource instances" do
@@ -79,7 +80,6 @@ describe ActiveAdmin::Namespace, "registering a resource" do
       publisher = namespace.register Publisher
       namespace.resource_for(Publisher).should == publisher
     end
-
   end # describe "finding resource instances"
 
   describe "adding to the menu" do
@@ -88,7 +88,7 @@ describe ActiveAdmin::Namespace, "registering a resource" do
         namespace.register Category
       end
       it "should add a new menu item" do
-        namespace.menu['Categories'].should_not be_nil
+        menu['Categories'].should_not be_nil
       end
     end # describe "adding as a top level item"
 
@@ -99,10 +99,10 @@ describe ActiveAdmin::Namespace, "registering a resource" do
         end
       end
       it "should generate the parent menu item" do
-        namespace.menu['Blog'].should_not be_nil
+        menu['Blog'].should_not be_nil
       end
       it "should generate its own child item" do
-        namespace.menu['Blog']['Categories'].should_not be_nil
+        menu['Blog']['Categories'].should_not be_nil
       end
     end # describe "adding as a child"
 
@@ -113,32 +113,9 @@ describe ActiveAdmin::Namespace, "registering a resource" do
         end
       end
       it "should not create a menu item" do
-        namespace.menu["Categories"].should be_nil
+        menu["Categories"].should be_nil
       end
     end # describe "disabling the menu"
-    
-    describe "setting menu priority" do
-      before do
-        namespace.register Category do
-          menu :priority => 2
-        end
-      end
-      it "should have a custom priority of 2" do
-        namespace.menu["Categories"].priority.should == 2
-      end
-    end # describe "setting menu priority"
-    
-    describe "setting a condition for displaying" do
-      before do
-        namespace.register Category do
-          menu :if => proc { false }
-        end
-      end
-      it "should have a proc returning false" do
-        namespace.menu["Categories"].display_if_block.should be_instance_of(Proc)
-        namespace.menu["Categories"].display_if_block.call.should == false
-      end
-    end # describe "setting a condition for displaying"
 
     describe "adding as a belongs to" do
       context "when not optional" do
@@ -148,7 +125,7 @@ describe ActiveAdmin::Namespace, "registering a resource" do
           end
         end
         it "should not show up in the menu" do
-          namespace.menu["Posts"].should be_nil
+          menu["Posts"].should be_nil
         end
       end
       context "when optional" do
@@ -158,7 +135,7 @@ describe ActiveAdmin::Namespace, "registering a resource" do
           end
         end
         it "should show up in the menu" do
-          namespace.menu["Posts"].should_not be_nil
+          menu["Posts"].should_not be_nil
         end
       end
     end