activeadmin 0.6.0 → 0.6.1

data/features/dashboard.feature

@@ -1,6 +1,5 @@
 Feature: Dashboard
 
-  @dashboard
   Scenario: With default configuration
     Given a configuration of:
       """
@@ -15,53 +14,3 @@ Feature: Dashboard
     Then I should see the Active Admin layout
     And I should not see the default welcome message
     And I should see "Hello world from the dashboard page"
-
-  @dashboard
-  Scenario: DEPRECATED - With default configuration
-    Given a configuration of:
-      """
-        ActiveAdmin::Dashboards.build do
-        end
-      """
-    Given I am logged in
-    When I go to the dashboard
-    Then I should see the Active Admin layout
-    And I should see the default welcome message
-
-  @dashboard
-  Scenario: DEPRECATED - Displaying a dashboard widget
-    Given a configuration of:
-      """
-      ActiveAdmin::Dashboards.build do
-        section 'Hello World' do
-          para "Hello world from the content"
-        end
-      end
-      """
-    Given I am logged in
-    When I go to the dashboard
-    Then I should see the Active Admin layout
-    And I should not see the default welcome message
-    And I should see a dashboard widget "Hello World"
-    And I should see "Hello world from the content"
-
-  @dashboard
-  Scenario: DEPRECATED - Displaying a dashboard widget using the ':if' option
-    Given a configuration of:
-      """
-      ActiveAdmin::Dashboards.build do
-        section 'Hello World', :if => proc{ current_admin_user } do
-          "Hello world from the content"
-        end
-
-        section 'Hidden by If', :if => proc{ false } do
-          "Hello world from the content"
-        end
-      end
-      """
-    Given I am logged in
-    When I go to the dashboard
-    Then I should see the Active Admin layout
-    And I should not see the default welcome message
-    And I should see a dashboard widget "Hello World"
-    And I should not see a dashboard widget "Hidden by If"

data/features/favicon.feature

@@ -0,0 +1,20 @@
+Feature: Favicon
+  
+  Configuring a Favicon file
+  
+  Background:
+    Given a configuration of:
+    """
+      ActiveAdmin.register Post
+      ActiveAdmin.application.favicon = "a/favicon.ico"
+    """
+
+  Scenario: Logged out views show Favicon
+    Given I am logged out
+    When I am on the login page
+    Then I should see the favicon "a/favicon.ico"
+  
+  Scenario: Logged in views show Favicon
+    Given I am logged in
+    When I am on the dashboard
+    Then I should see the favicon "a/favicon.ico"

data/features/global_navigation.feature

@@ -1,6 +1,5 @@
 Feature: Global Navigation
 
-
   Background:
     Given a configuration of:
     """

data/features/index/batch_actions.feature

@@ -51,14 +51,14 @@ 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
       """
     When I check the 1st record
     Given I submit the batch action form with "flag"
     Then I should see a flash with "Successfully flagged 10 posts"
-    
+
   Scenario: Disabling batch actions for a resource
     Given 10 posts exist
     And an index configuration of:
@@ -67,9 +67,9 @@ Feature: Batch Actions
         config.batch_actions = false
       end
       """
-    Then I should not see the batch actions selector
+    Then I should not see the batch action selector
     And I should not see checkboxes in the table
-  
+
   Scenario: Disabling the default destroy batch action
     Given 10 posts exist
     And an index configuration of:
@@ -79,9 +79,9 @@ Feature: Batch Actions
         batch_action(:flag) {}
       end
       """
-    Then I should see the batch action "Flag Selected"
-    And I should not see the batch action "Delete Selected"
-  
+    Then I should see the batch action :flag "Flag Selected"
+    And I should not see the batch action :destroy "Delete Selected"
+
   Scenario: Optional display of batch actions
     Given 10 posts exist
     And an index configuration of:
@@ -91,9 +91,9 @@ Feature: Batch Actions
         batch_action(:unflag, :if => proc { false }) {}
       end
       """
-    Then I should see the batch action "Flag Selected"
-    And I should not see the batch action "Unflag Selected"
-    
+    Then I should see the batch action :flag "Flag Selected"
+    And I should not see the batch action :unflag "Unflag Selected"
+
   Scenario: Sort order priority
     Given 10 posts exist
     And an index configuration of:
@@ -108,7 +108,7 @@ Feature: Batch Actions
     And the 3rd batch action should be "Test Selected"
     And the 2nd batch action should be "Flag Selected"
     And the 1st batch action should be "Unflag Selected"
-    
+
   Scenario: Complex naming
     Given 10 posts exist
     And an index configuration of:
@@ -120,3 +120,4 @@ Feature: Batch Actions
       """
     Then I should see the batch action :very_complex_and_time_consuming "Very Complex and Time Consuming Selected"
     And I should see the batch action :passing_a_symbol "Passing A Symbol Selected"
+

data/features/index/filters.feature

@@ -17,7 +17,7 @@ Feature: Index Filtering
      | Created at   | date range |
      | Updated at   | date range |
 
-    When I fill in "Search Title" with "Hello World 2"
+    When I fill in "Title" with "Hello World 2"
     And I press "Filter"
     And I should see 1 posts in the table
     And I should see "Hello World 2" within ".index_table"
@@ -31,7 +31,7 @@ Feature: Index Filtering
     When I am on the index page for posts
     Then I should see "Displaying all 3 Posts"
 
-    When I fill in "Search Title" with "THIS IS NOT AN EXISTING TITLE!!"
+    When I fill in "Title" with "THIS IS NOT AN EXISTING TITLE!!"
     And I press "Filter"
     Then I should not see ".index_table"
     And I should not see a sortable table header
@@ -49,7 +49,7 @@ Feature: Index Filtering
     When I follow "2"
     Then I should see "Displaying Posts 6 - 9 of 9 in total"
 
-    When I fill in "Search Title" with "Hello World 2"
+    When I fill in "Title" with "Hello World 2"
     And I press "Filter"
     And I should see 1 posts in the table
     And I should see "Hello World 2" within ".index_table"
@@ -66,7 +66,7 @@ Feature: Index Filtering
     When I press "Filter"
     Then I should see 2 posts in the table
     And I should see "Hello World" within ".index_table"
-    And the "jane_doe" checkbox should not be checked
+    And the "Jane Doe" checkbox should not be checked
 
   Scenario: Checkboxes - Filtering posts written by Jane Doe
     Given 1 post exists
@@ -77,11 +77,11 @@ Feature: Index Filtering
         filter :author, :as => :check_boxes
       end
     """
-    When I check "jane_doe"
+    When I check "Jane Doe"
     And I press "Filter"
     Then I should see 1 posts in the table
     And I should see "Hello World" within ".index_table"
-    And the "jane_doe" checkbox should be checked
+    And the "Jane Doe" checkbox should be checked
 
   Scenario: Disabling filters
     Given an index configuration of:

data/features/index/format_as_csv.feature

@@ -48,7 +48,7 @@ Feature: Format as CSV
     Given a configuration of:
     """
       ActiveAdmin.register Post do
-        csv :separator => ';' 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 :options => {:force_quotes => true} do
+        csv :force_quotes => true 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_column_separator = ';'
+      ActiveAdmin.application.csv_options = { :col_sep => ';' }
       ActiveAdmin.register Post do
         csv do
           column :title
@@ -100,8 +100,7 @@ Feature: Format as CSV
   Scenario: With default CSV options
     Given a configuration of:
     """
-      ActiveAdmin.application.csv_options = {:force_quotes => true}
-      ActiveAdmin.application.csv_column_separator = ','
+      ActiveAdmin.application.csv_options = {:col_sep => ',', :force_quotes => true}
       ActiveAdmin.register Post do
         csv do
           column :title

data/features/index/index_as_blog.feature

@@ -36,7 +36,7 @@ Feature: Index as Blog
       """
       ActiveAdmin.register Post do
         index :as => :blog do
-          title do |post| 
+          title do |post|
             post.title + " From Block"
           end
           body do |post|
@@ -48,3 +48,22 @@ Feature: Index as Blog
     Then I should see "Hello World From Block" within "h3"
     And I should see a link to "Hello World From Block"
     And I should see "My great post body From Block" within ".post"
+
+  Scenario: Viewing a blog with a resource as a block configuration should render Abre components
+    Given a post with the title "Hello World" and body "My great post body" exists
+    And an index configuration of:
+      """
+      ActiveAdmin.register Post do
+        index :as => :blog do
+          title do |post|
+            span(:class => :title_span) { post.title + " From Block " }
+          end
+          body do |post|
+            span(:class => :body_span) { post.body + " From Block" }
+          end
+        end
+      end
+      """
+      Then I should see "Hello World From Block" within "span.title_span"
+      And I should see a link to "Hello World From Block"
+      And I should see "My great post body From Block" within ".post span.body_span"

data/features/index/index_as_table.feature

@@ -187,7 +187,7 @@ Feature: Index as Table
     Then I should see the "index_table_posts" table:
       | Id | Title        | Title Length |
       | 2 | Bye bye world | 13 |
-      | 1 | Hello World   | 11 |    
+      | 1 | Hello World   | 11 |
     When I follow "Title Length"
     Then I should see the "index_table_posts" table:
       | Id | Title        | Title Length |

data/features/index/index_blank_slate.feature

@@ -28,7 +28,7 @@ Feature: Index Blank Slate
       """
     And I should see "There are no Posts yet."
     And I should not see "Create one"
-  
+
   Scenario: Viewing a index using a grid with no resources
     Given an index configuration of:
       """
@@ -39,7 +39,7 @@ Feature: Index Blank Slate
       end
       """
     And I should see "There are no Posts yet. Create one"
-    
+
   Scenario: Viewing a index using blocks with no resources
     Given an index configuration of:
       """
@@ -50,7 +50,7 @@ Feature: Index Blank Slate
       end
       """
     And I should see "There are no Posts yet. Create one"
-    
+
   Scenario: Viewing a blog with no resources
     Given an index configuration of:
       """

data/features/index/index_parameters.feature

@@ -34,11 +34,8 @@ Feature: Index Parameters
   Scenario: Viewing index when download_links disabled only in one namespace
     Given a configuration of:
       """
-      ActiveAdmin.setup do |config|
-        config.namespace :superadmin do |namespace|
-          namespace.download_links = false
-        end
-      end
+      ActiveAdmin.application.namespace(:superadmin).download_links = false
+      ActiveAdmin.register AdminUser, :namespace => :superadmin
       """
     Given an index configuration of:
       """
@@ -60,11 +57,8 @@ Feature: Index Parameters
   Scenario: Viewing index when download_links enabled only for a resource
     Given a configuration of:
       """
-      ActiveAdmin.setup do |config|
-        config.namespace :superadmin do |namespace|
-          namespace.download_links = false
-        end
-      end
+      ActiveAdmin.application.namespace(:superadmin).download_links = false
+      ActiveAdmin.register AdminUser, :namespace => :superadmin
       """
     Given an index configuration of:
       """

data/features/index/index_scope_to.feature

@@ -30,3 +30,27 @@ Feature: Index Scope To
 
     When I follow "Published"
     Then I should see 1 posts in the table
+
+  Scenario: Viewing the index with conditional scope :if
+    Given an index configuration of:
+      """
+      ActiveAdmin.register Post do
+        scope_to :if => proc{ false } do
+          User.find_by_first_name_and_last_name("John", "Doe")
+        end
+      end
+      """
+    When I am on the index page for posts
+    Then I should see 12 posts in the table
+
+  Scenario: Viewing the index with conditional scope :unless
+    Given an index configuration of:
+      """
+      ActiveAdmin.register Post do
+        scope_to :unless => proc{ true } do
+          User.find_by_first_name_and_last_name("John", "Doe")
+        end
+      end
+      """
+    When I am on the index page for posts
+    Then I should see 12 posts in the table

data/features/index/index_scopes.feature

@@ -26,6 +26,18 @@ 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 that is set as not default
+    Given 3 posts exist
+    And an index configuration of:
+      """
+      ActiveAdmin.register Post do
+        scope :all, :default => proc{ false }
+      end
+      """
+    Then I should see the scope "All" not selected
+    And I should see the scope "All" with the count 3
+    And I should see 3 posts in the table
+
   Scenario: Viewing resources with a scope and no results
     Given 3 posts exist
     And an index configuration of:
@@ -35,7 +47,7 @@ Feature: Index Scoping
         filter :title
       end
       """
-    When I fill in "Search Title" with "Non Existing Post"
+    When I fill in "Title" with "Non Existing Post"
     And I press "Filter"
     Then I should see the scope "All" selected
 
@@ -110,7 +122,7 @@ Feature: Index Scoping
     And I should see the scope "Published" with the count 3
     And I should see 3 posts in the table
 
-    When I select "daft_punk" from "Author"
+    When I select "Daft Punk" from "Author"
     And I press "Filter"
 
     Then I should see the scope "Published" selected
@@ -165,7 +177,7 @@ Feature: Index Scoping
     Then I should see the scope "Tomorrow" selected
     And I should see the scope "Today" not selected
     And I should see a link to "Today"
-    
+
   Scenario: Viewing resources with scopes when scoping to user
     Given 2 posts written by "Daft Punk" exist
     And a post with the title "Monkey Wrench" written by "Foo Fighters" exists
@@ -187,7 +199,7 @@ Feature: Index Scoping
       """
     Then I should see the scope "All" selected
     And I should see the scope "All" with the count 2
-    When I fill in "Search Title" with "Monkey"
+    When I fill in "Title" with "Monkey"
     And I press "Filter"
     Then I should see the scope "All" selected
     And I should see the scope "All" with the count 1
@@ -230,7 +242,7 @@ Feature: Index Scoping
     And I should see the scope "Published" with the count 1
     And I should see 1 posts in the table
 
-    When I select "daft_punk" from "Author"
+    When I select "Daft Punk" from "Author"
     And I press "Filter"
 
     Then I should see the scope "Published" selected

data/features/index/pagination.feature

@@ -42,3 +42,18 @@ Feature: Index Pagination
     Given 31 posts exist
     When I am on the index page for posts
     Then I should not see pagination
+
+    Scenario: Viewing index with pagination_total set to false
+      Given an index configuration of:
+      """
+        ActiveAdmin.register Post do
+          index :pagination_total => false do
+          end
+        end
+      """
+      Given 100 posts exist
+      When I am on the index page for posts
+      Then I should see pagination with 2 pages
+      Then I should see "Displaying Posts 1 - 30"
+      And I should not see "Displaying Posts 1 - 30 of 100 in total"
+