eac_active_scaffold 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97c012d3f0f8e7e4471a86abdffc2909783da3973fb4289870b672480b618c28
-  data.tar.gz: 3801ffdf4e9b3c608d077b151ce25fad53aa787e67a948314a42bc8f998b5dbd
+  metadata.gz: 9d69265751bd71af4268328c69b1b30d69cffa89a179c90e6041c78ccf152511
+  data.tar.gz: 2c4bed407eb53bf70d8ed1598fd66a9c5b26e6cf0c997ac44406c7b20bbc46ce
 SHA512:
-  metadata.gz: df68a482be337f5db59d0bfd34826364600d0a8439a9c9ea5b4e646cf64d857f74b16d6cf4111028a0327c16bd3a9cce1715ab0764aeb87aa3737fab47f26629
-  data.tar.gz: b2d33e2698cb46fc587587569e1bb831f0f0320a7d2e65a0ab8a5864e7ebd373bc682e503c187bf8d0fdb4ac86dabd4a1743b9b7ac0fa5bd769a0af45d355ba2
+  metadata.gz: 0a0b3e704a4e8f067df54f5c7da30e6b16c009b2529fc43f90d57fa75a4e2b6d85722ef262b7007b03638b839acac8793f257f727af65451a142fa64ebb66fc0
+  data.tar.gz: 42f925360f83aa6840825c8c9837acda5180985688080c85d3a3d69afe24d336a9619f8a697c0492c12c7e3a78670a391b3c0892157e6f6557ab0c0d864f2a8f

data/lib/eac_active_scaffold/rspec/controller_director/attribute_set.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacActiveScaffold
+  module Rspec
+    class ControllerDirector
+      class AttributeSet
+        enable_method_class
+        common_constructor :director, :example, :name, :value
+
+        def result
+          text_fill
+        rescue ::Capybara::ElementNotFound
+          select_option
+        end
+
+        private
+
+        # @return [Capybara::Node::Element]
+        def field
+          example.find_field(label)
+        end
+
+        def label
+          director.attribute_label(name)
+        end
+
+        def select_option
+          example.within field do
+            example.find("option[value='#{value}']").select_option
+          end
+        end
+
+        def text_fill
+          field.fill_in with: value
+        end
+      end
+    end
+  end
+end

data/lib/eac_active_scaffold/rspec/controller_director.rb

@@ -17,6 +17,13 @@ module EacActiveScaffold
         model_class.human_attribute_name(attr)
       end
 
+      # @param example [RSpec::Core::ExampleGroup]
+      # @param attrs [Hash]
+      # @return [void]
+      def attributes_set(example, attrs)
+        attrs.each { |attr, value| attribute_set(example, attr, value) }
+      end
+
       # @return [Class]
       def controller_class
         options[:controller_class] || example.described_class
@@ -51,6 +58,8 @@ module EacActiveScaffold
       def valid_update_data
         options[OPTION_VALID_UPDATE_DATA] || valid_data
       end
+
+      require_sub __FILE__, require_mode: :kernel
     end
   end
 end

data/lib/eac_active_scaffold/rspec/shared_contexts/active_scaffold_controller.rb

@@ -24,9 +24,7 @@ require 'eac_active_scaffold/rspec/controller_director'
     before do
       before_create_count
       click_on ::I18n.t('active_scaffold.create_new')
-      director.valid_create_data.each do |key, value|
-        fill_in director.attribute_label(key), with: value
-      end
+      director.attributes_set(self, director.valid_create_data)
       click_on ::I18n.t('active_scaffold.create')
     end
 
@@ -52,9 +50,7 @@ require 'eac_active_scaffold/rspec/controller_director'
       before do
         before_update_count
         click_link(*edit_link_args)
-        director.valid_update_data.each do |key, value|
-          fill_in director.attribute_label(key), with: value
-        end
+        director.attributes_set(self, director.valid_update_data)
         click_on ::I18n.t('active_scaffold.update')
       end
 

data/lib/eac_active_scaffold/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacActiveScaffold
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_active_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-10 00:00:00.000000000 Z
+date: 2023-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -84,6 +84,7 @@ files:
 - lib/eac_active_scaffold/patches/action_dispatch.rb
 - lib/eac_active_scaffold/rspec.rb
 - lib/eac_active_scaffold/rspec/controller_director.rb
+- lib/eac_active_scaffold/rspec/controller_director/attribute_set.rb
 - lib/eac_active_scaffold/rspec/setup.rb
 - lib/eac_active_scaffold/rspec/shared_contexts/active_scaffold_controller.rb
 - lib/eac_active_scaffold/version.rb