haya_select_helpers 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbaaa5e08a996a87dec3749a5a97c9739c82d1716a4d27c23687dfb75b96e7fb
-  data.tar.gz: 03af520fb89abed66159cb794dd3fd67df9bc7c80e80e8d0083a87aaee5811cb
+  metadata.gz: 94027197c1829e876fbe519781f094cfcb7db0db47d8eba3c4f851adf1f66017
+  data.tar.gz: 211c7411bd07813f3ca1d0cac83f5c3ed1e42c367ec6e1560223b36153ebd783
 SHA512:
-  metadata.gz: d95b215ea2ccf03ec06d15aca0465cbd252b3ef90367048dcec5026930923bfd3a18c8fca617ba238c7e362dd69b9954ac8bd4489b303c9e4cfac09919ded09d
-  data.tar.gz: 6d71dc0c7031495a27021530c9e35743592b7db7fbfb5c763f2cbeebc4bbccfd08e50e1761bb92ce450543e01b470484153c215848fe80f2102bb88c97238811
+  metadata.gz: 38030c78ac06ea02e773157fefe7f379b780bd20bc471f7fc425a956d8f0a2a8fd8ee981c2637b3824e05979db3279d3f146a47747cefbf36c6b3f9243415268
+  data.tar.gz: aa42a5467142a1cd4f893ce1d5f3498240f8082c576fb045e928fc00e9734cd3528894bf4d8734e349416682fc62088867c944a76b5b8eadce1ab371ee116b6e

data/lib/haya_select.rb

@@ -78,8 +78,8 @@ class HayaSelect
   def select(label = nil, value: nil)
     open
     select_option(label:, value:)
-    wait_for_selector not_opened_current_selected_selector
-    wait_for_no_selector options_selector
+    wait_for_selected_value_or_label(label, value)
+    close_if_open
     self
   end
 
@@ -161,16 +161,100 @@ private
   end
 
   def wait_for_option(selector, label)
+    return wait_for_browser { scope.page.has_selector?(selector) } unless label
+
+    option_found = false
+
+    search_terms_for(label).each do |search_term|
+      current_options_text = options_container_text
+      search_for_option(search_term)
+
+      wait_for_browser do
+        scope.page.has_selector?(selector) || options_container_updated?(search_term, current_options_text)
+      end
+
+      if scope.page.has_selector?(selector)
+        option_found = true
+        break
+      end
+    end
+
+    return if option_found
+
     wait_for_browser do
       scope.page.has_selector?(selector)
     end
-  rescue WaitUtil::TimeoutError
-    raise unless label
+  end
+
+  def wait_for_selected_value_or_label(label, value)
+    if value
+      wait_for_value(value)
+    elsif label
+      wait_for_label(label)
+    end
+  end
+
+  def search_for_option(label)
+    return unless scope.page.has_selector?(search_input_selector)
 
     search(label)
-    wait_for_browser do
-      scope.page.has_selector?(selector)
+  end
+
+  def options_container_updated?(search_term, previous_text)
+    return false unless scope.page.has_selector?(no_options_selector)
+    return false unless search_input_value == search_term
+    return false if previous_text.nil?
+
+    options_container_text != previous_text
+  end
+
+  def options_container_text
+    scope.page.find(options_selector).text
+  rescue Capybara::ElementNotFound
+    nil
+  end
+
+  def search_input_value
+    scope.page.find(search_input_selector).value
+  rescue Capybara::ElementNotFound
+    nil
+  end
+
+  def search_terms_for(label)
+    terms = [label]
+    terms << label.split(" (", 2).first if label.include?(" (")
+    terms.uniq
+  end
+
+  def close_if_open
+    return if scope.page.has_no_selector?(options_selector)
+
+    close_attempts = 0
+
+    while scope.page.has_selector?(options_selector) && close_attempts < 3
+      if scope.page.has_selector?(select_container_selector)
+        wait_for_and_find(select_container_selector).click
+      else
+        wait_for_and_find("body").click
+      end
+
+      close_attempts += 1
     end
+
+    wait_for_no_selector options_selector
+    wait_for_selector not_opened_current_selected_selector
+  end
+
+  def search_input_selector
+    "#{base_selector} [data-class='search-text-input']"
+  end
+
+  def no_options_selector
+    "#{options_selector} [data-class='no-options-container']"
+  end
+
+  def select_container_selector
+    "#{base_selector} [data-class='select-container']"
   end
 
   # rubocop:enable Metrics/ClassLength, Style/Documentation

data/lib/haya_select_helpers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HayaSelectHelpers
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

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