haya_select_helpers 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3a49ed55099b6d8c40a7cc79dd858ec70a5b62c52256f8651194eafff7ef777
-  data.tar.gz: a32bfb12dc808215d3bbdcd09ee998ce9b84bdc13a1b351a15b2d73e9d4f837c
+  metadata.gz: 1859828251316a80407d354d1c30f56f865ea46c1358ca638c1f6da563164613
+  data.tar.gz: 2aa84183163ef3a14b9ea5ef6963a6ad157c19585f4a795be4cb342885e4a7de
 SHA512:
-  metadata.gz: 3265b3febd190d12e916542f458cc536405b17a4375ddae0df083126caaf1077b4777db974be50a66181868d86541ed89b2409ab884c6677610972d47ca28c46
-  data.tar.gz: 5e05c8c17dbb2840368de065731e6a164c2693c55d2daf1d92a0acd82147473ba974c3cd255f252f8f721087ac8fe0ef232d6e0748ff1e5b31bf55f6b90f6b59
+  metadata.gz: 95227a959dff150c9555ef3b295b9f6c0af6cc8bd82edf6f289cfeec22a8942c6239b24aa0b758be7c7a48c9be8484076f069cbb608bf3b8ec52da56026e4a30
+  data.tar.gz: 58ddc7034b2a459763d1d2483cdcf4db878e8b25faf3af3a46cfa7ae33a3fb85338be1f7d5fe7abf4aef89654c00c24e71375d68d4d9d3d5a1e40e5b4d9a2da2

data/lib/haya_select.rb

@@ -93,17 +93,14 @@ class HayaSelect
     attempts = 0
 
     begin
+      log_select_start(label, value, allow_if_selected, attempts)
       guard_already_selected(label, value, allow_if_selected) if attempts.zero?
 
-      previous_value = value
-      open
-      selected_value = select_option_value(label:, value:)
-      selected_value = "" if selected_value.nil? && value.nil?
-      allow_blank = previous_value == selected_value
-      close_if_open
-      wait_for_selected_value_or_label(label, value || selected_value, allow_blank:)
+      selected_value, allow_blank = select_value_and_close(label:, value:)
+      wait_for_selected_after_select(label, value, selected_value, allow_blank)
       self
     rescue WaitUtil::TimeoutError, Selenium::WebDriver::Error::StaleElementReferenceError
+      log_select_retry(attempts)
       attempts += 1
       retry if attempts < 3
       raise
@@ -180,8 +177,17 @@ class HayaSelect
     raise "No 'label' or 'value' given" if label.nil? && value.nil?
 
     selector = select_option_selector(label: label, value: value)
+    Rails.logger.debug do
+      "[haya_select] select_option_value selector=#{base_selector} option_selector=#{selector} label=#{label.inspect} value=#{value.inspect}"
+    end
     wait_for_option(selector)
     option = find_option_element(selector, label)
+    Rails.logger.debug do
+      "[haya_select] option_element selector=#{base_selector} " \
+        "data-value=#{option['data-value'].inspect} " \
+        "data-disabled=#{option['data-disabled'].inspect} " \
+        "data-selected=#{option['data-selected'].inspect}"
+    end
 
     raise "The '#{label}'-option is disabled" if option['data-disabled'] == 'true'
 
@@ -286,21 +292,18 @@ private
   end
 
   def wait_for_selected_value_or_label(label, value, allow_blank: false)
+    log_wait_for_selected_start(label, value, allow_blank)
+    value_input_selector = "#{base_selector} [data-class='current-selected'] input[type='hidden']"
+    log_wait_for_selected_initial_state(value_input_selector)
     wait_for_expect do
-      value_input_selector = "#{base_selector} [data-class='current-selected'] input[type='hidden']"
-      has_value_input = scope.page.has_selector?(value_input_selector, visible: false)
-      label_matches = label && label_matches?(label)
-      value_matches = value && scope.page.has_selector?(current_value_selector(value), visible: false)
-      blank_matches = allow_blank && scope.page.has_selector?(current_value_selector(""), visible: false)
-
-      matches =
-        if has_value_input
-          value_matches || blank_matches
-        else
-          label_matches || value_matches || blank_matches
-        end
-
-      expect(matches).to eq true
+      expect(
+        selected_value_or_label_matches?(
+          label:,
+          value:,
+          allow_blank:,
+          value_input_selector:
+        )
+      ).to eq true
     end
   end
 
@@ -539,6 +542,11 @@ private
   end
 
   def perform_option_selection(option, label, option_value)
+    Rails.logger.debug do
+      "[haya_select] perform_option_selection selector=#{base_selector} " \
+        "label=#{label.inspect} option_value=#{option_value.inspect} " \
+        "data-selected=#{option['data-selected'].inspect}"
+    end
     click_option_element(option)
     wait_for_selected_value_or_label(label, option_value)
   end
@@ -547,5 +555,82 @@ private
     "#{options_selector} [data-class='select-option']"
   end
 
+  def log_select_start(label, value, allow_if_selected, attempts)
+    Rails.logger.debug do
+      "[haya_select] select start selector=#{base_selector} " \
+        "label=#{label.inspect} value=#{value.inspect} " \
+        "allow_if_selected=#{allow_if_selected} attempts=#{attempts}"
+    end
+  end
+
+  def select_value_and_close(label:, value:)
+    previous_value = value
+    Rails.logger.debug { "[haya_select] open selector=#{base_selector}" }
+    open
+    Rails.logger.debug { "[haya_select] select_option_value selector=#{base_selector}" }
+    selected_value = select_option_value(label:, value:)
+    Rails.logger.debug do
+      "[haya_select] select_option_value selector=#{base_selector} selected_value=#{selected_value.inspect}"
+    end
+    selected_value = "" if selected_value.nil? && value.nil?
+    allow_blank = previous_value == selected_value
+    Rails.logger.debug { "[haya_select] close_if_open selector=#{base_selector}" }
+    close_if_open
+    [selected_value, allow_blank]
+  end
+
+  def wait_for_selected_after_select(label, value, selected_value, allow_blank)
+    expected_value = value || selected_value
+    Rails.logger.debug do
+      "[haya_select] wait_for_selected_value_or_label " \
+        "selector=#{base_selector} label=#{label.inspect} " \
+        "value=#{expected_value.inspect} allow_blank=#{allow_blank}"
+    end
+    wait_for_selected_value_or_label(label, expected_value, allow_blank:)
+  end
+
+  def log_select_retry(attempts)
+    Rails.logger.debug { "[haya_select] select retry selector=#{base_selector} attempts=#{attempts}" }
+  end
+
+  def log_wait_for_selected_start(label, value, allow_blank)
+    Rails.logger.debug do
+      "[haya_select] wait_for_selected_value_or_label start selector=#{base_selector} " \
+        "label=#{label.inspect} value=#{value.inspect} allow_blank=#{allow_blank}"
+    end
+  end
+
+  def log_wait_for_selected_initial_state(value_input_selector)
+    has_value_input_initial = scope.page.has_selector?(value_input_selector, visible: false, wait: 0)
+    current_value_initial = scope.page.first(value_input_selector, visible: false, wait: 0)&.[](:value)
+    current_option = scope.page.first(
+      "#{base_selector} [data-class='current-selected'] [data-class='current-option']",
+      minimum: 0,
+      wait: 0
+    )
+    current_label_initial =
+      if current_option
+        option_text = current_option.first("[data-testid='option-presentation-text']", minimum: 0)
+        option_text ? option_text.text : current_option.text
+      end
+
+    Rails.logger.debug do
+      "[haya_select] wait_for_selected_value_or_label initial " \
+        "selector=#{base_selector} has_value_input=#{has_value_input_initial} " \
+        "current_value=#{current_value_initial.inspect} " \
+        "current_label=#{current_label_initial.inspect}"
+    end
+  end
+
+  def selected_value_or_label_matches?(label:, value:, allow_blank:, value_input_selector:)
+    has_value_input = scope.page.has_selector?(value_input_selector, visible: false)
+    value_matches = value && scope.page.has_selector?(current_value_selector(value), visible: false)
+    blank_matches = allow_blank && scope.page.has_selector?(current_value_selector(""), visible: false)
+    return value_matches || blank_matches if has_value_input
+
+    label_matches = label && label_matches?(label)
+    label_matches || value_matches || blank_matches
+  end
+
   # rubocop:enable Metrics/ClassLength, Style/Documentation
 end

data/lib/haya_select_helpers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HayaSelectHelpers
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haya_select_helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - kaspernj