mohawk 0.4.4 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 977d67f2b885a30a80935fc780b2ad270152316f
-  data.tar.gz: 26c633a926431502387da373dd7bf9853be8f345
+SHA256:
+  metadata.gz: 0f4d2928187d326a0466a236d0f7ef8fd9e87540eae09307991f979b1f629bca
+  data.tar.gz: 49c6314e0a4d35df36c6269477fe757c6ea78af19aad43e2c2a3a84f81102142
 SHA512:
-  metadata.gz: 8f5e9185a0182a852b805ee2ca877f9ba05e1b10ff2e768f562d1457e3f789ac875b2f0603327daaf662cea545aa8f393c1a5d502415cdee93c85b07a7b1fc18
-  data.tar.gz: c164788e51c847dbf007510383766ee37b91cc5ab18ef94c4f8c15ddd1fd5b7db5d132d0c0daf2203a555700dd8e7f739cf7fddb52d9ba1df5d3ce34baea789e
+  metadata.gz: 1b549539d638f68b7259415772e87a49e86b714bb7e62d90e4774994b00a13519af5517235e62f29f4eb02dde37ae83f09ce19ff92c56e2bdf1a62dfb0036bf4
+  data.tar.gz: 1c9f4b2d339b75f188fdb8192d20ec2c1c5086a6f06ebd4bec4de758a7d7c6e835ce45bff6fca8e5b1113f5d6e90f09233458f373cc9b568d7d5ef292474dc26

data/features/step_definitions/table_steps.rb

@@ -4,8 +4,8 @@ When /^we are observing the people table$/ do
 end
 
 Then /^the table row information should look like the following:$/ do |row_items|
-  row_items.map_column!("row") { |r| r.to_i }
-  row_items.map_headers!("text" => :text, "row" => :row)
+  row_items = row_items.map_column("row") { |r| r.to_i }
+  row_items = row_items.map_headers("text" => :text, "row" => :row)
   on(DataEntryForm).people.map(&:to_hash).should eq row_items.hashes
 end
 

data/features/support/WindowsForms.exe.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
+  </startup>
+</configuration>

data/lib/mohawk/accessors.rb

@@ -52,7 +52,7 @@ module Mohawk
     #   text(:first_name, :id => 'textFieldId')
     #   # will generate 'first_name', 'first_name=' and 'clear_first_name' methods
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [String]  name used for the generated methods
     # @param  [Hash]  locator for how the text is found
     #
     def text(name, locator)
@@ -81,7 +81,7 @@ module Mohawk
     #   button(:close, :value => '&Close')
     #   # will generate 'close' and 'close_value' methods
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [String]  name used for the generated methods
     # @param  [Hash]  locator for how the button is found
     #
     def button(name, locator)
@@ -102,37 +102,70 @@ module Mohawk
     #
     # @example
     #   combo_box(:status, :id => 'statusComboBox')
-    #   # will generate 'status', 'status_selections', 'status=', 'select_status','clear_status' and 'status_options' methods
+    #   # will generate 'status', 'status=', 'select_status', and 'status_options' methods
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [String]  name used for the generated methods
     # @param  [Hash]  locator for how the combo box is found
     #
     # === Aliases
     # * combobox
     # * dropdown / drop_down
-    # * select_list
+
     #
     def combo_box(name, locator)
       define_method("#{name}") do
         adapter.combo(locator).value
       end
+
+      define_method("#{name}=") do |item|
+        adapter.combo(locator).with(:combo_box).set item
+      end
+      alias_method "select_#{name}", "#{name}="
+
+      define_method("#{name}_options") do
+        adapter.combo(locator).options
+      end
+      define_method("#{name}_view") do
+        adapter.combo(locator).view
+      end
+    end
+
+    #
+    # Generates methods to get the value of a list box, set the selected
+    # item by both index and value as well as to see the available options
+    #
+    # @example
+    #   select_list(:status, :id => 'statusListBox')
+    #   # will generate 'status', 'status_selections', 'status=', 'select_status','clear_status' and 'status_options' methods
+    #
+    # @param  [String]  name used for the generated methods
+    # @param  [Hash]  locator for how the list box is found
+    #
+    # === Aliases
+    # * selectlist
+    # * list_box
+    #
+    def select_list(name, locator)
+      define_method("#{name}") do
+        adapter.select_list(locator).value
+      end
       define_method("clear_#{name}") do |item|
-        adapter.combo(locator).clear item
+        adapter.select_list(locator).clear item
       end
       define_method("#{name}_selections") do
-        adapter.combo(locator).values
+        adapter.select_list(locator).values
       end
 
       define_method("#{name}=") do |item|
-        adapter.combo(locator).set item
+        adapter.select_list(locator).set item
       end
       alias_method "select_#{name}", "#{name}="
 
       define_method("#{name}_options") do
-        adapter.combo(locator).options
+        adapter.select_list(locator).options
       end
       define_method("#{name}_view") do
-        adapter.combo(locator).view
+        adapter.select_list(locator).view
       end
     end
 
@@ -144,7 +177,7 @@ module Mohawk
     #   checkbox(:include, :id => 'checkBoxId')
     #   # will generate 'include', 'include=' and 'include_value' methods
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [String]  name used for the generated methods
     # @param  [Hash]  locator for how the checkbox is found
     #
     def checkbox(name, locator)
@@ -170,7 +203,7 @@ module Mohawk
     #   radio(:morning, :id => 'morningRadio')
     #   # will generate 'morning' and 'morning?' methods
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [String]  name used for the generated methods
     # @param  [Hash]  locator for how the radio is found
     #
     def radio(name, locator)
@@ -192,7 +225,7 @@ module Mohawk
     #   label(:login_info, :id => 'loginInfoLabel')
     #   # will generate a 'login_info' method
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [String]  name used for the generated methods
     # @param  [Hash]  locator for how the label is found
     #
     def label(name, locator)
@@ -211,7 +244,7 @@ module Mohawk
     #   link(:send_info_link, :id => 'sendInfoId')
     #   # will generate 'send_info_link_text' and 'click_send_info_link' methods
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [String]  name used for the generated methods
     # @param  [Hash]  locator for how the label is found
     #
     def link(name, locator)
@@ -232,16 +265,14 @@ module Mohawk
     #   menu_item(:some_menu_item, :path => ["Path", "To", "A", "Menu Item"])
     #   # will generate a 'some_menu_item' method to select a menu item
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [String]  name used for the generated methods
     # @param  [Hash]  locator for how the label is found
     #
     def menu_item(name, locator)
-      define_method("#{name}") do
-        adapter.menu_item(locator).select
-      end
       define_method("click_#{name}") do
         adapter.menu_item(locator).click
       end
+      alias_method "#{name}", "click_#{name}"
     end
 
     # Generates methods for working with table or list view controls
@@ -252,7 +283,7 @@ module Mohawk
     #   # find_some_table and 'some_table_view' methods to get an Enumerable of table rows,
     #   # select a table item, clear a table item, return all of the headers and get the raw view
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [String]  name used for the generated methods
     # @param  [Hash]  locator for how the label is found
     #
     # === Aliases
@@ -294,7 +325,7 @@ module Mohawk
     #   # methods to get the tree value, set the tree value (index or string), get all of the
     #   # items, expand an item (index or string) and collapse an item (index or string)
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [String]  name used for the generated methods
     # @param  [Hash]  locator for how the label is found
     #
     # === Aliases
@@ -329,7 +360,7 @@ module Mohawk
     #   # will generate 'age', 'age=' methods to get the spinner value and
     #   # set the spinner value.
     #
-    # @param  [String] the name used for the generated methods
+    # @param  [String] name used for the generated methods
     # @param  [Hash] locator for how the spinner control is found
     #
     def spinner(name, locator)
@@ -358,7 +389,7 @@ module Mohawk
     #   # set the currently selected tab (Fixnum, String or RegEx) and to get the
     #   # available tabs to be selected
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [String]  name used for the generated methods
     # @param  [Hash]  locator for how the tab control is found
     #
     def tabs(name, locator)
@@ -395,7 +426,10 @@ module Mohawk
     alias_method :combobox, :combo_box
     alias_method :dropdown, :combo_box
     alias_method :drop_down, :combo_box
-    alias_method :select_list, :combo_box
+
+    # select_list aliases
+    alias_method :selectlist, :select_list
+    alias_method :list_box, :select_list
 
     # table aliases
     alias_method :listview, :table

data/lib/mohawk/adapters/uia/combo_box.rb

@@ -0,0 +1,58 @@
+require_relative 'value_control'
+require_relative 'element_locator'
+
+module Mohawk
+  module Adapters
+    module UIA
+      class ComboBoxControl < ValueControl
+        include ElementLocator
+
+        alias_method :ctrl_element, :element
+
+        def value
+          if supports_selection?
+            selection_pattern.selected_items.map(&:name).first || ''
+          else
+            value_pattern.value
+          end
+        end
+
+        def options
+          if supports_selection?
+            all_items.map &:name
+          else
+            element.items.map &:name
+          end
+        end
+
+        private
+
+        def all_items
+          selection_pattern.selection_items
+        end
+
+        def click_or_select(item)
+          item.click
+        rescue
+          item.select
+        end
+
+        def selection_pattern
+          element.as :selection
+        end
+
+        def supports_selection?
+          selection_pattern
+          true
+        rescue
+          false
+        end
+
+        private
+        def element
+          ctrl_element.with(:combo_box)
+        end
+      end
+    end
+  end
+end

data/lib/mohawk/adapters/uia_adapter.rb

@@ -35,6 +35,10 @@ module Mohawk
       end
 
       def combo(locator)
+        ComboBoxControl.new self, merge(locator)
+      end
+
+      def select_list(locator)
         SelectList.new self, merge(locator)
       end
 

data/lib/mohawk/version.rb

@@ -1,3 +1,3 @@
 module Mohawk
-  VERSION = '0.4.4'
+  VERSION = '1.0'
 end

data/mohawk.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'uia', '~> 0.5'
+  gem.add_dependency 'uia', '~> 1.0'
   gem.add_dependency 'require_all', '~> 3.0'
   gem.add_dependency 'page_navigation', '>= 0.7'
   gem.add_dependency 'childprocess', '~> 0.5'
@@ -32,5 +32,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'guard'
   gem.add_development_dependency 'guard-rspec'
   gem.add_development_dependency 'terminal-notifier-guard'
-  gem.add_development_dependency 'json', '~> 2.1.0'
+  gem.add_development_dependency 'json', '~> 2.1'
 end

data/spec/lib/mohawk/combo_box_spec.rb

@@ -19,6 +19,14 @@ describe 'combo boxes' do
       Then { main_form.fruits == 'Orange' }
     end
 
+    context '#options' do
+      Then { main_form.fruits_options == ["Apple", "Caimito", "Coconut", "Orange", "Passion Fruit"] }
+    end
+  end
+
+  describe 'list boxes' do
+    Given(:main_form) { start_app }
+
     context 'multi-select' do
       Given { main_form.toggle_multi }
       When { (0..2).each {|n| main_form.select_fruits_list n } }
@@ -42,11 +50,11 @@ describe 'combo boxes' do
         end
       end
     end
-  end
 
-  context 'list boxes' do
-    # ListBox controls are special with regard to raising events
-    When { main_form.fruits_list = 'Orange' }
-    Then { main_form.fruits_label == 'Orange' }
+    context 'events' do
+      # ListBox controls are special with regard to raising events
+      When { main_form.fruits_list = 'Orange' }
+      Then { main_form.fruits_label == 'Orange' }
+    end
   end
-end
+end

data/spec/lib/mohawk/window_spec.rb

@@ -11,11 +11,11 @@ describe Mohawk::Adapters::UIA::Window do
       on(Class.new do
         include Mohawk
         window(title: /MainForm/)
-        parent(id: 'numericUpDown')
+        parent(id: 'groupBox2')
       end)
     end
 
-    Then { container.adapter.window.title == 'linkLabel1' }
+    Then { container.adapter.window.title == 'Drop down list' }
   end
 
   context 'children_only' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mohawk
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: '1.0'
 platform: ruby
 authors:
 - Levi Wilson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uia
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
 description: Mohawk is a page-object style driver that makes it easy to automate windows
   applications. It allows you to create a very flexible, clean and natural DSL around
   whatever windows application that you are trying to automate using the RAutomation
@@ -230,6 +230,7 @@ files:
 - features/support/FizzWare.NBuilder.dll
 - features/support/UIA.Extensions.dll
 - features/support/WindowsForms.exe
+- features/support/WindowsForms.exe.config
 - features/support/app/WindowsForms/WindowsForms.sln
 - features/support/app/WindowsForms/WindowsForms/AboutBox.Designer.cs
 - features/support/app/WindowsForms/WindowsForms/AboutBox.cs
@@ -267,6 +268,7 @@ files:
 - lib/mohawk/accessors.rb
 - lib/mohawk/adapters/uia/button.rb
 - lib/mohawk/adapters/uia/checkbox.rb
+- lib/mohawk/adapters/uia/combo_box.rb
 - lib/mohawk/adapters/uia/control.rb
 - lib/mohawk/adapters/uia/element_locator.rb
 - lib/mohawk/adapters/uia/menu_item.rb
@@ -314,7 +316,7 @@ homepage: http://github.com/leviwilson/mohawk
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -329,9 +331,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Provides a page-object style driver for automating Windows applications
 test_files:
@@ -339,6 +340,7 @@ test_files:
 - features/support/FizzWare.NBuilder.dll
 - features/support/UIA.Extensions.dll
 - features/support/WindowsForms.exe
+- features/support/WindowsForms.exe.config
 - features/support/app/WindowsForms/WindowsForms.sln
 - features/support/app/WindowsForms/WindowsForms/AboutBox.Designer.cs
 - features/support/app/WindowsForms/WindowsForms/AboutBox.cs