activeadmin 0.6.0 → 0.6.1

data/spec/unit/filters/resource_spec.rb

@@ -46,30 +46,31 @@ describe ActiveAdmin::Filters::ResourceExtension do
     end
   end
 
-  # TODO: wrap the below in a context like "filter removal" was above
-  it "should add a filter" do
-    resource.add_filter :title
-    resource.filters.should == [{:attribute => :title}]
-  end
+  context "adding a filter" do
+    it "should work" do
+      resource.add_filter :title
+      resource.filters.should == [{:attribute => :title}]
+    end
 
-  it "should add a filter with options" do
-    resource.add_filter :title, :as => :string
-    resource.filters.should == [{:attribute => :title, :as => :string}]
-  end
+    it "should work with specified options" do
+      resource.add_filter :title, :as => :string
+      resource.filters.should == [{:attribute => :title, :as => :string}]
+    end
 
-  it "should preserve default filters" do
-    resource.preserve_default_filters!
-    resource.add_filter :count, :as => :string
-    resource.filters.map{|f| f[:attribute].to_s }.sort.should == %w{
+    it "should preserve default filters" do
+      resource.preserve_default_filters!
+      resource.add_filter :count, :as => :string
+      resource.filters.map { |f| f[:attribute].to_s }.sort.should == %w{
       author body category count created_at published_at starred title updated_at
     }
-  end
+    end
 
-  it "should raise an exception if trying to add a filter when they are disabled" do
-    resource.filters = false
-    expect {
-      resource.add_filter :title
-    }.should raise_error(RuntimeError)
+    it "should raise an exception when filters are disabled" do
+      resource.filters = false
+      expect {
+        resource.add_filter :title
+      }.should raise_error(RuntimeError)
+    end
   end
 
   it "should reset filters" do

data/spec/unit/form_builder_spec.rb

@@ -69,38 +69,6 @@ describe ActiveAdmin::FormBuilder do
     end
   end
 
-  context "in general with actions" do
-    let :body do
-      build_form do |f|
-        f.inputs do
-          f.input :title
-          f.input :body
-        end
-        f.actions do
-          f.action :submit, :button_html => { :value => "Submit Me" }
-          f.action :submit, :button_html => { :value => "Another Button" }
-        end
-      end
-    end
-
-    it "should generate a text input" do
-      body.should have_tag("input", :attributes => { :type => "text",
-                                                     :name => "post[title]" })
-    end
-    it "should generate a textarea" do
-      body.should have_tag("textarea", :attributes => { :name => "post[body]" })
-    end
-    it "should only generate the form once" do
-      body.scan(/Title/).size.should == 1
-    end
-    it "should generate actions" do
-      body.should have_tag("input", :attributes => {  :type => "submit",
-                                                          :value => "Submit Me" })
-      body.should have_tag("input", :attributes => {  :type => "submit",
-                                                          :value => "Another Button" })
-    end
-  end
-
   context "when polymorphic relationship" do
     it "should raise error" do
       lambda {
@@ -145,14 +113,14 @@ describe ActiveAdmin::FormBuilder do
         end
         f.actions
       end
-      body.scan(/id=\"post_title\"/).size.should == 1
+      body.scan(/id="post_title"/).size.should == 1
     end
     it "should generate one button and a cancel link" do
       body = build_form do |f|
         f.actions
       end
-      body.scan(/type=\"submit\"/).size.should == 1
-      body.scan(/class=\"cancel\"/).size.should == 1
+      body.scan(/type="submit"/).size.should == 1
+      body.scan(/class="cancel"/).size.should == 1
     end
     it "should generate multiple actions" do
       body = build_form do |f|
@@ -161,13 +129,13 @@ describe ActiveAdmin::FormBuilder do
           f.action :submit, :label => "Create & Edit"
         end
       end
-      body.scan(/type=\"submit\"/).size.should == 2
-      body.scan(/class=\"cancel\"/).size.should == 0
+      body.scan(/type="submit"/).size.should == 2
+      body.scan(/class="cancel"/).size.should == 0
     end
 
   end
 
-  context "with actons" do
+  context "with actions" do
     it "should generate the form once" do
       body = build_form do |f|
         f.inputs do
@@ -175,14 +143,14 @@ describe ActiveAdmin::FormBuilder do
         end
         f.actions
       end
-      body.scan(/id=\"post_title\"/).size.should == 1
+      body.scan(/id="post_title"/).size.should == 1
     end
     it "should generate one button and a cancel link" do
       body = build_form do |f|
         f.actions
       end
-      body.scan(/type=\"submit\"/).size.should == 1
-      body.scan(/class=\"cancel\"/).size.should == 1
+      body.scan(/type="submit"/).size.should == 1
+      body.scan(/class="cancel"/).size.should == 1
     end
     it "should generate multiple actions" do
       body = build_form do |f|
@@ -191,8 +159,8 @@ describe ActiveAdmin::FormBuilder do
           f.action :submit, :label => "Create & Edit"
         end
       end
-      body.scan(/type=\"submit\"/).size.should == 2
-      body.scan(/class=\"cancel\"/).size.should == 0
+      body.scan(/type="submit"/).size.should == 2
+      body.scan(/class="cancel"/).size.should == 0
     end
   end
 
@@ -244,7 +212,7 @@ describe ActiveAdmin::FormBuilder do
         end
       end
       it "should create 2 options" do
-        body.scan(/\<option/).size.should == 3
+        body.scan(/<option/).size.should == 3
       end
     end
 
@@ -255,7 +223,7 @@ describe ActiveAdmin::FormBuilder do
         end
       end
       it "should create 2 radio buttons" do
-        body.scan(/type=\"radio\"/).size.should == 2
+        body.scan(/type="radio"/).size.should == 2
       end
     end
 
@@ -326,6 +294,15 @@ describe ActiveAdmin::FormBuilder do
         end
       end
 
+      it "should translate the attribute name" do
+        begin
+          I18n.backend.store_translations :en, :activerecord => { :attributes => { :post => { :title => 'A very nice title' } } }
+          body.should have_tag 'label', 'A very nice title'
+        ensure
+          I18n.backend.reload!
+        end
+      end
+
       it "should use model name when there is no translation for given model in has many new button" do
         body.should have_tag('a', 'Add New Post')
       end
@@ -335,7 +312,7 @@ describe ActiveAdmin::FormBuilder do
       end
 
       it "should add a link to remove new nested records" do
-        Capybara.string(body).should have_css(".has_many > fieldset > ol > li > a", :class => "button", :href => "#", :content => "Delete")
+        Capybara.string(body).should have_css(".has_many > fieldset > ol > li.has_many_delete > a", :class => "button", :href => "#", :content => "Delete")
       end
 
       it "should include the nested record's class name in the js" do
@@ -360,6 +337,91 @@ describe ActiveAdmin::FormBuilder do
       it "should accept a block with a second argument" do
         body.should have_tag("label", "Title 1")
       end
+
+      it "should add a custom header" do
+        body.should have_tag('h3', 'Post')
+      end 
+
+    end
+
+    describe "without heading and new record link" do
+      let :body do
+        build_form({:url => '/categories'}, Category.new) do |f|
+          f.object.posts.build
+          f.has_many :posts, :heading => false, :new_record => false do |p|
+            p.input :title
+          end
+        end
+      end
+
+      it "should not add a header" do
+        body.should_not have_tag('h3', 'Post')
+      end 
+
+      it "should not add link to new nested records" do
+        body.should_not have_tag('a', 'Add New Post')
+      end 
+
+    end  
+
+    describe "with custom heading" do
+      let :body do
+        build_form({:url => '/categories'}, Category.new) do |f|
+          f.object.posts.build
+          f.has_many :posts, :heading => "Test heading" do |p|
+            p.input :title
+          end
+        end
+      end
+
+      it "should add a custom header" do
+        body.should have_tag('h3', 'Test heading')
+      end       
+
+    end  
+
+    describe "with allow destroy" do
+      context "with an existing post" do
+        let :body do
+          build_form({:url => '/categories'}, Category.new) do |f|
+            f.object.posts.build.stub!(:new_record? => false)
+            f.has_many :posts, :allow_destroy => true do |p|
+              p.input :title
+            end
+          end
+        end
+
+        it "should include a boolean field for _destroy" do
+          body.should have_tag("input", :attributes => {:name => "category[posts_attributes][0][_destroy]"})
+        end
+
+        it "should have a check box with 'Remove' as its label" do
+          body.should have_tag("label", :attributes => {:for => "category_posts_attributes_0__destroy"}, :content => "Remove")
+        end
+
+        it "should wrap the destroy field in an li with class 'has_many_remove'" do
+          Capybara.string(body).should have_css(".has_many > fieldset > ol > li.has_many_remove > input")
+        end
+      end
+
+      context "with a new post" do
+        let :body do
+          build_form({:url => '/categories'}, Category.new) do |f|
+            f.object.posts.build
+            f.has_many :posts, :allow_destroy => true do |p|
+              p.input :title
+            end
+          end
+        end
+
+        it "should not have a boolean field for _destroy" do
+          body.should_not have_tag("input", :attributes => {:name => "category[posts_attributes][0][_destroy]"})
+        end
+
+        it "should not have a check box with 'Remove' as its label" do
+          body.should_not have_tag("label", :attributes => {:for => "category_posts_attributes_0__destroy"}, :content => "Remove")
+        end
+      end
     end
 
     pending "should render the block if it returns nil" do
@@ -375,18 +437,23 @@ describe ActiveAdmin::FormBuilder do
     end
   end
 
-  {
-    "input :title, :as => :string"               => /id\=\"post_title\"/,
-    "input :title, :as => :text"                 => /id\=\"post_title\"/,
-    "input :created_at, :as => :time_select"     => /id\=\"post_created_at_2i\"/,
-    "input :created_at, :as => :datetime_select" => /id\=\"post_created_at_2i\"/,
-    "input :created_at, :as => :date_select"     => /id\=\"post_created_at_2i\"/,
+  { # Testing that the same input can be used multiple times
+    "f.input :title, :as => :string"               => /id="post_title"/,
+    "f.input :title, :as => :text"                 => /id="post_title"/,
+    "f.input :created_at, :as => :time_select"     => /id="post_created_at_2i"/,
+    "f.input :created_at, :as => :datetime_select" => /id="post_created_at_2i"/,
+    "f.input :created_at, :as => :date_select"     => /id="post_created_at_2i"/,
+    # Testing that return values don't screw up the form
+    "f.input :title; nil"                          => /id="post_title"/,
+    "f.input :title; []"                           => /id="post_title"/,
+    "[:title].each{ |r| f.input r }"               => /id="post_title"/,
+    "[:title].map { |r| f.input r }"               => /id="post_title"/,
   }.each do |source, regex|
-   it "should properly buffer #{source}" do
+   it "should properly buffer `#{source}`" do
      body = build_form do |f|
        f.inputs do
-         f.instance_eval(source)
-         f.instance_eval(source)
+         eval source
+         eval source
        end
      end
      body.scan(regex).size.should == 2
@@ -408,19 +475,4 @@ 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_item_spec.rb

@@ -79,7 +79,7 @@ module ActiveAdmin
         item['Blog'].label.should == 'Blog'
       end
 
-      it "should sort items based on priority and name" do    
+      it "should sort items based on priority and name" do
         item.items[0].label.should == 'Users'
         item.items[1].label.should == 'Settings'
         item.items[2].label.should == 'Blog'
@@ -97,12 +97,12 @@ module ActiveAdmin
 
       context "with no parent" do
         it "should return an empty array" do
-         item.ancestors.should == [] 
+         item.ancestors.should == []
         end
       end
 
       context "with one parent" do
-        let(:sub_item) do 
+        let(:sub_item) do
           item.add :label => "Create New"
           item["Create New"]
         end

data/spec/unit/namespace/authorization_spec.rb

@@ -9,23 +9,19 @@ describe ActiveAdmin::Resource, "authorization" do
   describe "authorization_adapter" do
 
     it "should return AuthorizationAdapter by default" do
-      namespace.authorization_adapter.should == ActiveAdmin::AuthorizationAdapter
+      app.authorization_adapter.should       eq ActiveAdmin::AuthorizationAdapter
+      namespace.authorization_adapter.should eq 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
+      namespace.authorization_adapter.should eq 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
+      app.authorization_adapter.should eq mock_auth
     end
 
   end
-
 end

data/spec/unit/namespace/register_page_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper' 
+require 'spec_helper'
 
 describe ActiveAdmin::Namespace, "registering a page" do
 

data/spec/unit/namespace/register_resource_spec.rb

@@ -1,4 +1,7 @@
-require 'spec_helper' 
+require 'spec_helper'
+
+# TODO: refactor this file so it doesn't depend on the Admin namespace in such a broken way.
+#       Specifically, the dashboard is already defined and we do let(:namespace) multiple times.
 
 describe ActiveAdmin::Namespace, "registering a resource" do
 
@@ -18,8 +21,8 @@ describe ActiveAdmin::Namespace, "registering a resource" do
     it "should create a new controller in the default namespace" do
       defined?(Admin::CategoriesController).should be_true
     end
-    it "should create the dashboard controller" do
-      defined?(Admin::DashboardController).should be_true
+    pending "should not create the dashboard controller" do
+      defined?(Admin::DashboardController).should_not be_true
     end
     it "should create a menu item" do
       menu["Categories"].should be_a ActiveAdmin::MenuItem
@@ -144,14 +147,16 @@ describe ActiveAdmin::Namespace, "registering a resource" do
   describe "dashboard controller name" do
     context "when namespaced" do
       it "should be namespaced" do
-        namespace = ActiveAdmin::Namespace.new(application, :admin)
-        namespace.dashboard_controller_name.should == "Admin::DashboardController"
+        namespace = ActiveAdmin::Namespace.new(application, :one)
+        namespace.register Category
+        defined?(One::CategoriesController).should be_true
       end
     end
     context "when not namespaced" do
       it "should not be namespaced" do
-        namespace = ActiveAdmin::Namespace.new(application, :root)
-        namespace.dashboard_controller_name.should == "DashboardController"
+        namespace = ActiveAdmin::Namespace.new(application, :two)
+        namespace.register Category
+        defined?(Two::CategoriesController).should be_true
       end
     end
   end # describe "dashboard controller name"

data/spec/unit/namespace_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper' 
+require 'spec_helper'
 
 describe ActiveAdmin::Namespace do
 
@@ -16,17 +16,11 @@ describe ActiveAdmin::Namespace do
     end
 
     it "should have no resources" do
-      namespace.resources.resources.should be_empty
+      namespace.resources.should be_empty
     end
 
     it "should not have any menu item" do
-      if ActiveAdmin::Dashboards.built?
-        # DEPRECATED behavior. If a dashboard was built while running this
-        # spec, then an item gets added to the menu
-        namespace.fetch_menu(:default).children.should_not be_empty
-      else
-        namespace.fetch_menu(:default).children.should be_empty
-      end
+      namespace.fetch_menu(:default).children.should be_empty
     end
   end # context "when new"
 
@@ -86,7 +80,7 @@ describe ActiveAdmin::Namespace do
 
   describe "utility navigation" do
     let(:namespace){ ActiveAdmin::Namespace.new(application, :admin) }
-    let(:menu) do 
+    let(:menu) do
       namespace.build_menu :utility_navigation do |menu|
         menu.add :label => "ActiveAdmin.info", :url => "http://www.activeadmin.info", :html_options => { :target => :blank }
         namespace.add_logout_button_to_menu menu, 1, :class => "matt"