activeadmin 1.0.0.pre4 → 1.0.0.pre5

data/features/index/page_title.feature

@@ -6,7 +6,7 @@ Feature: Index - Page Title
     Given an index configuration of:
     """
       ActiveAdmin.register Post do
-        index :title => "Awesome Title"
+        index title: "Awesome Title"
       end
     """
     Then I should see the page title "Awesome Title"
@@ -15,7 +15,7 @@ Feature: Index - Page Title
     Given an index configuration of:
     """
       ActiveAdmin.register Post do
-        index :title => proc{ 'Custom title from proc' }
+        index title: proc{ 'Custom title from proc' }
       end
     """
     Then I should see the page title "Custom title from proc"
@@ -24,7 +24,7 @@ Feature: Index - Page Title
     Given an index configuration of:
     """
       ActiveAdmin.register Post do
-        index :title => proc{ "List of #{resource_class.model_name.plural}" }
+        index title: proc{ "List of #{resource_class.model_name.plural}" }
       end
     """
     Then I should see the page title "List of posts"

data/features/index/pagination.feature

@@ -48,7 +48,7 @@ Feature: Index Pagination
     """
       ActiveAdmin.register Post do
         config.per_page = 10
-        index :pagination_total => false do
+        index pagination_total: false do
         end
       end
     """

data/features/index/switch_index_view.feature

@@ -9,10 +9,10 @@ Feature: Switch Index View
   And an index configuration of:
     """
     ActiveAdmin.register Post do
-      index :as => :table do
+      index as: :table do
         column :title
       end
-      index :as => :block do |post|
+      index as: :block do |post|
         span(link_to(post.title, admin_post_path(post)))
       end
     end
@@ -24,10 +24,10 @@ Feature: Switch Index View
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        index :as => :block do |post|
+        index as: :block do |post|
           span(link_to(post.title, admin_post_path(post)))
         end
-        index :as => :table, :default => true do
+        index as: :table, default: true do
           column :title
         end
       end
@@ -39,10 +39,10 @@ Feature: Switch Index View
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        index :as => :block do |post|
+        index as: :block do |post|
           span(link_to(post.title, admin_post_path(post)))
         end
-        index :as => :table, :default => true do
+        index as: :table, default: true do
           column :title
         end
       end
@@ -56,10 +56,10 @@ Feature: Switch Index View
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        index :as => :block do |post|
+        index as: :block do |post|
           span(link_to(post.title, admin_post_path(post)))
         end
-        index :as => :table, :default => true do
+        index as: :table, default: true do
           column :title
           column :body
         end

data/features/menu.feature

@@ -17,7 +17,7 @@ Feature: Menu
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        menu :label => "Articles"
+        menu label: "Articles"
       end
     """
     When I am on the dashboard
@@ -29,7 +29,7 @@ Feature: Menu
     """
       ActiveAdmin.application.namespace :admin do |admin|
         admin.build_menu do |menu|
-          menu.add :label => "Custom Menu", :url => :admin_dashboard_path
+          menu.add label: "Custom Menu", url: :admin_dashboard_path
         end
       end
     """
@@ -43,7 +43,7 @@ Feature: Menu
     """
       ActiveAdmin.register User
       ActiveAdmin.register Post do
-        menu :parent => 'User'
+        menu parent: 'User'
       end
     """
     When I am on the dashboard

data/features/new_page.feature

@@ -11,7 +11,7 @@ Feature: New Page
       ActiveAdmin.register Post do
         if Rails::VERSION::MAJOR >= 4
           permit_params :custom_category_id, :author_id, :title,
-            :body, :position, :published_at, :starred
+            :body, :position, :published_date, :starred
         end
       end
     """
@@ -34,7 +34,7 @@ Feature: New Page
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        permit_params :custom_category_id, :author_id, :title, :body, :published_at, :starred if Rails::VERSION::MAJOR >= 4
+        permit_params :custom_category_id, :author_id, :title, :body, :published_date, :starred if Rails::VERSION::MAJOR >= 4
 
         form do |f|
           f.inputs "Your Post" do
@@ -42,7 +42,7 @@ Feature: New Page
             f.input :body
           end
           f.inputs "Publishing" do
-            f.input :published_at
+            f.input :published_date
           end
           f.actions
         end
@@ -62,7 +62,7 @@ Feature: New Page
     Given "app/views/admin/posts/_form.html.erb" contains:
     """
       <% url = @post.new_record? ? admin_posts_path : admin_post_path(@post) %>
-      <%= active_admin_form_for @post, :url => url do |f|
+      <%= active_admin_form_for @post, url: url do |f|
             f.inputs :title, :body
             f.actions
           end %>
@@ -70,9 +70,9 @@ Feature: New Page
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        permit_params :custom_category_id, :author_id, :title, :body, :published_at, :starred if Rails::VERSION::MAJOR >= 4
+        permit_params :custom_category_id, :author_id, :title, :body, :published_date, :starred if Rails::VERSION::MAJOR >= 4
 
-        form :partial => "form"
+        form partial: "form"
       end
     """
     Given I follow "New Post"
@@ -87,7 +87,7 @@ Feature: New Page
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        permit_params :custom_category_id, :author_id, :title, :body, :published_at, :starred if Rails::VERSION::MAJOR >= 4
+        permit_params :custom_category_id, :author_id, :title, :body, :published_date, :starred if Rails::VERSION::MAJOR >= 4
 
         form do |f|
           f.inputs "Your Post" do
@@ -98,7 +98,7 @@ Feature: New Page
             f.input :body
           end
           f.inputs "Publishing" do
-            f.input :published_at
+            f.input :published_date
           end
           f.actions
         end

data/features/registering_assets.feature

@@ -18,7 +18,7 @@ Feature: Registering Assets
   Scenario: Registering a CSS file
     Given a configuration of:
     """
-      ActiveAdmin.application.register_stylesheet "some-random-css.css", :media => :print
+      ActiveAdmin.application.register_stylesheet "some-random-css.css", media: :print
       ActiveAdmin.register Post
     """
     When I am on the index page for posts

data/features/registering_pages.feature

@@ -49,7 +49,7 @@ Feature: Registering Pages
     Given a configuration of:
     """
     ActiveAdmin.register_page "Status" do
-      content :title => "Custom Page Title" do
+      content title: "Custom Page Title" do
         "I love chocolate."
       end
     end
@@ -62,7 +62,7 @@ Feature: Registering Pages
     Given a configuration of:
     """
     ActiveAdmin.register_page "Status" do
-      content :title => proc{ "Custom Page Title from Proc" } do
+      content title: proc{ "Custom Page Title from Proc" } do
         "I love chocolate."
       end
     end
@@ -106,6 +106,36 @@ Feature: Registering Pages
     And I follow "Status"
     Then I should see an action item link to "Visit"
 
+  Scenario: Adding a page action to a page with multiple http methods
+    Given a configuration of:
+    """
+    ActiveAdmin.register_page "Status" do
+      page_action :check, method: [:get, :post] do
+        redirect_to admin_status_path, notice: "Checked via #{request.method}"
+      end
+
+      action_item :post_check do
+         link_to "Post Check", admin_status_check_path, method: :post
+      end
+
+      action_item :get_check do
+        link_to "Get Check", admin_status_check_path
+      end
+
+      content do
+        "I love chocolate."
+      end
+    end
+    """
+    When I go to the dashboard
+    And I follow "Status"
+    And I follow "Post Check"
+    Then I should see "Checked via POST"
+    And I should see the Active Admin layout
+    When I follow "Get Check"
+    Then I should see "Checked via GET"
+    And I should see the Active Admin layout
+
   Scenario: Adding a page action to a page
     Given a configuration of:
     """
@@ -146,3 +176,44 @@ Feature: Registering Pages
     And I follow "Check"
     Then I should see the content "Chocolate lØves You Too!"
     And I should see the Active Admin layout
+
+  Scenario: Registering a page with paginated index table for a collection Array
+    Given a user named "John Doe" exists
+    Given a configuration of:
+    """
+    ActiveAdmin.register_page "Special users" do
+      content do
+        collection = Kaminari.paginate_array(User.all).page(params.fetch(:page, 1))
+
+        table_for(collection, class: "index_table") do
+          column :first_name
+          column :last_name
+        end
+
+        paginated_collection(collection, entry_name: "Special users")
+      end
+    end
+    """
+    When I go to the dashboard
+    And I follow "Special users"
+    Then I should see the page title "Special users"
+    And I should see the Active Admin layout
+    And I should see 1 user in the table
+
+  Scenario: Displaying parent information from a belongs_to page
+    Given a configuration of:
+    """
+    ActiveAdmin.register Post
+    ActiveAdmin.register_page "Status" do
+      belongs_to :post
+
+      content do
+        "Status page for #{helpers.parent.title}"
+      end
+    end
+    """
+    And 1 post with the title "Post 1" exists
+    When I go to the first post custom status page
+    Then I should see the content "Status page for Post 1"
+    And  I should see a link to "Post 1" in the breadcrumb
+

data/features/registering_resources.feature

@@ -22,7 +22,7 @@ Feature: Registering Resources
   Scenario: Registering a resource with another name
     Given a configuration of:
     """
-      ActiveAdmin.register Post, :as => "My Post"
+      ActiveAdmin.register Post, as: "My Post"
     """
     When I go to the dashboard
     Then I should see "My Posts"

data/features/renamed_resource.feature

@@ -11,7 +11,7 @@ Feature: Renamed Resource
       ActiveAdmin.register Blog::Post, as: 'Post' do
         if Rails::VERSION::MAJOR >= 4
           permit_params :custom_category_id, :author_id, :title,
-            :body, :position, :published_at, :starred
+            :body, :position, :published_date, :starred
         end
       end
     """

data/features/show/page_title.feature

@@ -9,7 +9,7 @@ Feature: Show - Page Title
     Given a show configuration of:
     """
       ActiveAdmin.register Post do
-        show :title => :title
+        show title: :title
       end
     """
     Then I should see the page title "Hello World"
@@ -18,7 +18,7 @@ Feature: Show - Page Title
     Given a show configuration of:
     """
       ActiveAdmin.register Post do
-        show :title => "Title From String"
+        show title: "Title From String"
       end
     """
     Then I should see the page title "Title From String"
@@ -27,7 +27,7 @@ Feature: Show - Page Title
     Given a show configuration of:
     """
       ActiveAdmin.register Post do
-        show :title => proc{|post| "Title: " + post.title }
+        show title: proc{|post| "Title: " + post.title }
       end
     """
     Then I should see the page title "Title: Hello World"

data/features/sidebar_sections.feature

@@ -34,7 +34,7 @@ Feature: Sidebar Sections
     Given a configuration of:
     """
     ActiveAdmin.register Post do
-      sidebar :help, :only => :index do
+      sidebar :help, only: :index do
         "Need help? Email us at help@example.com"
       end
     end
@@ -58,7 +58,7 @@ Feature: Sidebar Sections
     Given a configuration of:
     """
     ActiveAdmin.register Post do
-      sidebar :help, :except => :index do
+      sidebar :help, except: :index do
         "Need help? Email us at help@example.com"
       end
     end
@@ -80,7 +80,7 @@ Feature: Sidebar Sections
     Given a configuration of:
     """
     ActiveAdmin.register Post do
-      sidebar :help, :only => :index, :if => proc{ current_active_admin_user.nil? } do
+      sidebar :help, only: :index, if: proc{ current_active_admin_user.nil? } do
         "Need help? Email us at help@example.com"
       end
     end
@@ -106,7 +106,7 @@ Feature: Sidebar Sections
     end
     ActiveAdmin.register Post do
       controller { helper SidebarHelper }
-      sidebar :help, :only => :index, :if => :can_sidebar? do
+      sidebar :help, only: :index, if: :can_sidebar? do
         "Need help? Email us at help@example.com"
       end
     end
@@ -128,7 +128,7 @@ Feature: Sidebar Sections
     Given a configuration of:
     """
     ActiveAdmin.register Post do
-      sidebar :help, :only => :show, :if => proc{ !current_active_admin_user.nil? } do
+      sidebar :help, only: :show, if: proc{ !current_active_admin_user.nil? } do
         "Need help? Email us at help@example.com"
       end
     end
@@ -190,7 +190,7 @@ Feature: Sidebar Sections
     Given a configuration of:
     """
     ActiveAdmin.register Post do
-      sidebar :help, :partial => "custom_help_partial"
+      sidebar :help, partial: "custom_help_partial"
     end
     """
     When I am on the index page for posts

data/features/specifying_actions.feature

@@ -23,7 +23,7 @@ Feature: Specifying Actions
     Given a configuration of:
       """
         ActiveAdmin.register Post do
-          action_item(:import, :only => :index) do
+          action_item(:import, only: :index) do
             link_to('Import Posts', import_admin_posts_path)
           end
 
@@ -43,7 +43,7 @@ Feature: Specifying Actions
     Given a configuration of:
       """
         ActiveAdmin.register Post do
-          action_item(:review, :only => :show) do
+          action_item(:review, only: :show) do
             link_to('Review', review_admin_post_path)
           end
 
@@ -69,7 +69,7 @@ Feature: Specifying Actions
     Given a configuration of:
       """
         ActiveAdmin.register Post do
-          action_item(:review, :only => :show) do
+          action_item(:review, only: :show) do
             link_to('Review', review_admin_post_path)
           end
 
@@ -80,7 +80,7 @@ Feature: Specifying Actions
       """
     Given "app/views/admin/posts/review.html.arb" contains:
       """
-        h1 "Review: #{@post.title}"
+        h1 "Review: #{post.title}"
       """
     And I am logged in
     And a post with the title "Hello World" exists
@@ -91,3 +91,28 @@ Feature: Specifying Actions
     And I should see the page title "Review"
     And I should see the Active Admin layout
 
+  Scenario: Specify a custom member action with multiple http methods
+    Given a configuration of:
+      """
+        ActiveAdmin.register Post do
+          action_item(:get_check, only: :show) do
+            link_to('Get Check', check_admin_post_path)
+          end
+
+          action_item(:post_check, only: :show) do
+            link_to('Post Check', check_admin_post_path, method: :post)
+          end
+
+          member_action :check, method: [:get, :post] do
+             redirect_to admin_post_path(resource), notice: "Checked via #{request.method}"
+          end
+        end
+      """
+    And I am logged in
+    And a post with the title "Hello World" exists
+    When I am on the index page for posts
+    And I follow "View"
+    And I follow "Get Check"
+    Then I should see "Checked via GET"
+    When I follow "Post Check"
+    Then I should see "Checked via POST"