activeadmin 1.0.0.pre4 → 1.0.0.pre5

data/features/index/formats.feature

@@ -15,7 +15,7 @@ Feature: Index Formats
     Given an index configuration of:
     """
       ActiveAdmin.register Post do
-        index :download_links => false
+        index download_links: false
       end
     """
     And 1 post exists
@@ -28,7 +28,7 @@ Feature: Index Formats
     Given an index configuration of:
     """
       ActiveAdmin.register Post do
-        index :download_links => [:pdf]
+        index download_links: [:pdf]
       end
     """
     And 1 post exists
@@ -42,7 +42,7 @@ Feature: Index Formats
     Given an index configuration of:
     """
       ActiveAdmin.register Post do
-        index :download_links => proc { false }
+        index download_links: proc { false }
       end
     """
     And 1 post exists
@@ -55,7 +55,7 @@ Feature: Index Formats
     Given an index configuration of:
     """
       ActiveAdmin.register Post do
-        index :download_links => -> { [:csv] }
+        index download_links: -> { [:csv] }
       end
     """
     And 1 post exists

data/features/index/index_as_block.feature

@@ -7,7 +7,7 @@ Feature: Index as Block
     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
       end

data/features/index/index_as_blog.feature

@@ -7,7 +7,7 @@ Feature: Index as Blog
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        index :as => :blog
+        index as: :blog
       end
       """
     And I am logged in
@@ -20,7 +20,7 @@ Feature: Index as Blog
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        index :as => :blog do
+        index as: :blog do
           title :title
           body :body
         end
@@ -35,7 +35,7 @@ Feature: Index as Blog
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        index :as => :blog do
+        index as: :blog do
           title do |post|
             post.title + " From Block"
           end
@@ -54,12 +54,12 @@ Feature: Index as Blog
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        index :as => :blog do
+        index as: :blog do
           title do |post|
-            span(:class => :title_span) { post.title + " From Block " }
+            span(class: :title_span) { post.title + " From Block " }
           end
           body do |post|
-            span(:class => :body_span) { post.body + " From Block" }
+            span(class: :body_span) { post.body + " From Block" }
           end
         end
       end

data/features/index/index_as_grid.feature

@@ -7,7 +7,7 @@ Feature: Index as Grid
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        index :as => :grid do |post|
+        index as: :grid do |post|
           h2 auto_link(post)
         end
       end
@@ -21,7 +21,7 @@ Feature: Index as Grid
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-      index :as => :grid, :columns => 1 do |post|
+      index as: :grid, columns: 1 do |post|
           h2 auto_link(post)
         end
       end
@@ -35,7 +35,7 @@ Feature: Index as Grid
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-      index :as => :grid, :columns => 2 do |post|
+      index as: :grid, columns: 2 do |post|
           h2 auto_link(post)
         end
       end

data/features/index/index_as_table.feature

@@ -116,7 +116,7 @@ Feature: Index as Table
         index do
           column :category
           actions do |resource|
-            link_to 'Custom Action', edit_admin_post_path(resource), :class => 'member_link'
+            link_to 'Custom Action', edit_admin_post_path(resource), class: 'member_link'
           end
         end
       end
@@ -135,8 +135,8 @@ Feature: Index as Table
 
         index do
           column :category
-          actions :defaults => false do |resource|
-            link_to 'Custom Action', edit_admin_post_path(resource), :class => 'member_link'
+          actions defaults: false do |resource|
+            link_to 'Custom Action', edit_admin_post_path(resource), class: 'member_link'
           end
         end
       end
@@ -175,7 +175,7 @@ Feature: Index as Table
 
         index do
           column :category
-          actions :defaults => false, dropdown: true do |resource|
+          actions defaults: false, dropdown: true do |resource|
             item 'Custom Action', edit_admin_post_path(resource)
           end
         end
@@ -218,13 +218,13 @@ Feature: Index as Table
       ActiveAdmin.register Post do
         index do
           column :author_id do end
-          column 'published_at' do end
+          column 'published_date' do end
           column :category do end
         end
       end
       """
     Then I should see a sortable table header with "Author"
-    Then I should see a sortable table header with "published_at"
+    Then I should see a sortable table header with "published_date"
     Then I should not see a sortable table header with "Category"
 
   Scenario: Columns with block are not sortable by when sortable option equals to false
@@ -234,12 +234,12 @@ Feature: Index as Table
       ActiveAdmin.register Post do
         index do
           column :author_id, sortable: false do end
-          column 'published_at', sortable: false do end
+          column 'published_date', sortable: false do end
         end
       end
       """
     Then I should not see a sortable table header with "Author"
-    Then I should not see a sortable table header with "published_at"
+    Then I should not see a sortable table header with "published_date"
 
   Scenario: Sorting
     Given a post with the title "Hello World" and body "From the body" exists
@@ -250,12 +250,12 @@ Feature: Index as Table
       """
     When I am on the index page for posts
     Then I should see the "index_table_posts" table:
-      | [ ] | Id | Title        | Body | Published At | Position | Starred | Created At | Updated At | |
+      | [ ] | Id | Title        | Body | Published Date | Position | Starred | Created At | Updated At | |
       | [ ] | 2 | Bye bye world | Move your...  |  |  | No | /.*/ | /.*/ | ViewEditDelete |
       | [ ] | 1 | Hello World   | From the body |  |  | No | /.*/ | /.*/ | ViewEditDelete |
     When I follow "Id"
     Then I should see the "index_table_posts" table:
-      | [ ] | Id | Title        | Body | Published At | Position | Starred | Created At | Updated At | |
+      | [ ] | Id | Title        | Body | Published Date | Position | Starred | Created At | Updated At | |
       | [ ] | 1 | Hello World   | From the body |  |  | No | /.*/ | /.*/ | ViewEditDelete |
       | [ ] | 2 | Bye bye world | Move your...  |  |  | No | /.*/ | /.*/ | ViewEditDelete |
 
@@ -274,7 +274,7 @@ Feature: Index as Table
           index do
             column :id
             column :title
-            column("Title Length", :sortable => :title_length) { |post| post.title_length }
+            column("Title Length", sortable: :title_length) { |post| post.title_length }
           end
         end
       """

data/features/index/index_blank_slate.feature

@@ -9,7 +9,7 @@ Feature: Index Blank Slate
           batch_action :favourite do
             # nothing
           end
-          scope :all, :default => true
+          scope :all, default: true
         end
       """
     Then I should not see a sortable table header
@@ -33,7 +33,7 @@ Feature: Index Blank Slate
     Given an index configuration of:
       """
       ActiveAdmin.register Post do
-        index :as => :grid do |post|
+        index as: :grid do |post|
           h2 auto_link(post)
         end
       end
@@ -44,7 +44,7 @@ Feature: Index Blank Slate
     Given 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
       end
@@ -55,7 +55,7 @@ Feature: Index Blank Slate
     Given an index configuration of:
       """
       ActiveAdmin.register Post do
-        index :as => :blog
+        index as: :blog
       end
       """
     And I should see "There are no Posts yet. Create one"

data/features/index/index_parameters.feature

@@ -4,7 +4,7 @@ Feature: Index Parameters
     Given an index configuration of:
     """
     ActiveAdmin.register Post do
-      index :as => :table, :download_links => false
+      index as: :table, download_links: false
     end
     """
     Given 31 posts exist
@@ -19,7 +19,7 @@ Feature: Index Parameters
     Given an index configuration of:
       """
       ActiveAdmin.register Post do
-        index :as => :table
+        index as: :table
       end
       """
     Given 1 posts exist
@@ -35,15 +35,15 @@ Feature: Index Parameters
     Given a configuration of:
       """
       ActiveAdmin.application.namespace(:superadmin).download_links = false
-      ActiveAdmin.register AdminUser, :namespace => :superadmin
+      ActiveAdmin.register AdminUser, namespace: :superadmin
       """
     Given an index configuration of:
       """
       ActiveAdmin.register Post do
-        index :as => :table
+        index as: :table
       end
-      ActiveAdmin.register Post, :namespace => :superadmin do
-        index :as => :table
+      ActiveAdmin.register Post, namespace: :superadmin do
+        index as: :table
       end
       """
     Given 1 posts exist
@@ -58,15 +58,15 @@ Feature: Index Parameters
     Given a configuration of:
       """
       ActiveAdmin.application.namespace(:superadmin).download_links = false
-      ActiveAdmin.register AdminUser, :namespace => :superadmin
+      ActiveAdmin.register AdminUser, namespace: :superadmin
       """
     Given an index configuration of:
       """
       ActiveAdmin.register Post do
-        index :as => :table
+        index as: :table
       end
-      ActiveAdmin.register Post, :namespace => :superadmin do
-        index :as => :table, :download_links => true
+      ActiveAdmin.register Post, namespace: :superadmin do
+        index as: :table, download_links: true
       end
       """
     Given 1 posts exist

data/features/index/index_scope_to.feature

@@ -17,7 +17,7 @@ Feature: Index Scope To
         # Set up some scopes
         scope :all, default: true
         scope :published do |posts|
-          posts.where "published_at IS NOT NULL"
+          posts.where "published_date IS NOT NULL"
         end
       end
       """
@@ -35,7 +35,7 @@ Feature: Index Scope To
     Given an index configuration of:
       """
       ActiveAdmin.register Post do
-        scope_to :if => proc{ false } do
+        scope_to if: proc{ false } do
           User.find_by_first_name_and_last_name("John", "Doe")
         end
       end
@@ -47,7 +47,7 @@ Feature: Index Scope To
     Given an index configuration of:
       """
       ActiveAdmin.register Post do
-        scope_to :unless => proc{ true } do
+        scope_to unless: proc{ true } do
           User.find_by_first_name_and_last_name("John", "Doe")
         end
       end

data/features/index/index_scopes.feature

@@ -14,12 +14,31 @@ Feature: Index Scoping
     And I should see the scope "All" with the count 3
     And I should see 3 posts in the table
 
+  Scenario: Viewing resources with one scope with dynamic name
+    Given 3 posts exist
+    And an index configuration of:
+      """
+      ActiveAdmin.register Post do
+        scope -> { scope_title }, :all
+
+        controller do
+          def scope_title
+            'Neat scope'
+          end
+
+          helper_method :scope_title
+        end
+      end
+      """
+    Then I should see the scope with label "Neat scope"
+    And I should see 3 posts in the table
+
   Scenario: Viewing resources with one scope as the default
     Given 3 posts exist
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        scope :all, :default => true
+        scope :all, default: true
       end
       """
     Then I should see the scope "All" selected
@@ -31,7 +50,7 @@ Feature: Index Scoping
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        scope :all, :default => proc{ false }
+        scope :all, default: proc{ false }
       end
       """
     Then I should see the scope "All" not selected
@@ -43,7 +62,7 @@ Feature: Index Scoping
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        scope :all, :default => true
+        scope :all, default: true
         filter :title
       end
       """
@@ -56,8 +75,8 @@ Feature: Index Scoping
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        scope :all, :default => true
-        index :as => :table, :scope_count => false
+        scope :all, default: true
+        index as: :table, scope_count: false
       end
       """
     Then I should see the scope "All" selected
@@ -70,7 +89,7 @@ Feature: Index Scoping
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        scope :all, :default => true, :show_count => false
+        scope :all, default: true, show_count: false
       end
       """
     Then I should see the scope "All" selected
@@ -83,9 +102,9 @@ Feature: Index Scoping
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        scope :all, :default => true
+        scope :all, default: true
         scope :published do |posts|
-          posts.where("published_at IS NOT NULL")
+          posts.where("published_date IS NOT NULL")
         end
       end
       """
@@ -106,9 +125,9 @@ Feature: Index Scoping
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        scope :all, :default => true
+        scope :all, default: true
         scope :published do |posts|
-          posts.where("published_at IS NOT NULL")
+          posts.where("published_date IS NOT NULL")
         end
       end
       """
@@ -135,14 +154,14 @@ Feature: Index Scoping
     And an index configuration of:
     """
     ActiveAdmin.register Post do
-      scope :all, :if => proc { false }
-      scope "Shown", :if => proc { true } do |posts|
+      scope :all, if: proc { false }
+      scope "Shown", if: proc { true } do |posts|
         posts
       end
-      scope "Default", :default => true do |posts|
+      scope "Default", default: true do |posts|
         posts
       end
-      scope 'Today', :if => proc { false } do |posts|
+      scope 'Today', if: proc { false } do |posts|
         posts.where(["created_at > ? AND created_at < ?", ::Time.zone.now.beginning_of_day, ::Time.zone.now.end_of_day])
       end
     end
@@ -158,7 +177,7 @@ Feature: Index Scoping
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        scope 'Today', :default => true do |posts|
+        scope 'Today', default: true do |posts|
           posts.where(["created_at > ? AND created_at < ?", ::Time.zone.now.beginning_of_day, ::Time.zone.now.end_of_day])
         end
         scope 'Tomorrow' do |posts|
@@ -186,7 +205,7 @@ Feature: Index Scoping
       """
         ActiveAdmin.register Post do
           scope_to :current_user
-          scope :all, :default => true
+          scope :all, default: true
 
           filter :title
 
@@ -213,9 +232,9 @@ Feature: Index Scoping
     And an index configuration of:
       """
       ActiveAdmin.register Post do
-        scope :all, :default => true
+        scope :all, default: true
         scope :published do |posts|
-          posts.where("published_at IS NOT NULL")
+          posts.where("published_date IS NOT NULL")
         end
 
         index do