activeadmin 1.0.0 → 1.1.0

data/features/step_definitions/action_link_steps.rb

@@ -17,4 +17,3 @@ end
 Then /^I should not see a dropdown menu item to "([^"]*)"$/ do |name|
   %{Then I should not see "#{name}" within "ul.dropdown_menu_list li a"}
 end
-

data/features/step_definitions/attributes_table_title_steps.rb

@@ -0,0 +1,11 @@
+Then /^I should see the panel title "([^"]*)"$/ do |title|
+  expect(page).to have_css '.panel > h3', text: title
+end
+
+Then /^I should not see the panel title "([^"]*)"$/ do |title|
+  expect(page).to_not have_css '.panel > h3', text: title
+end
+
+Then /^I should see the attributes table$/ do
+  expect(page).to have_css '.panel .attributes_table'
+end

data/features/step_definitions/batch_action_steps.rb

@@ -44,9 +44,9 @@ Then /^I should see the batch action popover exists$/ do
 end
 
 Given /^I submit the batch action form with "([^"]*)"$/ do |action|
-  page.find("#batch_action").set action
+  page.find("#batch_action", visible: false).set action
   form   = page.find "#collection_selection"
-  params = page.all("#main_content input").each_with_object({}) do |input, obj|
+  params = page.all("#main_content input", visible: false).each_with_object({}) do |input, obj|
     key, value = input['name'], input['value']
     if key == 'collection_selection[]'
       (obj[key] ||= []).push value if input.checked?

data/features/step_definitions/comment_steps.rb

@@ -4,9 +4,29 @@ end
 
 When /^I add a comment "([^"]*)"$/ do |comment|
   step %{I fill in "active_admin_comment_body" with "#{comment}"}
-  step  %{I press "Add Comment"}
+  step %{I press "Add Comment"}
 end
 
 Given /^a tag with the name "([^"]*)" exists$/ do |tag_name|
   Tag.create(name: tag_name)
 end
+
+Given /^(a|\d+) comments added by admin with an email "([^"]+)"?$/ do |number, email|
+  number = number == 'a' ? 1 : number.to_i
+  admin_user = ensure_user_created(email)
+
+  comment_text = 'Comment %i'
+
+  number.times do |i|
+    ActiveAdmin::Comment.create!(namespace:     'admin',
+                                 body:          comment_text % i,
+                                 resource_type: Post.to_s,
+                                 resource_id:   Post.first.id,
+                                 author_type:   admin_user.class.to_s,
+                                 author_id:     admin_user.id)
+  end
+end
+
+Then /^I should see (\d+) comments?$/ do |number|
+  expect(page).to have_selector('div.active_admin_comment', count: number.to_i)
+end

data/features/step_definitions/configuration_steps.rb

@@ -2,7 +2,7 @@ module ActiveAdminReloading
   def load_aa_config(config_content)
     ActiveSupport::Notifications.publish ActiveAdmin::Application::BeforeLoadEvent, ActiveAdmin.application
     eval(config_content)
-    ActiveSupport::Notifications.publish ActiveAdmin::Application::AfterLoadEvent,  ActiveAdmin.application
+    ActiveSupport::Notifications.publish ActiveAdmin::Application::AfterLoadEvent, ActiveAdmin.application
     Rails.application.reload_routes!
     ActiveAdmin.application.namespaces.each &:reset_menu!
   end

data/features/step_definitions/filter_steps.rb

@@ -37,3 +37,12 @@ Then(/^I should( not)? have parameter "([^"]*)"( with value "([^"]*)")?$/) do |n
     end
   end
 end
+
+Then /^I should see current filter "([^"]*)" equal to "([^"]*)"( with label "([^"]*)")?$/ do |name, value, label_block, label|
+  expect(page).to have_css "li.current_filter_#{name} span", text: label if label_block
+  expect(page).to have_css "li.current_filter_#{name} b", text: value
+end
+
+Then /^I should see link "([^"]*)" in current filters/ do |label|
+  expect(page).to have_css "li.current_filter b a", text: label
+end

data/features/step_definitions/format_steps.rb

@@ -53,4 +53,4 @@ end
 
 Then /^access denied$/ do
   expect(page).to have_content(I18n.t("active_admin.access_denied.message"))
-end
+end

data/features/step_definitions/index_scope_steps.rb

@@ -18,6 +18,10 @@ Then /^I should see the scope with label "([^"]*)"$/ do |label|
   expect(page).to have_link(label)
 end
 
+Then /^I should see the current scope with label "([^"]*)"$/ do |label|
+  expect(page).to have_css '.current_scope_name', text: label
+end
+
 Then /^I should see the scope "([^"]*)" with no count$/ do |name|
   name = name.tr(" ", "").underscore.downcase
   expect(page).to     have_css ".scopes .#{name}"

data/features/support/env.rb

@@ -6,7 +6,11 @@
 
 ENV['RAILS_ENV'] = 'test'
 
-require File.expand_path('../../../spec/spec_helper', __FILE__)
+require 'simplecov' if ENV["COVERAGE"] == "true"
+
+Dir["#{File.expand_path('../../step_definitions', __FILE__)}/*.rb"].each do |f|
+  require f
+end
 
 require 'rails'
 ENV['RAILS_ROOT'] = File.expand_path("../../../spec/rails/rails-#{Rails.version}", __FILE__)
@@ -57,9 +61,6 @@ Capybara.javascript_driver = :poltergeist
 # steps to use the XPath syntax.
 Capybara.default_selector = :css
 
-# Make input type=hidden visible
-Capybara.ignore_hidden_elements = false
-
 # If you set this to false, any error raised from within your app will bubble
 # up to your step definition and out to cucumber unless you catch it somewhere
 # on the way. You can make Rails rescue errors and render error pages on a

data/features/support/regular_env.rb

@@ -0,0 +1,7 @@
+if ENV["COVERAGE"] == "true"
+  require 'simplecov'
+
+  SimpleCov.command_name "regular features"
+end
+
+require_relative 'env'

data/features/support/reload_env.rb

@@ -0,0 +1,7 @@
+if ENV["COVERAGE"] == "true"
+  require 'simplecov'
+
+  SimpleCov.command_name "reload features"
+end
+
+require_relative 'env'

data/gemfiles/rails_42.gemfile

@@ -1,45 +1,10 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
-gem "cancan"
-gem "pundit"
-gem "rake"
-gem "parallel_tests"
-gem "pry"
-gem "rubocop", "0.48.1"
+eval_gemfile(File.expand_path(File.join("..", "Gemfile"), __dir__))
+
 gem "rails", "4.2.8"
-gem "jquery-ui-rails", "~> 5.0"
 gem "devise", "~> 3.5"
 gem "draper", "~> 2.1"
 gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
 
-group :development do
-  gem "better_errors"
-  gem "binding_of_caller", platforms: :mri
-  gem "rack-mini-profiler"
-  gem "yard"
-  gem "redcarpet", platforms: :mri
-  gem "kramdown", platforms: :jruby
-  gem "appraisal", "~> 2.2", require: false
-end
-
-group :test do
-  gem "capybara"
-  gem "simplecov", require: false
-  gem "codecov", require: false
-  gem "cucumber-rails", require: false
-  gem "cucumber", "1.3.20"
-  gem "database_cleaner", git: "https://github.com/DatabaseCleaner/database_cleaner.git"
-  gem "jasmine"
-  gem "jslint_on_rails"
-  gem "launchy"
-  gem "rails-i18n"
-  gem "rspec-rails"
-  gem "i18n-spec"
-  gem "shoulda-matchers", "<= 2.8.0"
-  gem "sqlite3", platforms: :mri
-  gem "poltergeist"
-end
-
 gemspec path: "../"

data/gemfiles/rails_50.gemfile

@@ -1,45 +1,10 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
-gem "cancan"
-gem "pundit"
-gem "rake"
-gem "parallel_tests"
-gem "pry"
-gem "rubocop", "0.48.1"
-gem "rails", "5.0.2"
-gem "jquery-ui-rails", "~> 5.0"
-gem "devise", "> 4.x"
-gem "draper", "> 3.x"
-gem "activerecord-jdbcsqlite3-adapter", git: "https://github.com/jruby/activerecord-jdbc-adapter", branch: "rails-5", platforms: :jruby
-
-group :development do
-  gem "better_errors"
-  gem "binding_of_caller", platforms: :mri
-  gem "rack-mini-profiler"
-  gem "yard"
-  gem "redcarpet", platforms: :mri
-  gem "kramdown", platforms: :jruby
-  gem "appraisal", "~> 2.2", require: false
-end
+eval_gemfile(File.expand_path(File.join("..", "Gemfile"), __dir__))
 
-group :test do
-  gem "capybara"
-  gem "simplecov", require: false
-  gem "codecov", require: false
-  gem "cucumber-rails", require: false
-  gem "cucumber", "1.3.20"
-  gem "database_cleaner", git: "https://github.com/DatabaseCleaner/database_cleaner.git"
-  gem "jasmine"
-  gem "jslint_on_rails"
-  gem "launchy"
-  gem "rails-i18n"
-  gem "rspec-rails"
-  gem "i18n-spec"
-  gem "shoulda-matchers", "<= 2.8.0"
-  gem "sqlite3", platforms: :mri
-  gem "poltergeist"
-end
+gem "rails", "5.0.3"
+gem "devise", "~> 4.0"
+gem "draper", "~> 3.0"
+gem "activerecord-jdbcsqlite3-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "rails-5", platforms: :jruby
 
 gemspec path: "../"

data/gemfiles/rails_51.gemfile

@@ -1,45 +1,10 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
-gem "cancan"
-gem "pundit"
-gem "rake"
-gem "parallel_tests"
-gem "pry"
-gem "rubocop", "0.48.1"
-gem "rails", "~> 5.1.x"
-gem "jquery-ui-rails", "~> 5.0"
-gem "devise", "> 4.x"
-gem "draper", "> 3.x"
-gem "activerecord-jdbcsqlite3-adapter", git: "https://github.com/jruby/activerecord-jdbc-adapter", branch: "rails-5", platforms: :jruby
-
-group :development do
-  gem "better_errors"
-  gem "binding_of_caller", platforms: :mri
-  gem "rack-mini-profiler"
-  gem "yard"
-  gem "redcarpet", platforms: :mri
-  gem "kramdown", platforms: :jruby
-  gem "appraisal", "~> 2.2", require: false
-end
+eval_gemfile(File.expand_path(File.join("..", "Gemfile"), __dir__))
 
-group :test do
-  gem "capybara"
-  gem "simplecov", require: false
-  gem "codecov", require: false
-  gem "cucumber-rails", require: false
-  gem "cucumber", "1.3.20"
-  gem "database_cleaner", git: "https://github.com/DatabaseCleaner/database_cleaner.git"
-  gem "jasmine"
-  gem "jslint_on_rails"
-  gem "launchy"
-  gem "rails-i18n"
-  gem "rspec-rails"
-  gem "i18n-spec"
-  gem "shoulda-matchers", "<= 2.8.0"
-  gem "sqlite3", platforms: :mri
-  gem "poltergeist"
-end
+gem "rails", "5.1.1"
+gem "devise", "~> 4.3"
+gem "draper", "~> 3.0"
+gem "activerecord-jdbcsqlite3-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "rails-5", platforms: :jruby
 
 gemspec path: "../"

data/lib/active_admin.rb

@@ -3,14 +3,11 @@ require 'set'
 
 require 'ransack'
 require 'ransack_ext'
-require 'bourbon'
 require 'kaminari'
 require 'formtastic'
 require 'formtastic_i18n'
-require 'sass-rails'
 require 'inherited_resources'
 require 'jquery-rails'
-require 'jquery-ui-rails'
 require 'coffee-rails'
 require 'arbre'
 

data/lib/active_admin/application.rb

@@ -114,6 +114,9 @@ module ActiveAdmin
     # class to handle ordering
     inheritable_setting :order_clause, ActiveAdmin::OrderClause
 
+    # default show_count for scopes
+    inheritable_setting :scopes_show_count, true
+
     # Request parameters that are permitted by default
     inheritable_setting :permitted_params, [
       :utf8, :_method, :authenticity_token, :commit, :id
@@ -268,10 +271,9 @@ module ActiveAdmin
   private
 
     def register_default_assets
-      register_stylesheet 'active_admin.css',       media: 'screen'
-      register_stylesheet 'active_admin/print.css', media: 'print'
-
-      register_javascript 'active_admin.js'
+      stylesheets['active_admin.css'] = { media: 'screen' }
+      stylesheets['active_admin/print.css'] = { media: 'print' }
+      javascripts.add 'active_admin.js'
     end
 
     # Since app/admin is alphabetically before app/models, we have to remove it

data/lib/active_admin/asset_registration.rb

@@ -2,6 +2,10 @@ module ActiveAdmin
   module AssetRegistration
 
     def register_stylesheet(path, options = {})
+      Deprecation.warn <<-MSG.strip_heredoc
+        The `register_stylesheet` config is deprecated and will be removed
+        in v2. Import your "#{path}" stylesheet in the active_admin.scss.
+      MSG
       stylesheets[path] = options
     end
 
@@ -14,6 +18,10 @@ module ActiveAdmin
     end
 
     def register_javascript(name)
+      Deprecation.warn <<-MSG.strip_heredoc
+        The `register_javascript` config is deprecated and will be removed
+        in v2. Import your "#{name}" javascript in the active_admin.js.
+      MSG
       javascripts.add name
     end
 

data/lib/active_admin/authorization_adapter.rb

@@ -10,7 +10,6 @@ module ActiveAdmin
 
   Auth = Authorization
 
-
   # Active Admin's default authorization adapter. This adapter returns true
   # for all requests to `#authorized?`. It should be the starting point for
   # implementing your own authorization adapter.
@@ -19,7 +18,6 @@ module ActiveAdmin
   class AuthorizationAdapter
     attr_reader :resource, :user
 
-
     # Initialize a new authorization adapter. This happens on each and
     # every request to a controller.
     #
@@ -54,7 +52,6 @@ module ActiveAdmin
       true
     end
 
-
     # A hook method for authorization libraries to scope the collection. By
     # default, we just return the same collection. The returned scope is used
     # as the starting point for all queries to the db in the controller.

data/lib/active_admin/base_controller.rb

@@ -29,8 +29,8 @@ module ActiveAdmin
       raise AbstractController::ActionNotFound unless action_methods.include?(params[:action])
     end
 
-    include Menu
     include Authorization
+    include Menu
 
     private
 
@@ -59,7 +59,6 @@ module ActiveAdmin
     end
     helper_method :active_admin_namespace
 
-
     ACTIVE_ADMIN_ACTIONS = [:index, :show, :new, :create, :edit, :update, :destroy]
 
     # Determine which layout to use.

data/lib/active_admin/base_controller/authorization.rb

@@ -38,7 +38,6 @@ module ActiveAdmin
         active_admin_authorization.authorized?(action, subject)
       end
 
-
       # Authorize the action and subject. Available in the controller
       # as well as all the views. If the action is not allowd, it raises
       # an ActiveAdmin::AccessDenied exception.

data/lib/active_admin/base_controller/menu.rb

@@ -18,15 +18,15 @@ module ActiveAdmin
       # Get's called through a before filter
       def set_current_tab
         @current_tab = if current_menu && active_admin_config.belongs_to? && parent?
-          parent_item = active_admin_config.belongs_to_config.target.menu_item
-          if current_menu.include? parent_item
-            parent_item
-          else
-            active_admin_config.menu_item
-          end
-        else
-          active_admin_config.menu_item
-        end
+                         parent_item = active_admin_config.belongs_to_config.target.menu_item
+                         if current_menu.include? parent_item
+                           parent_item
+                         else
+                           active_admin_config.menu_item
+                         end
+                       else
+                         active_admin_config.menu_item
+                       end
       end
 
     end

data/lib/active_admin/batch_actions/controller.rb

@@ -5,7 +5,7 @@ module ActiveAdmin
       # Controller action that is called when submitting the batch action form
       def batch_action
         if action_present?
-          selection  =            params[:collection_selection] ||  []
+          selection  =            params[:collection_selection] || []
           inputs     = JSON.parse params[:batch_action_inputs]  || '{}'
           valid_keys = render_in_context(self, current_batch_action.inputs).try(:keys)
           inputs     = inputs.with_indifferent_access.slice *valid_keys

data/lib/active_admin/batch_actions/views/selection_cells.rb

@@ -7,8 +7,11 @@ module ActiveAdmin
     class ResourceSelectionToggleCell < ActiveAdmin::Component
       builder_method :resource_selection_toggle_cell
 
-      def build
-        input type: "checkbox", id: "collection_selection_toggle_all", name: "collection_selection_toggle_all", class: "toggle_all"
+      def build(label_text = '')
+        label do
+          input type: "checkbox", id: "collection_selection_toggle_all", name: "collection_selection_toggle_all", class: "toggle_all"
+          text_node label_text if label_text.present?
+        end
       end
     end
 
@@ -27,10 +30,8 @@ module ActiveAdmin
 
       def build
         super(id: "collection_selection_toggle_panel")
-        resource_selection_toggle_cell
-        div(id: "collection_selection_toggle_explaination" ) { I18n.t('active_admin.batch_actions.selection_toggle_explanation', default: "(Toggle Selection)") }
+        resource_selection_toggle_cell(I18n.t('active_admin.batch_actions.selection_toggle_explanation', default: "(Toggle Selection)"))
       end
-
     end
 
   end