Merge pull request #30 from Zamyatin-AA/batch_action_collection_fix

fixed batch_action_collection not working with decorators

Author: workgena

Gemfile

@@ -6,6 +6,7 @@ group :test do
   gem 'sprockets-rails', '2.3.3'
   gem 'rails', '~> 5.1'
   gem 'rspec-rails'
+  gem 'draper'
   gem 'activeadmin', '1.0.0'
   gem 'sass-rails'
   gem 'sqlite3'

lib/active_admin_scoped_collection_actions/controller.rb

@@ -1,8 +1,16 @@
 module ActiveAdminScopedCollectionActions
   module Controller
+    COLLECTION_APPLIES = [
+      :authorization_scope,
+      :filtering,
+      :scoping,
+      :includes,
+    ].freeze
+
     def scoped_collection_records
       selection = params.fetch(:collection_selection, [])
-      selection.any? ? batch_action_collection.where(resource_class.primary_key => selection) : batch_action_collection
+      selection.any? ? batch_action_collection(COLLECTION_APPLIES).where(resource_class.primary_key => selection)
+        : batch_action_collection(COLLECTION_APPLIES)
     end
   end
 end

spec/authors_actions_spec.rb

@@ -78,6 +78,25 @@
   end
 
 
-  context
+  context 'perform Delete-action when cheked only one item' do
+
+    let(:delete_author) { Author.first }
+
+    before do
+      page.find('#collection_actions_sidebar_section button', text: 'Delete').click
+      page.find("#batch_action_item_#{delete_author.id}").trigger('click')
+      page.within ('body>.active_admin_dialog_mass_update_by_filter') do
+        page.find('button', text: 'OK').click
+      end
+    end
+
+    it 'delete only cheked author' do
+      expect(page).to have_css('.flashes .flash.flash_notice')
+      expect(Author.count).to eq(1)
+      expect(Author.take.id).not_to eq(delete_author.id)
+      expect(page).to have_css("#batch_action_item_#{Author.take.id}")
+    end
+
+  end
 
 end

spec/support/admin.rb

@@ -2,6 +2,7 @@ def add_author_resource(options = {}, &block)
 
   ActiveAdmin.register Author do
     config.filters = true
+    decorate_with AuthorDecorator
 
     config.scoped_collection_actions_if = -> { true }
 

spec/support/rails_template.rb

@@ -21,6 +21,7 @@
 
 generate :'active_admin:install --skip-users'
 generate :'formtastic:install'
+generate :'decorator Author'
 
 # Install active_admin_date_time_datetimepicker assets
 inject_into_file "app/assets/stylesheets/active_admin.scss",