ruby 3.0 supporting (#26)

Author: gigorok

.travis.yml

@@ -3,12 +3,18 @@
 language: ruby
 cache: bundler
 before_install:
-  - gem install bundler -v 2.1.4
+  - gem install bundler -v 2.2.32
 stages:
   - test
   - deploy
 jobs:
   include:
+    - name: "Test Ruby-3.0.3 Rails-6.1"
+      stage: test
+      rvm: 3.0.3
+      env: RAILS_VERSION="~> 6.1"
+      before_script: bundle install
+      script: bundle exec rake default
     - name: "Test Ruby-2.5.7 Rails-6.0"
       stage: test
       rvm: 2.5.7

Gemfile

@@ -13,7 +13,6 @@ gem 'puma'
 gem 'rake', '~> 12.0'
 gem 'rspec-rails', '~> 4.0'
 gem 'rubocop', '~> 0.81.0', require: false
-gem 'system_test_html_screenshots', require: false
 gem 'yard', require: false
 
 gem 'activeadmin', ENV.fetch('ACTIVE_ADMIN_VERSION', '~> 2.0'), require: false
@@ -28,4 +27,4 @@ end
 
 gem 'sassc-rails', '2.1.2'
 gem 'sprockets', '3.7.2'
-gem 'sqlite3', '1.4.1'
+gem 'sqlite3'

lib/capybara/active_admin/actions/form.rb

@@ -6,7 +6,7 @@ module Actions
       module Form
         def click_submit(value, options = {})
           selector = form_submit_selector(value)
-          find(selector, options).click
+          find(selector, **options).click
         end
 
         def fill_in_file(label, options = {})

lib/capybara/active_admin/actions/layout.rb

@@ -7,21 +7,21 @@ module Actions
       module Layout
         def click_action_item(title, options = {})
           within(action_items_container_selector) do
-            click_link(title, options)
+            click_link(title, **options)
           end
         end
 
         def switch_tab(tab_name, options = {})
           opts = Util.options_with_text(tab_name, options)
-          find(tab_header_link_selector, opts).click
+          find(tab_header_link_selector, **opts).click
         end
 
         def click_batch_action(title, exact: true)
           open_batch_action_menu
           within(dropdown_list_selector) do
             selector = batch_action_selector
             opts = Util.options_with_text(title, exact: exact)
-            find(selector, opts).click
+            find(selector, **opts).click
           end
         end
 

lib/capybara/active_admin/finders/layout.rb

@@ -7,7 +7,7 @@ module Finders
       module Layout
         def find_footer(options = {})
           selector = footer_selector
-          have_selector(selector, options)
+          have_selector(selector, **options)
         end
 
         def within_tab_body
@@ -26,7 +26,7 @@ def within_sidebar(title, exact: nil)
         def within_panel(title, exact: nil)
           title_selector = "#{panel_selector} > #{panel_title_selector}"
           title_opts = Util.options_with_text(title, exact: exact)
-          panel_title = find(title_selector, title_opts)
+          panel_title = find(title_selector, **title_opts)
           panel_content = panel_title.sibling(panel_content_selector)
 
           within(panel_content) { yield }

lib/capybara/active_admin/matchers/attributes_table.rb

@@ -8,12 +8,12 @@ def have_attributes_table(options = {})
           model = options.delete(:model)
           id = options.delete(:id)
           selector = attributes_table_selector(model: model, id: id)
-          have_selector(selector, options)
+          have_selector(selector, **options)
         end
 
         def have_attribute_row(label, options = {})
           selector = attributes_row_selector(label)
-          have_selector(selector, options)
+          have_selector(selector, **options)
         end
       end
     end

lib/capybara/active_admin/matchers/form.rb

@@ -7,30 +7,30 @@ module Form
         def have_form_error(text, options = {})
           field = options.delete(:field)
           opts = Util.options_with_text(text, options)
-          li_selector = input_container_selector field, options.slice(:exact)
+          li_selector = input_container_selector field, **options.slice(:exact)
 
-          have_selector("#{li_selector} #{inline_error_selector}", opts)
+          have_selector("#{li_selector} #{inline_error_selector}", **opts)
         end
 
         def have_no_form_errors(options = {})
           field = options.delete(:field)
-          li_selector = input_container_selector field, options.slice(:exact)
+          li_selector = input_container_selector field, **options.slice(:exact)
 
-          have_none_of_selectors(:css, "#{li_selector} #{inline_error_selector}", options)
+          have_none_of_selectors(:css, "#{li_selector} #{inline_error_selector}", **options)
         end
 
         def have_semantic_error(text, options = {})
           opts = Util.options_with_text(text, options)
-          have_selector(semantic_error_selector, opts)
+          have_selector(semantic_error_selector, **opts)
         end
 
         def have_semantic_errors(options = {})
-          have_selector(semantic_error_selector, options)
+          have_selector(semantic_error_selector, **options)
         end
 
         def have_has_many_fields_for(association_name, options = {})
           selector = has_many_fields_selector(association_name)
-          have_selector(selector, options)
+          have_selector(selector, **options)
         end
 
         # @param text [String] button title
@@ -46,7 +46,7 @@ def have_has_many_fields_for(association_name, options = {})
         def have_submit_input(text, options = {})
           selector = "#{form_submit_selector(text)}#{options.delete(:selector)}"
           selector += '[disabled="disabled"].disabled' if options.delete(:disabled)
-          have_selector(selector, options)
+          have_selector(selector, **options)
         end
       end
     end

lib/capybara/active_admin/matchers/layout.rb

@@ -7,42 +7,42 @@ module Matchers
       module Layout
         def have_action_item(text, options = {})
           opts = Util.options_with_text(text, options)
-          have_selector(action_item_selector, opts)
+          have_selector(action_item_selector, **opts)
         end
 
         def have_page_title(text, options = {})
           opts = Util.options_with_text(text, options)
-          have_selector(page_title_selector, opts)
+          have_selector(page_title_selector, **opts)
         end
 
         def have_flash_message(text, options = {})
           type = options.delete(:type)
           opts = Util.options_with_text(text, options)
           selector = flash_message_selector(type)
-          have_selector(selector, opts)
+          have_selector(selector, **opts)
         end
 
         def have_footer(options = {})
           selector = footer_selector
-          have_selector(selector, options)
+          have_selector(selector, **options)
         end
 
         def have_panel(title, options = {})
           title_selector = "#{panel_selector} > #{panel_title_selector}"
           opts = Util.options_with_text(title, options)
-          have_selector(title_selector, opts)
+          have_selector(title_selector, **opts)
         end
 
         def have_sidebar(title, options = {})
           title_selector = "#{sidebar_selector} #{panel_selector} > #{panel_title_selector}"
           opts = Util.options_with_text(title, options)
-          have_selector(title_selector, opts)
+          have_selector(title_selector, **opts)
         end
 
         def have_batch_action(title, exact: true)
           selector = "#{dropdown_list_selector} #{batch_action_selector}"
           opts = Util.options_with_text(title, exact: exact)
-          have_selector(selector, opts)
+          have_selector(selector, **opts)
         end
       end
     end

lib/capybara/active_admin/matchers/table.rb

@@ -14,7 +14,7 @@ module Table
         def have_table(options = {})
           resource_name = options.delete(:resource_name)
           selector = table_selector(resource_name)
-          have_selector(selector, options)
+          have_selector(selector, **options)
         end
 
         # @param options [Hash]
@@ -30,7 +30,7 @@ def have_table(options = {})
         def have_table_row(options = {})
           row_id = options.delete(:id)
           selector = table_row_selector(row_id)
-          have_selector(selector, options)
+          have_selector(selector, **options)
         end
 
         # @param options [Hash]
@@ -51,13 +51,13 @@ def have_table_cell(options = {})
           column = options.delete(:column)
           selector = table_cell_selector(column)
 
-          have_selector(selector, options)
+          have_selector(selector, **options)
         end
 
         # @param options [Hash]
         # @option count [Integer] qty of nodes
         def have_table_scopes(options = {})
-          have_selector("#{table_scopes_container_selector} > #{table_scope_selector}", options)
+          have_selector("#{table_scopes_container_selector} > #{table_scope_selector}", **options)
         end
 
         # @param options [Hash]
@@ -69,7 +69,7 @@ def have_table_scope(options = {})
           selector = "#{table_scopes_container_selector} > #{table_scope_selector}"
           selector = active ? "#{selector}.selected" : "#{selector}:not(.selected)"
 
-          have_selector(selector, options)
+          have_selector(selector, **options)
         end
       end
     end

lib/capybara/active_admin/selectors/form.rb

@@ -56,7 +56,7 @@ def input_container_selector(label = nil, exact: nil)
           return 'li' if label.nil?
 
           label_opts = Util.options_with_text(label, exact: exact)
-          label_node = find(label_selector, label_opts)
+          label_node = find(label_selector, **label_opts)
           li_id = label_node.ancestor('li')[:id]
           "li##{li_id}"
         end