capybara_active_admin 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16668060b6810df687cbcfd8757396b2ff13c9f98519090928308f872609017f
-  data.tar.gz: 6f005ee3bcf21792abf5246d284802aa1ae52544c1547cd9f1ca0ece36ef6e99
+  metadata.gz: 4da4f63c41b38a64d538b7b68481643e46b1889fbe0872aed20f382e141a0775
+  data.tar.gz: 84731f3fc29c973dec00c1def2f2796de9635850012f99f7bcd5788f0425ffd6
 SHA512:
-  metadata.gz: 9488c08a71f94b535a4723fce444cb5a4bbf804c34c3e9593e10849925476e7294a47db30420669fbe87aa38bc2e8bfb249f0b7312e67c6c9057678eea82eea8
-  data.tar.gz: 3bdf50dc809f1515e64bc73a46d622cb540342ef8da2e587ff9627f9018eee75565b5402c692eb23ad97030f07c7e47249535b961de2e0f3173e85627a003f8a
+  metadata.gz: 98c30e82888cee2fd037151143fe0123427d322a8953bcc62d662654d98424a98bfe936ed7bc9ec0b4d0dbcb26ceae55f07c710b6ecb8fbee34368ddd88e1d7a
+  data.tar.gz: 6afe3d0d6568155abb51806a61fbbba2aa161a05d42b91faedec5690d5bda399024a9e3b865078bc65cb5501ecd2f825764d2cdc010388f5b2c973b2e4287408

data/CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.0] - 2020-04-15
+### Added
+- implement DSL for tabs, batch actions, modal dialog, attributes table, panel, sidebar, footer
+- improve form DSL
+
 ## [0.2.1] - 2020-04-14
 ### Fixed
  - `table_selector`, `within_table_for` incorrect resource name

data/lib/capybara/active_admin.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'capybara/active_admin/version'
+require 'capybara/active_admin/util'
 require 'capybara/active_admin/selectors'
 require 'capybara/active_admin/finders'
 require 'capybara/active_admin/matchers'

data/lib/capybara/active_admin/actions/layout.rb

@@ -9,6 +9,23 @@ module Capybara
             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
+        end
+
+        def click_batch_action(title)
+          find(batch_actions_button_selector).click
+          within(dropdown_list_selector) do
+            selector = batch_action_selector(title)
+            find(selector).click
+          end
+        end
+
+        def confirm_modal_dialog
+          within_modal_dialog { click_button 'OK' }
+        end
       end
     end
   end

data/lib/capybara/active_admin/finders/attributes_table.rb

@@ -4,7 +4,13 @@ module Capybara
   module ActiveAdmin
     module Finders
       module AttributesTable
-        # todo
+        # @param model_name [Class<Object>, nil] model name or class.
+        # @param record_id [String, Numeric, nil]
+        # @yield within attributes table
+        def within_attributes_table_for(model_name, record_id = nil)
+          selector = attributes_table_selector(model_name, record_id)
+          within(selector) { yield }
+        end
       end
     end
   end

data/lib/capybara/active_admin/finders/form.rb

@@ -5,6 +5,7 @@ module Capybara
     module Finders
       module Form
         # @param name [Class<Object>, String] form record class or model name
+        # @yield within form
         def within_form_for(name)
           name = name.model_name.singular if name.is_a?(Class)
           selector = form_selector(name)
@@ -20,6 +21,20 @@ module Capybara
 
           within(fieldset) { yield }
         end
+
+        def find_input(label, options = {})
+          label_opts = Util.options_with_text label, options.slice(:exact)
+          label_node = find(label_selector, label_opts)
+
+          input_id = label_node[:for]
+          opts = options.except(:exact)
+          find("##{input_id}", opts)
+        end
+
+        def within_filters
+          selector = filter_form_selector
+          within(selector) { yield }
+        end
       end
     end
   end

data/lib/capybara/active_admin/finders/layout.rb

@@ -4,7 +4,36 @@ module Capybara
   module ActiveAdmin
     module Finders
       module Layout
-        # todo
+        def find_footer(options = {})
+          selector = footer_selector
+          have_selector(selector, options)
+        end
+
+        def within_tab_body
+          selector = tab_content_selector
+          within(selector) { yield }
+        end
+
+        def within_sidebar(title, exact: nil)
+          selector = sidebar_selector
+
+          within(selector) do
+            within_panel(title, exact: exact) { yield }
+          end
+        end
+
+        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_content = panel_title.sibling(panel_content_selector)
+
+          within(panel_content) { yield }
+        end
+
+        def within_modal_dialog
+          within(modal_dialog_selector) { yield }
+        end
       end
     end
   end

data/lib/capybara/active_admin/finders/table.rb

@@ -10,7 +10,7 @@ module Capybara
 
         # @param model_name [Class<#model_name>, String] records class or model name to match rows.
         # @param resource_name [String, nil] resource name of index page.
-        # @yield within table.
+        # @yield within table
         def within_table_for(model_name, resource_name = nil)
           selector = table_selector(resource_name)
 
@@ -25,6 +25,9 @@ module Capybara
           end
         end
 
+        # id [String, Integer, nil] record ID.
+        # index [Integer] row index in table (starts with 0).
+        # @yield within table>tbody>tr
         def within_table_row(id: nil, index: nil)
           row = find_table_row(id: id, index: index)
           within(row) { yield }
@@ -43,6 +46,7 @@ module Capybara
           find_all(selector, minimum: index + 1)[index]
         end
 
+        # @yield within table>tbody>tr>td
         def within_table_cell(name)
           cell = find_table_cell(name)
           within(cell) { yield }

data/lib/capybara/active_admin/matchers/attributes_table.rb

@@ -4,7 +4,17 @@ module Capybara
   module ActiveAdmin
     module Matchers
       module AttributesTable
-        # todo
+        def have_attributes_table(options = {})
+          model_name = options.delete(:model)
+          record_id = options.delete(:id)
+          selector = attributes_table_selector(model_name, record_id)
+          have_selector(selector, options)
+        end
+
+        def have_attribute_row(label, options = {})
+          selector = attributes_row_selector(label)
+          have_selector(selector, options)
+        end
       end
     end
   end

data/lib/capybara/active_admin/matchers/form.rb

@@ -4,27 +4,23 @@ module Capybara
   module ActiveAdmin
     module Matchers
       module Form
-        def have_form_error(error, options = {})
+        def have_form_error(text, options = {})
           field = options.delete(:field)
-          opts = options.merge(text: error)
-          return have_selector("li #{inline_error_selector}", opts) if field.nil?
+          opts = Util.options_with_text(text, options)
+          li_selector = input_container_selector field, options.slice(:exact)
 
-          label = find(label_selector, text: field)
-          li_id = label.ancestor('li')[:id]
-          have_selector("li##{li_id} #{inline_error_selector}", opts)
+          have_selector("#{li_selector} #{inline_error_selector}", opts)
         end
 
         def have_no_form_errors(options = {})
           field = options.delete(:field)
-          return have_none_of_selectors(:css, "li #{inline_error_selector}", options) if field.nil?
+          li_selector = input_container_selector field, options.slice(:exact)
 
-          label = find(label_selector, text: field)
-          li_id = label.ancestor('li')[:id]
-          have_none_of_selectors(:css, "li##{li_id} #{inline_error_selector}", options)
+          have_none_of_selectors(:css, "#{li_selector} #{inline_error_selector}", options)
         end
 
-        def have_semantic_error(error, options = {})
-          opts = options.merge(text: error)
+        def have_semantic_error(text, options = {})
+          opts = Util.options_with_text(text, options)
           have_selector(semantic_error_selector, opts)
         end
 
@@ -32,8 +28,8 @@ module Capybara
           have_selector(semantic_error_selector, options)
         end
 
-        def have_no_input(label, options = {})
-          opts = options.merge(text: label)
+        def have_no_input(text, options = {})
+          opts = Util.options_with_text(text, options)
           have_none_of_selectors(:css, label_selector, opts)
         end
 
@@ -42,8 +38,8 @@ module Capybara
           have_selector(selector, options)
         end
 
-        def have_input(label, options = {})
-          selector = input_selector label, options.slice(:type, :text)
+        def have_input(text, options = {})
+          selector = input_selector text, options.slice(:type, :text)
           opts = options.except(:type, :text)
           have_selector(selector, opts)
         end

data/lib/capybara/active_admin/matchers/layout.rb

@@ -5,21 +5,38 @@ module Capybara
     module Matchers
       module Layout
         def have_action_item(text, options = {})
-          opts = options.merge(text: text)
+          opts = Util.options_with_text(text, options)
           have_selector(action_item_selector, opts)
         end
 
         def have_page_title(text, options = {})
-          opts = options.merge(text: text)
+          opts = Util.options_with_text(text, options)
           have_selector(page_title_selector, opts)
         end
 
         def have_flash_message(text, options = {})
           type = options.delete(:type)
-          opts = options.merge(text: text)
+          opts = Util.options_with_text(text, options)
           selector = flash_message_selector(type)
           have_selector(selector, opts)
         end
+
+        def have_footer(options = {})
+          selector = footer_selector
+          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)
+        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)
+        end
       end
     end
   end

data/lib/capybara/active_admin/matchers/table.rb

@@ -19,6 +19,7 @@ module Capybara
 
         # @param options [Hash]
         #   :text [String, nil] cell content
+        #   :exact_text [String, nil] cell content exact matching
         #   :id [String, Number, nil] record ID
         #   for other options @see Capybara::RSpecMatchers#have_selector
         # @example
@@ -33,7 +34,8 @@ module Capybara
         end
 
         # @param options [Hash]
-        #   :text [String, nil] cell content
+        #   :text [String, nil] cell content include matching
+        #   :exact_text [String, nil] cell content exact matching
         #   :column [String, nil] cell header name
         #   for other options @see Capybara::RSpecMatchers#have_selector
         # @example

data/lib/capybara/active_admin/selectors/attributes_table.rb

@@ -4,7 +4,21 @@ module Capybara
   module ActiveAdmin
     module Selectors
       module AttributesTable
-        # todo
+        def attributes_table_selector(model_name, record_id = nil)
+          return 'div.attributes_table' if model_name.nil?
+
+          model_name = Util.parse_model_name(model_name)
+          selector = "div.attributes_table.#{model_name}"
+          selector += "#attributes_table_#{model_name}_#{record_id}" if record_id
+          selector
+        end
+
+        def attributes_row_selector(label)
+          return 'tr.row > td' if label.nil?
+
+          label = label.to_s.gsub(' ', '_').downcase
+          "tr.row.row-#{label} > td"
+        end
       end
     end
   end

data/lib/capybara/active_admin/selectors/form.rb

@@ -44,6 +44,19 @@ module Capybara
           selector = %(#{selector}[value="#{text}"]) unless text.nil?
           selector
         end
+
+        def input_container_selector(label, exact: nil)
+          return 'li' if label.nil?
+
+          label_opts = Util.options_with_text(label, exact: exact)
+          label_node = find(label_selector, label_opts)
+          li_id = label_node.ancestor('li')[:id]
+          "li##{li_id}"
+        end
+
+        def filter_form_selector
+          '.filter_form'
+        end
       end
     end
   end

data/lib/capybara/active_admin/selectors/layout.rb

@@ -21,6 +21,50 @@ module Capybara
 
           '.flashes .flash'
         end
+
+        def footer_selector
+          'div.footer#footer'
+        end
+
+        def tab_header_link_selector
+          '.tabs.ui-tabs li.ui-tabs-tab a'
+        end
+
+        def tab_content_selector
+          '.tab-content'
+        end
+
+        def sidebar_selector
+          '#sidebar'
+        end
+
+        def panel_selector
+          '.panel'
+        end
+
+        def panel_title_selector
+          'h3'
+        end
+
+        def panel_content_selector
+          '.panel_contents'
+        end
+
+        def batch_actions_button_selector
+          'div.batch_actions_selector'
+        end
+
+        def dropdown_list_selector
+          'ul.dropdown_menu_list'
+        end
+
+        def batch_action_selector(title)
+          "li a[data-action='#{title}']"
+        end
+
+        def modal_dialog_selector
+          '.active_admin_dialog'
+        end
       end
     end
   end

data/lib/capybara/active_admin/selectors/table.rb

@@ -14,8 +14,7 @@ module Capybara
         def table_row_selector(model_name, record_id)
           return 'tbody > tr' if record_id.nil?
 
-          model_name = model_name.model_name.singular if model_name.is_a?(Class)
-          model_name = model_name.to_s.gsub(' ', '_').singularize.downcase
+          model_name = Util.parse_model_name(model_name)
           "tbody > tr##{model_name}_#{record_id}"
         end
 

data/lib/capybara/active_admin/util.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Capybara
+  module ActiveAdmin
+    module Util
+      # Common pure utility functions
+
+      def parse_model_name(model_name, singular: true)
+        return if model_name.nil?
+
+        model_name = model_name.model_name.singular if model_name.is_a?(Class)
+        model_name = model_name.to_s.gsub(' ', '_').downcase
+        singular ? model_name.singularize : model_name.pluralize
+      end
+
+      def options_with_text(text, options = {})
+        key = options[:exact] ? :exact_text : :text
+
+        options.except(:exact).merge(key => text)
+      end
+
+      module_function :parse_model_name, :options_with_text
+    end
+  end
+end

data/lib/capybara/active_admin/version.rb

@@ -2,6 +2,6 @@
 
 module Capybara
   module ActiveAdmin
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara_active_admin
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Denis Talakevich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -81,6 +81,7 @@ files:
 - lib/capybara/active_admin/selectors/layout.rb
 - lib/capybara/active_admin/selectors/table.rb
 - lib/capybara/active_admin/test_helpers.rb
+- lib/capybara/active_admin/util.rb
 - lib/capybara/active_admin/version.rb
 - lib/capybara_active_admin.rb
 homepage: https://github.com/active_admin_plugins/capybara_active_admin