haya_select_helpers 0.0.5 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf6acdffd9a4d2e98a8745622eb27cb59fad687a26314dfd08527df0de461af2
-  data.tar.gz: 4f29d9bb7ac705fa10ab7a6f101c3b056037cc0c1e2fe98ec0b89d850d87180e
+  metadata.gz: dbaaa5e08a996a87dec3749a5a97c9739c82d1716a4d27c23687dfb75b96e7fb
+  data.tar.gz: 03af520fb89abed66159cb794dd3fd67df9bc7c80e80e8d0083a87aaee5811cb
 SHA512:
-  metadata.gz: a3ca2d3a43fa0657ed05729f478af7389509c1169e9cbdf062bec578ee0da78a69cf0287f748b55b4e6fe1633d2d640a424459bc54b6bf8c2d7d4000835f3c33
-  data.tar.gz: d27f8fe5d9b66fcd54539b069caceee820b58760e93b044a8605cfe8013c3f1bb370b980a7128a316ab764fbf574f18022b2f64c5888747afddfad9ddd25138f
+  metadata.gz: d95b215ea2ccf03ec06d15aca0465cbd252b3ef90367048dcec5026930923bfd3a18c8fca617ba238c7e362dd69b9954ac8bd4489b303c9e4cfac09919ded09d
+  data.tar.gz: 6d71dc0c7031495a27021530c9e35743592b7db7fbfb5c763f2cbeebc4bbccfd08e50e1761bb92ce450543e01b470484153c215848fe80f2102bb88c97238811

data/lib/haya_select.rb

@@ -1,24 +1,40 @@
-class HayaSelect
-  attr_reader :base_selector, :not_opened_current_selected_selector, :opened_current_selected_selector, :options_selector, :scope
+# frozen_string_literal: true
 
-  delegate :all, :expect, :eq, :pretty_html, :wait_for_and_find, :wait_for_expect, :wait_for_no_selector, :wait_for_selector, to: :scope
+# rubocop:disable Metrics/ClassLength, Style/Documentation
+class HayaSelect
+  attr_reader :base_selector,
+    :not_opened_current_selected_selector,
+    :opened_current_selected_selector,
+    :options_selector,
+    :scope
+
+  delegate :all,
+    :expect,
+    :eq,
+    :pretty_html,
+    :wait_for_and_find,
+    :wait_for_browser,
+    :wait_for_expect,
+    :wait_for_no_selector,
+    :wait_for_selector,
+    to: :scope
 
   def initialize(id:, scope:)
-    @base_selector = ".haya-select[data-id='#{id}']"
-    @not_opened_current_selected_selector = "#{base_selector}[data-opened='false'] .haya-select-current-selected"
-    @opened_current_selected_selector = "#{base_selector}[data-opened='true'] .haya-select-current-selected"
-    @options_selector = ".haya-select-options-container[data-id='#{id}']"
+    @base_selector = "[data-component='haya-select'][data-id='#{id}']"
+    @not_opened_current_selected_selector = "#{base_selector}[data-opened='false'] [data-class='current-selected']"
+    @opened_current_selected_selector = "#{base_selector}[data-opened='true'] [data-class='current-selected']"
+    @options_selector = "[data-class='options-container'][data-id='#{id}']"
     @scope = scope
   end
 
   def label
-    wait_for_and_find("#{base_selector} .haya-select-current-selected .current-option").text
+    wait_for_and_find("#{base_selector} [data-class='current-selected'] [data-class='current-option']").text
   rescue Selenium::WebDriver::Error::StaleElementReferenceError
     retry
   end
 
   def open
-    wait_for_and_find("#{base_selector}[data-opened='false'] .haya-select-current-selected").click
+    wait_for_and_find("#{base_selector}[data-opened='false'] [data-class='current-selected']").click
     wait_for_selector opened_current_selected_selector
     wait_for_selector options_selector
     self
@@ -26,13 +42,19 @@ class HayaSelect
     retry
   end
 
+  def close
+    wait_for_selector opened_current_selected_selector
+    wait_for_and_find("[data-class='search-text-input']").click
+    wait_for_no_selector opened_current_selected_selector
+  end
+
   def options
-    wait_for_selector "#{options_selector} .haya-select-option"
-    option_elements = all("#{options_selector} .haya-select-option")
+    wait_for_selector "#{options_selector} [data-class='select-option']"
+    option_elements = all("#{options_selector} [data-class='select-option']")
     option_elements.map do |option_element|
       {
         label: option_element.text,
-        value: option_element["data-value"]
+        value: option_element['data-value']
       }
     end
   rescue Selenium::WebDriver::Error::StaleElementReferenceError
@@ -43,26 +65,32 @@ class HayaSelect
     wait_for_expect do
       expect(options).to eq expected_options
     end
+    self
   end
 
   def search(value)
-    wait_for_and_find("#{base_selector} .haya-select-search-text-input").set(value)
+    wait_for_and_find("#{base_selector} [data-class='search-text-input']").set(value)
+    self
   rescue Selenium::WebDriver::Error::StaleElementReferenceError
     retry
   end
 
-  def select(label)
+  def select(label = nil, value: nil)
     open
-    select_option(label: label)
+    select_option(label:, value:)
     wait_for_selector not_opened_current_selected_selector
     wait_for_no_selector options_selector
     self
   end
 
-  def select_option(label:)
-    option = wait_for_and_find("#{options_selector} .haya-select-option", exact_text: label)
+  def select_option(label: nil, value: nil)
+    raise "No 'label' or 'value' given" if label.nil? && value.nil?
 
-    raise "The '#{label}'-option is disabled" if option["data-disabled"] == "true"
+    selector = select_option_selector(label: label, value: value)
+    wait_for_option(selector, label)
+    option = wait_for_and_find(selector)
+
+    raise "The '#{label}'-option is disabled" if option['data-disabled'] == 'true'
 
     option.click
     self
@@ -71,36 +99,79 @@ class HayaSelect
   end
 
   def value
-    wait_for_and_find("#{base_selector} .haya-select-current-selected input[type='hidden']", visible: false)[:value]
+    wait_for_and_find("#{base_selector} [data-class='current-selected'] input[type='hidden']", visible: false)[:value]
   rescue Selenium::WebDriver::Error::StaleElementReferenceError
     retry
   end
 
   def wait_for_label(expected_label)
-    wait_for_selector "#{base_selector} .haya-select-current-selected .current-option", exact_text: expected_label
+    wait_for_selector(
+      "#{base_selector} [data-class='current-selected'] [data-class='current-option']",
+      exact_text: expected_label
+    )
     self
   end
 
   def toggles
-    all("#{base_selector} .haya-select-option-presentation").map do |element|
+    all("#{base_selector} [data-testid='option-presentation']").map do |element|
       {
-        toggle_icon: element["data-toggle-icon"],
-        toggle_value: element["data-toggle-value"],
-        value: element["data-value"]
+        toggle_icon: element['data-toggle-icon'],
+        toggle_value: element['data-toggle-value'],
+        value: element['data-value']
       }
     end
   rescue Selenium::WebDriver::Error::StaleElementReferenceError
     retry
   end
 
+  def selected_option_values
+    all("[data-class='select-option'][data-selected='true']").map do |select_option_element|
+      select_option_element['data-value']
+    end
+  end
+
+  def wait_for_selected_option_values(values)
+    wait_for_expect do
+      expect(selected_option_values).to eq values
+    end
+  end
+
   def wait_for_toggles(expected_toggles)
     wait_for_expect do
       expect(toggles).to eq expected_toggles
     end
+    self
   end
 
   def wait_for_value(expected_value)
-    wait_for_selector "#{base_selector} .haya-select-current-selected input[type='hidden'][value='#{expected_value}']", visible: false
+    wait_for_selector(
+      "#{base_selector} [data-class='current-selected'] input[type='hidden'][value='#{expected_value}']",
+      visible: false
+    )
     self
   end
+
+private
+
+  def select_option_selector(label:, value:)
+    selector = "#{options_selector} [data-testid='option-presentation']"
+    selector << "[data-text='#{label}']" unless label.nil?
+    selector << "[data-value='#{value}']" unless value.nil?
+    selector
+  end
+
+  def wait_for_option(selector, label)
+    wait_for_browser do
+      scope.page.has_selector?(selector)
+    end
+  rescue WaitUtil::TimeoutError
+    raise unless label
+
+    search(label)
+    wait_for_browser do
+      scope.page.has_selector?(selector)
+    end
+  end
+
+  # rubocop:enable Metrics/ClassLength, Style/Documentation
 end

data/lib/haya_select_helpers/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haya_select_helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.8
 platform: ruby
 authors:
 - kaspernj
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-15 00:00:00.000000000 Z
+date: 2026-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -26,7 +26,7 @@ dependencies:
         version: 7.0.3
 description: RSpec helpers for HayaSelect.
 email:
-- k@spernj.org
+- kasper@diestoeckels.de
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: RSpec helpers for HayaSelect.