capybara_active_admin 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aa80eda0b75b26f75d6b7a1a0df8355c8ef0bdb622687ecbd020bdc0cec6688
-  data.tar.gz: a9d73931be3341bca9fc81399009ae7f7c1045d72976ab24603d5818a408ed65
+  metadata.gz: 16668060b6810df687cbcfd8757396b2ff13c9f98519090928308f872609017f
+  data.tar.gz: 6f005ee3bcf21792abf5246d284802aa1ae52544c1547cd9f1ca0ece36ef6e99
 SHA512:
-  metadata.gz: 7a5c5af2f5bf9bdfb9ceb7f8dfdbf416ecd02b8a51df91e8a310dcfb9ff4ec7f40556059edf4070a352999c7c67129c2c97eaf6ff6ef5a44110e85523f4af553
-  data.tar.gz: 653677e018c186b840985382f29a1735595d3a0a4a193b4c7472edae0065decac190663a794a917d323b9d24701a0d9f9035927ffa43ff26e8f7da8babd07ead
+  metadata.gz: 9488c08a71f94b535a4723fce444cb5a4bbf804c34c3e9593e10849925476e7294a47db30420669fbe87aa38bc2e8bfb249f0b7312e67c6c9057678eea82eea8
+  data.tar.gz: 3bdf50dc809f1515e64bc73a46d622cb540342ef8da2e587ff9627f9018eee75565b5402c692eb23ad97030f07c7e47249535b961de2e0f3173e85627a003f8a

data/CHANGELOG.md

@@ -6,13 +6,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.2.0] - 2020-04-14
-### Breaking change
- - rename #have_table_col to #have_table_cell
- - change options of #have_table_cell
- - change options of #have_table_row
+## [0.2.1] - 2020-04-14
+### Fixed
+ - `table_selector`, `within_table_for` incorrect resource name
+
+### Changed
+ - `table_selector` receives 2 arguments
+ - `within_table_for` receives 2 arguments
+ - `current_table_name` renamed to `current_table_model_name`
+ - `table_row_selector` can receive modal class as model name
+ 
+# Added
+ - `have_table` matcher
+ - add tests for table with namespaced resource class and multi-word resource name
 
-### Change
+## [0.2.0] - 2020-04-14
+### Changed
+ - rename `have_table_col` to `have_table_cell`
+ - change options of `have_table_cell`
+ - change options of `have_table_row`
  - refactor modules hierarchy: split DSL into selectors, finders, matchers and actions
 
 ### Added

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

@@ -4,21 +4,23 @@ module Capybara
   module ActiveAdmin
     module Finders
       module Table
-        def current_table_name
-          @__current_table_name
+        def current_table_model_name
+          @__current_table_model_name
         end
 
-        def within_table_for(name)
-          name = name.model_name.plural if name.is_a?(Class)
-          selector = table_selector(name)
+        # @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.
+        def within_table_for(model_name, resource_name = nil)
+          selector = table_selector(resource_name)
 
           within(selector) do
-            old = @__current_table_name
-            @__current_table_name = name
+            old = @__current_table_model_name
+            @__current_table_model_name = model_name
             begin
               yield
             ensure
-              @__current_table_name = old
+              @__current_table_model_name = old
             end
           end
         end
@@ -33,12 +35,12 @@ module Capybara
           raise ArgumentError, 'must provide :id or :index' if id.nil? && index.nil?
 
           if id
-            model = @__current_table_name
-            selector = table_row_selector(model, id)
+            selector = table_row_selector(current_table_model_name, id)
             return find(selector)
           end
 
-          find_all(table_row_selector(nil, nil), minimum: index + 1)[index]
+          selector = table_row_selector(nil, nil)
+          find_all(selector, minimum: index + 1)[index]
         end
 
         def within_table_cell(name)

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

@@ -4,6 +4,19 @@ module Capybara
   module ActiveAdmin
     module Matchers
       module Table
+        # @param options [Hash]
+        #   :resource_name [String, nil] active admin page resource name
+        #   for other options @see Capybara::RSpecMatchers#have_selector
+        # @example
+        #   expect(page).to have_table
+        #   expect(page).to have_table(resource_name: 'users')
+        #
+        def have_table(options = {})
+          resource_name = options.delete(:resource_name)
+          selector = table_selector(resource_name)
+          have_selector(selector, options)
+        end
+
         # @param options [Hash]
         #   :text [String, nil] cell content
         #   :id [String, Number, nil] record ID
@@ -15,7 +28,7 @@ module Capybara
         #
         def have_table_row(options = {})
           row_id = options.delete(:id)
-          selector = table_row_selector(current_table_name, row_id)
+          selector = table_row_selector(current_table_model_name, row_id)
           have_selector(selector, options)
         end
 

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

@@ -4,16 +4,19 @@ module Capybara
   module ActiveAdmin
     module Selectors
       module Table
-        def table_selector(model)
-          return 'table.index_table' if model.nil?
+        def table_selector(resource_name)
+          return 'table.index_table' if resource_name.nil?
 
-          "table.index_table#index_table_#{model.to_s.pluralize}"
+          resource_name = resource_name.to_s.gsub(' ', '_').pluralize.downcase
+          "table#index_table_#{resource_name}"
         end
 
-        def table_row_selector(model, record_id)
+        def table_row_selector(model_name, record_id)
           return 'tbody > tr' if record_id.nil?
 
-          "tbody > tr##{model.to_s.singularize}_#{record_id}"
+          model_name = model_name.model_name.singular if model_name.is_a?(Class)
+          model_name = model_name.to_s.gsub(' ', '_').singularize.downcase
+          "tbody > tr##{model_name}_#{record_id}"
         end
 
         def table_header_selector
@@ -21,9 +24,9 @@ module Capybara
         end
 
         def table_cell_selector(column)
-          column = column.to_s.gsub(' ', '_').downcase unless column.nil?
           return 'td.col' if column.nil?
 
+          column = column.to_s.gsub(' ', '_').downcase
           "td.col.col-#{column}"
         end
       end

data/lib/capybara/active_admin/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara_active_admin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Denis Talakevich