activeadmin 1.0.0.pre4 → 1.0.0.pre5

data/features/action_item.feature

@@ -32,7 +32,7 @@ Feature: Action Item
     Given a configuration of:
     """
     ActiveAdmin.register Post do
-      action_item :embiggen, :if => proc{ !current_active_admin_user.nil? } do
+      action_item :embiggen, if: proc{ !current_active_admin_user.nil? } do
         link_to "Embiggen", '/'
       end
     end
@@ -54,7 +54,7 @@ Feature: Action Item
     Given a configuration of:
     """
     ActiveAdmin.register Post do
-      action_item :embiggen, :if => proc{ current_active_admin_user.nil? } do
+      action_item :embiggen, if: proc{ current_active_admin_user.nil? } do
         link_to "Embiggen", '/'
       end
     end

data/features/authorization_cancan.feature

@@ -12,12 +12,12 @@ Feature: Authorizing Access using CanCan
 
       def initialize(user)
         # Manage Posts
-        can [:edit, :destroy], Post, :author_id => user.id
+        can [:edit, :destroy], Post, author_id: user.id
         can :read, Post
 
         # View Pages
-        can :read, ActiveAdmin::Page, :name => "Dashboard"
-        cannot :read, ActiveAdmin::Page, :name => "No Access"
+        can :read, ActiveAdmin::Page, name: "Dashboard"
+        cannot :read, ActiveAdmin::Page, name: "No Access"
       end
 
     end

data/features/belongs_to.feature

@@ -21,9 +21,67 @@ Feature: Belongs To
     And I should see "Displaying 1 Post"
     And I should see a link to "Users" in the breadcrumb
     And I should see a link to "Jane Doe" in the breadcrumb
-    When I follow "Edit"
+
+  Scenario: Updating a child resource page
+    Given a configuration of:
+    """
+      ActiveAdmin.register User
+      ActiveAdmin.register Post do
+        belongs_to :user
+        permit_params :title, :body, :published_date if Rails::VERSION::MAJOR >= 4
+
+        form do |f|
+          f.inputs "Your Post" do
+            f.input :title
+            f.input :body
+          end
+          f.inputs "Publishing" do
+            f.input :published_date
+          end
+          f.actions
+        end
+      end
+    """
+    When I go to the last author's last post page
+    Then I follow "Edit Post"
+    Then I should see the element "form[action='/admin/users/2/posts/2']"
     Then I should see a link to "Hello World" in the breadcrumb
 
+    When I press "Update Post"
+    Then I should see "Post was successfully updated."
+
+  Scenario: Creating a child resource page
+    Given a configuration of:
+    """
+      ActiveAdmin.register User
+      ActiveAdmin.register Post do
+        belongs_to :user
+        permit_params :title, :body, :published_date if Rails::VERSION::MAJOR >= 4
+
+        form do |f|
+          f.inputs "Your Post" do
+            f.input :title
+            f.input :body
+          end
+          f.inputs "Publishing" do
+            f.input :published_date
+          end
+          f.actions
+        end
+      end
+    """
+    When I go to the last author's posts
+    Then I follow "New Post"
+    Then I should see the element "form[action='/admin/users/2/posts']"
+    Then I fill in "Title" with "Hello World"
+    Then I fill in "Body" with "This is the body"
+
+    When I press "Create Post"
+    Then I should see "Post was successfully created."
+    And I should see the attribute "Title" with "Hello World"
+    And I should see the attribute "Body" with "This is the body"
+    And I should see the attribute "Author" with "Jane Doe"
+
   Scenario: Viewing a child resource page
     Given a configuration of:
     """
@@ -42,7 +100,7 @@ Feature: Belongs To
     """
       ActiveAdmin.register User
       ActiveAdmin.register Post do
-        belongs_to :user, :optional => true
+        belongs_to :user, optional: true
       end
     """
     When I go to the last author's posts

data/features/comments/commenting.feature

@@ -40,8 +40,8 @@ Feature: Commenting
     Given a configuration of:
     """
       ActiveAdmin.application.namespace(:new_namespace).comments = false
-      ActiveAdmin.register Post,      :namespace => :new_namespace
-      ActiveAdmin.register AdminUser, :namespace => :new_namespace
+      ActiveAdmin.register Post,      namespace: :new_namespace
+      ActiveAdmin.register AdminUser, namespace: :new_namespace
     """
     Given I am logged in
     When I am on the index page for posts in the new_namespace namespace
@@ -52,10 +52,10 @@ Feature: Commenting
     Given a configuration of:
     """
       ActiveAdmin.application.namespace(:new_namespace).comments = false
-      ActiveAdmin.register Post,      :namespace => :new_namespace do
+      ActiveAdmin.register Post,      namespace: :new_namespace do
         config.comments = true
       end
-      ActiveAdmin.register AdminUser, :namespace => :new_namespace
+      ActiveAdmin.register AdminUser, namespace: :new_namespace
     """
     Given I am logged in
     When I am on the index page for posts in the new_namespace namespace
@@ -66,8 +66,8 @@ Feature: Commenting
     Given a show configuration of:
     """
       ActiveAdmin.register Post
-      ActiveAdmin.register Post,      :namespace => :public
-      ActiveAdmin.register AdminUser, :namespace => :public
+      ActiveAdmin.register Post,      namespace: :public
+      ActiveAdmin.register AdminUser, namespace: :public
     """
     When I add a comment "Hello world in admin namespace"
     Then I should see "Hello world in admin namespace"
@@ -87,7 +87,7 @@ Feature: Commenting
   Scenario: Creating a comment on an aliased resource
     Given a configuration of:
     """
-    ActiveAdmin.register Post, :as => "Article"
+    ActiveAdmin.register Post, as: "Article"
     """
     Given I am logged in
     When I am on the index page for articles

data/features/development_reloading.feature

@@ -14,7 +14,7 @@ Feature: Development Reloading
       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
     """

data/features/edit_page.feature

@@ -12,7 +12,7 @@ Feature: Edit 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: Edit Page
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        permit_params :category, :author, :title, :body, :published_at, :starred if Rails::VERSION::MAJOR >= 4
+        permit_params :category, :author, :title, :body, :published_date, :starred if Rails::VERSION::MAJOR >= 4
 
         form do |f|
           f.inputs "Your Post" do
@@ -42,7 +42,7 @@ Feature: Edit Page
             f.input :body
           end
           f.inputs "Publishing" do
-            f.input :published_at
+            f.input :published_date
           end
           f.actions
         end
@@ -63,15 +63,15 @@ Feature: Edit Page
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        permit_params :category, :author, :title, :body, :published_at, :starred if Rails::VERSION::MAJOR >= 4
+        permit_params :category, :author, :title, :body, :published_date, :starred if Rails::VERSION::MAJOR >= 4
 
-        form :html => {} do |f|
+        form html: {} do |f|
           f.inputs "Your Post" do
             f.input :title
             f.input :body
           end
           f.inputs "Publishing" do
-            f.input :published_at
+            f.input :published_date
           end
           f.actions
         end
@@ -94,7 +94,7 @@ Feature: Edit 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 %>
@@ -102,9 +102,9 @@ Feature: Edit Page
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        permit_params :category, :author, :title, :body, :published_at, :starred if Rails::VERSION::MAJOR >= 4
+        permit_params :category, :author, :title, :body, :published_date, :starred if Rails::VERSION::MAJOR >= 4
 
-        form :partial => "form"
+        form partial: "form"
       end
     """
     Given I follow "Edit"

data/features/footer.feature

@@ -0,0 +1,28 @@
+Feature: Site title
+
+  As a developer
+  In order to customize the site footer
+  I want to set it in the configuration
+
+  Background:
+    Given I am logged in
+
+  Scenario: No footer is set in the configuration (default)
+    When I am on the dashboard
+    And I should see the default footer
+
+  Scenario: Set the footer in the configuration
+    Given a configuration of:
+    """
+      ActiveAdmin.application.footer = "MyApp Revision 123"
+    """
+    When I am on the dashboard
+    And I should see the footer "MyApp Revision 123"
+
+  Scenario: Set the footer to a proc
+    Given a configuration of:
+    """
+      ActiveAdmin.application.footer = proc { "Enjoy MyApp Revision 123, #{controller.current_admin_user.try(:email)}!" }
+    """
+    When I am on the dashboard
+    And I should see the footer "Enjoy MyApp Revision 123, admin@example.com!"

data/features/i18n.feature

@@ -41,3 +41,14 @@ Feature: Internationalization
     When I go to the dashboard
     When I follow "Bookstores"
     Then I should see "Download this:"
+
+  Scenario: Overriding resource details table title
+    Given a configuration of:
+    """
+      ActiveAdmin.register Post
+    """
+    And String "Post detailed information" corresponds to "resources.post.details"
+    And I am logged in
+    And a post exists
+    When I go to the last post's show page
+    Then I should see "Post detailed information"

data/features/index/batch_actions.feature

@@ -21,6 +21,28 @@ Feature: Batch Actions
     Then I should see a flash with "Successfully destroyed 2 posts"
     And I should see 8 posts in the table
 
+  Scenario: Use default (destroy) batch action when default_url_options present
+    Given 3 posts exist
+    And an index configuration of:
+    """
+      ActiveAdmin.register Post do
+        controller do
+          protected
+
+          def default_url_options
+            { locale: I18n.locale }
+          end
+        end
+      end
+    """
+    When I check the 1st record
+    And I follow "Batch Actions"
+    Then I should see the batch action :destroy "Delete Selected"
+
+    Given I submit the batch action form with "destroy"
+    Then I should see a flash with "Successfully destroyed 1 post"
+    And I should see 2 posts in the table
+
   Scenario: Use default (destroy) batch action on a decorated resource
     Given 5 posts exist
     And an index configuration of:
@@ -83,7 +105,7 @@ Feature: Batch Actions
       """
       ActiveAdmin.register Post do
         batch_action(:flag) do
-          redirect_to collection_path, :notice => "Successfully flagged 10 posts"
+          redirect_to collection_path, notice: "Successfully flagged 10 posts"
         end
       end
       """
@@ -119,8 +141,8 @@ Feature: Batch Actions
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        batch_action(:flag, :if => proc { true }) {}
-        batch_action(:unflag, :if => proc { false }) {}
+        batch_action(:flag, if: proc { true }) {}
+        batch_action(:unflag, if: proc { false }) {}
       end
       """
     Then I should see the batch action :flag "Flag Selected"
@@ -131,9 +153,9 @@ Feature: Batch Actions
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        batch_action(:test, :priority => 3) {}
-        batch_action(:flag, :priority => 2) {}
-        batch_action(:unflag, :priority => 1) {}
+        batch_action(:test, priority: 3) {}
+        batch_action(:flag, priority: 2) {}
+        batch_action(:unflag, priority: 1) {}
       end
       """
     Then the 4th batch action should be "Delete Selected"

data/features/index/filters.feature

@@ -9,13 +9,13 @@ Feature: Index Filtering
     When I am on the index page for posts
     Then I should see "Displaying all 3 Posts"
     And I should see the following filters:
-     | Author       | select     |
-     | Category     | select     |
-     | Title        | string     |
-     | Body         | string     |
-     | Published at | date range |
-     | Created at   | date range |
-     | Updated at   | date range |
+     | Author         | select     |
+     | Category       | select     |
+     | Title          | string     |
+     | Body           | string     |
+     | Published date | date range |
+     | Created at     | date range |
+     | Updated at     | date range |
 
     When I fill in "Title" with "Hello World 2"
     And I press "Filter"
@@ -60,7 +60,7 @@ Feature: Index Filtering
     And an index configuration of:
     """
       ActiveAdmin.register Post do
-        filter :author, :as => :check_boxes
+        filter :author, as: :check_boxes
       end
     """
     When I press "Filter"
@@ -74,7 +74,7 @@ Feature: Index Filtering
     And an index configuration of:
     """
       ActiveAdmin.register Post do
-        filter :author, :as => :check_boxes
+        filter :author, as: :check_boxes
       end
     """
     When I check "Jane Doe"
@@ -134,7 +134,7 @@ Feature: Index Filtering
     And an index configuration of:
     """
       ActiveAdmin.register Category do
-        filter :authors, :as => :check_boxes
+        filter :authors, as: :check_boxes
       end
     """
     When I press "Filter"
@@ -149,7 +149,7 @@ Feature: Index Filtering
     And an index configuration of:
     """
       ActiveAdmin.register Category do
-        filter :authors, :as => :check_boxes
+        filter :authors, as: :check_boxes
       end
     """
     When I check "Jane Doe"
@@ -158,4 +158,24 @@ Feature: Index Filtering
     And I should see "Non-Fiction" within ".index_table"
     And the "Jane Doe" checkbox should be checked
 
+  Scenario: Enabling filters status sidebar
+    Given an index configuration of:
+    """
+      ActiveAdmin.application.current_filters = false
+      ActiveAdmin.register Post do
+        config.current_filters = true
+      end
+    """
+    And I press "Filter"
+    Then I should see a sidebar titled "Search Status:"
 
+  Scenario: Disabling filters status sidebar
+    Given an index configuration of:
+    """
+      ActiveAdmin.application.current_filters = true
+      ActiveAdmin.register Post do
+        config.current_filters = false
+      end
+    """
+    And I press "Filter"
+    Then I should not see a sidebar titled "Search Status:"

data/features/index/format_as_csv.feature

@@ -12,19 +12,19 @@ Feature: Format as CSV
     When I am on the index page for posts
     And I follow "CSV"
     And I should download a CSV file for "posts" containing:
-    | Id  | Title       | Body | Published at | Position | Starred | Created at | Updated at |
+    | Id  | Title       | Body | Published date | Position | Starred | Created at | Updated at |
     | \d+ | Hello World |      |              |          |         | (.*)       | (.*)       |
 
   Scenario: Default with alias
     Given a configuration of:
     """
-      ActiveAdmin.register Post, :as => "MyArticle"
+      ActiveAdmin.register Post, as: "MyArticle"
     """
     And 1 post exists
     When I am on the index page for my_articles
     And I follow "CSV"
     And I should download a CSV file for "my-articles" containing:
-    | Id  | Title       | Body | Published at | Position | Starred | Created at | Updated at |
+    | Id  | Title       | Body | Published date | Position | Starred | Created at | Updated at |
 
   Scenario: With CSV format customization
     Given a configuration of:
@@ -48,7 +48,7 @@ Feature: Format as CSV
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        csv :col_sep => ';' do
+        csv col_sep: ';' do
           column :title
           column :body
         end
@@ -65,7 +65,7 @@ Feature: Format as CSV
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        csv :force_quotes => true, :byte_order_mark => "" do
+        csv force_quotes: true, byte_order_mark: "" do
           column :title
           column :body
         end
@@ -82,7 +82,7 @@ Feature: Format as CSV
   Scenario: With default CSV separator option
     Given a configuration of:
     """
-      ActiveAdmin.application.csv_options = { :col_sep => ';' }
+      ActiveAdmin.application.csv_options = { col_sep: ';' }
       ActiveAdmin.register Post do
         csv do
           column :title
@@ -100,7 +100,7 @@ Feature: Format as CSV
   Scenario: With default CSV options
     Given a configuration of:
     """
-      ActiveAdmin.application.csv_options = {:col_sep => ',', :force_quotes => true}
+      ActiveAdmin.application.csv_options = {col_sep: ',', force_quotes: true}
       ActiveAdmin.register Post do
         csv do
           column :title
@@ -119,9 +119,9 @@ Feature: Format as CSV
     Scenario: Without CVS column names explicitely specified
     Given a configuration of:
     """
-      ActiveAdmin.application.csv_options = {:col_sep => ',', :force_quotes => true}
+      ActiveAdmin.application.csv_options = {col_sep: ',', force_quotes: true}
       ActiveAdmin.register Post do
-        csv :column_names => true do
+        csv column_names: true do
           column :title
           column :body
         end
@@ -137,9 +137,9 @@ Feature: Format as CSV
   Scenario: Without CVS column names
     Given a configuration of:
     """
-      ActiveAdmin.application.csv_options = {:col_sep => ',', :force_quotes => true}
+      ActiveAdmin.application.csv_options = {col_sep: ',', force_quotes: true}
       ActiveAdmin.register Post do
-        csv :column_names => false do
+        csv column_names: false do
           column :title
           column :body
         end
@@ -155,7 +155,7 @@ Feature: Format as CSV
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        csv :encoding => 'SJIS' do
+        csv encoding: 'SJIS' do
           column :title
           column :body
         end
@@ -169,7 +169,7 @@ Feature: Format as CSV
   Scenario: With default encoding CSV options
     Given a configuration of:
     """
-      ActiveAdmin.application.csv_options = { :encoding => 'SJIS' }
+      ActiveAdmin.application.csv_options = { encoding: 'SJIS' }
       ActiveAdmin.register Post do
         csv do
           column :title