mohawk 0.0.9 → 0.1.0

data/Changelog

@@ -1,3 +1,9 @@
+===	Version 0.1.0 / 2013-10-03
+*	Enhancments
+	*	added multi-select support to tables and select lists
+	*	bumped RAutomation dependency to include fixes for selecting
+		ListBox items when they are out of view
+
 === Version 0.0.9 / 2013-09-12
 *	Fixes
 	*	loosened the gemspec restrictions on RAutomation

data/features/combo_box.feature

@@ -1,19 +1,36 @@
 Feature:  Working with combo boxes
 
-Scenario: Selecting items by index
-  When I select index "2" from the "fruits" combo box
-  Then the "Coconut" option should be selected in the "fruits" combo box
+  Scenario: Selecting items by index
+    When I select index "2" from the "fruits" combo box
+    Then the "Coconut" option should be selected in the "fruits" combo box
 
-Scenario: Selecting items by value
-  When I select the value "Orange" from the "fruits" combo box
-  Then the "Orange" option should be selected in the "fruits" combo box
+  Scenario: Selecting items by value
+    When I select the value "Orange" from the "fruits" combo box
+    Then the "Orange" option should be selected in the "fruits" combo box
 
-Scenario: Getting the available options
-  When I look at the options for the "fruits" combo box"
-  Then I should see the following options:
-  | Option        |
-  | Apple         |
-  | Caimito       |
-  | Coconut       |
-  | Orange        |
-  | Passion Fruit |
+  Scenario: Selecting multiple items
+    Given we toggle the multi-select button
+    When I select indexes "0, 1, 2" from the "fruits_list" combo box
+    Then the "Apple, Orange, Mango" options should be selected in the "fruits_list" combo box
+
+  Scenario: Clearing items by index
+    Given we toggle the multi-select button
+    When I select indexes "0, 1, 2" from the "fruits_list" combo box
+    But I clear the item at index "1" from the "fruits_list" combo box
+    Then the "Apple, Mango" options should be selected in the "fruits_list" combo box
+
+  Scenario: Clearing items by value
+    Given we toggle the multi-select button
+    When I select indexes "0, 1, 2" from the "fruits_list" combo box
+    But I clear item "Mango" from the "fruits_list" combo box
+    Then the "Apple, Orange" options should be selected in the "fruits_list" combo box
+
+  Scenario: Getting the available options
+    When I look at the options for the "fruits" combo box"
+    Then I should see the following options:
+      | Option        |
+      | Apple         |
+      | Caimito       |
+      | Coconut       |
+      | Orange        |
+      | Passion Fruit |

data/features/step_definitions/combo_box_steps.rb

@@ -1,13 +1,25 @@
-When /^I select index "(.*?)" from the "(.*?)" combo box$/ do |index, name|
-  on(MainScreen).send "#{name.to_field}=", index.to_i
+When /^I select index(es)? "(.*?)" from the "(.*?)" combo box$/ do |_, indexes, name|
+  on(MainScreen) do |screen|
+    indexes.split(', ').map(&:to_i).each do |index|
+      screen.send "select_#{name.to_field}", index
+    end
+  end
 end
 
 When /^I select the value "(.*?)" from the "(.*?)" combo box$/ do |index, name|
   on(MainScreen).send "#{name.to_field}=", index
 end
 
-Then /^the "(.*?)" option should be selected in the "(.*?)" combo box$/ do |value, name|
-  on(MainScreen).send("#{name.to_field}").should eq(value)
+When(/^I clear the item at index "([^"]*)" from the "([^"]*)" combo box$/) do |which, name|
+  on(MainScreen).send("clear_#{name.to_field}", which.to_i)
+end
+
+When(/^I clear item "([^"]*)" from the "([^"]*)" combo box$/) do |which, name|
+  on(MainScreen).send("clear_#{name.to_field}", which)
+end
+
+Then /^the "(.*?)" option(s)? should be selected in the "(.*?)" combo box$/ do |value, has_multiple, name|
+  on(MainScreen).send("#{name.to_field}_selections").should eq(value.split(', '))
 end
 
 When /^I look at the options for the "(.*?)" combo box"$/ do |name|
@@ -18,3 +30,7 @@ Then /^I should see the following options:$/ do |table|
   expected_options = table.hashes.map {|row| row["Option"] }
   @options.should eq(expected_options)
 end
+
+Given(/^we toggle the multi-select button$/) do
+  on(MainScreen).toggle_multi
+end

data/features/step_definitions/table_steps.rb

@@ -17,8 +17,33 @@ When /^we select the table row with the value "([^"]*)"$/ do |row_value|
   on(DataEntryForm).people = row_value
 end
 
-When(/^we select the table row with the following information:$/) do |table|
-  on(DataEntryForm).select_people table.hashes.first
+When(/^we add rows "([^"]*)" to the selection$/) do |which_rows|
+  on(DataEntryForm) do |screen|
+    which_rows.split(', ').map(&:to_i).each do |row|
+      screen.people = row
+    end
+  end
+end
+
+When(/^we clear rows "([^"]*)" from the selection$/) do |which_rows|
+  on(DataEntryForm) do |screen|
+    which_rows.split(', ').map(&:to_i).each do |row|
+      screen.clear_people(row)
+    end
+  end
+end
+
+Then(/^rows "([^"]*)" should all (not )?be selected$/) do |which_rows, to_not_be|
+  should_or_should_not = (to_not_be && :should_not) || :should
+  on(DataEntryForm) do |screen|
+    which_rows.split(', ').map(&:to_i).each do |row|
+      screen.people[row].send(should_or_should_not, be_selected)
+    end
+  end
+end
+
+When(/^we (select|clear) the table row with the following information:$/) do |select_or_clear, table|
+  on(DataEntryForm).send("#{select_or_clear}_people", table.hashes.first)
 end
 
 Then(/^we can find the row with the following information:$/) do |table|
@@ -33,8 +58,9 @@ When /^we select the "(.*?)"th table row$/ do |index|
   on(DataEntryForm).people[index.to_i].select
 end
 
-Then /^the row with index "(.*?)" should be selected$/ do |which_row|
-  on(DataEntryForm).people[which_row.to_i].should be_selected
+Then /^the row with index "(.*?)" should (not )?be selected$/ do |which_row, to_not_be|
+  should_or_should_not = (to_not_be && :should_not) || :should
+  on(DataEntryForm).people[which_row.to_i].send(should_or_should_not, be_selected)
 end
 
 Then /^the row with index "(.*?)" should look like the following:$/ do |which_row, table|

data/features/support/screens/main_screen.rb

@@ -8,7 +8,11 @@ class MainScreen
   button(:about, :value => "About")
   control(:about_control, :value => 'About')
   button(:data_grid, :value => "Data Grid View")
+
+  button(:toggle_multi, :value => 'Toggle Multi-Select')
   combo_box(:fruits, :id => "FruitsComboBox")
+  select_list(:fruits_list, :id => 'FruitListBox')
+
   checkbox(:first_checkbox, :id =>  "checkBox")
   radio(:first_radio, :id => "radioButton1")
   label(:label_control, :id => "label1")

data/features/table.feature

@@ -22,11 +22,29 @@ Feature:  Working with tables
       | name     | date_of_birth | state |
       | John Doe | 12/15/1967    | FL    |
 
-
   Scenario: Selecting a row from a child item
     When we select the "1"th table row
     Then the row with index "1" should be selected
 
+  Scenario: Adding rows to the selection
+    Given there are a lot of records in a table
+    When we add rows "1, 3, 5" to the selection
+    Then rows "1, 3, 5" should all be selected
+
+  Scenario: Clearing rows from a selection
+    Given there are a lot of records in a table
+    When we add rows "2, 3, 4, 5" to the selection
+    But we clear rows "2, 4" from the selection
+    Then rows "3, 5" should all be selected
+    And rows "2, 4" should all not be selected
+
+  Scenario: Clearing a row by matching cell information
+    Given we add rows "0, 1" to the selection
+    When we clear the table row with the following information:
+      | name     | date_of_birth |
+      | Anna Doe | 3/4/1975      |
+    Then the row with index "1" should not be selected
+
   Scenario: Rows have cells
     Then the row with index "0" should look like the following:
       | Name     | Date of Birth | State |

data/lib/mohawk/accessors/combo.rb

@@ -7,18 +7,31 @@ module Mohawk
         @view = adapter.window.select_list(locator)
       end
 
-      def value
-        @view.value
+      def set(value)
+        find(value).select
       end
 
-      def set(value)
-        @view.select value if value.instance_of? Fixnum
-        @view.set value if value.instance_of? String
+      def clear(value)
+        find(value).clear
+      end
+
+      def method_missing(meth, *args, &block)
+        return super unless @view.respond_to?(meth)
+        @view.send(meth, *args, &block)
       end
 
       def options
         @view.options.map &:text
       end
+
+      def find(what)
+        case what
+          when Fixnum
+            @view.options[what]
+          when String
+            @view.option(text: what)
+        end
+      end
     end
   end
 end

data/lib/mohawk/accessors/table.rb

@@ -10,16 +10,22 @@ module Mohawk
       end
 
       def select(which_item)
-        case which_item
-          when Hash
-            select_by_hash(which_item)
-          else
-            select_by_value(which_item)
-        end
+        find_row_with(which_item).select
+      end
+
+      def clear(which_item)
+        find_row_with(which_item).clear
       end
 
       def find_row_with(row_info)
-        found_row = find { |r| r.all_match? row_info }
+        found_row = case row_info
+                      when Hash
+                        find_by_hash(row_info)
+                      when Fixnum
+                        find_by_index(row_info)
+                      when String
+                        find_by_value(row_info)
+                    end
         raise "A row with #{row_info} was not found" unless found_row
         found_row
       end
@@ -39,14 +45,16 @@ module Mohawk
       end
 
       private
-      def select_by_value(which_item)
-        view.select which_item
+      def find_by_index(which_item)
+        self[which_item]
       end
 
-      def select_by_hash(which_item)
-        found_row = find_row_with(which_item)
-        found_row.select
-        found_row
+      def find_by_value(which_item)
+        view.row(text: which_item)
+      end
+
+      def find_by_hash(row_info)
+        find { |r| r.all_match? row_info }
       end
     end
   end

data/lib/mohawk/accessors/table_row.rb

@@ -11,11 +11,17 @@ module Mohawk
       end
 
       def selected?
-        @table.view.selected? row.row
+        row.selected?
       end
 
       def select
-        @table.view.select row.row
+        row.select
+        self
+      end
+
+      def clear
+        row.clear
+        self
       end
 
       def cells

data/lib/mohawk/accessors/tree_view.rb

@@ -24,8 +24,8 @@ module Mohawk
       end
 
       def select(which_item)
-        @view.select which_item if which_item.is_a? Integer
-        @view.set which_item if which_item.is_a? String
+        @view.options[which_item].select if which_item.is_a? Integer
+        @view.option(text: which_item).select if which_item.is_a? String
       end
     end
   end

data/lib/mohawk/accessors.rb

@@ -89,7 +89,7 @@ module Mohawk
     #
     # @example
     #   combo_box(:status, :id => 'statusComboBox')
-    #   # will generate 'status', 'status=' and 'status_options' methods
+    #   # will generate 'status', 'status_selections', 'status=', 'select_status','clear_status' and 'status_options' methods
     #
     # @param  [String]  the name used for the generated methods
     # @param  [Hash]  locator for how the combo box is found
@@ -103,9 +103,18 @@ module Mohawk
       define_method("#{name}") do
         adapter.combo(locator).value
       end
+      define_method("clear_#{name}") do |item|
+        adapter.combo(locator).clear item
+      end
+      define_method("#{name}_selections") do
+        adapter.combo(locator).values
+      end
+
       define_method("#{name}=") do |item|
         adapter.combo(locator).set item
       end
+      alias_method "select_#{name}", "#{name}="
+
       define_method("#{name}_options") do
         adapter.combo(locator).options
       end
@@ -223,9 +232,9 @@ module Mohawk
     #
     # @example
     #   table(:some_table, :id => "tableId")
-    #   # will generate 'some_table', 'some_table=', 'some_table_headers', 'select_some_table',
+    #   # will generate 'some_table', 'some_table=', 'some_table_headers', 'select_some_table', 'clear_some_table',
     #   # find_some_table and 'some_table_view' methods to get an Enumerable of table rows,
-    #   # select a table item, return all of the headers and get the raw view
+    #   # 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  [Hash]  locator for how the label is found
@@ -247,6 +256,9 @@ module Mohawk
       define_method("find_#{name}") do |hash_info|
         adapter.table(locator).find_row_with hash_info
       end
+      define_method("clear_#{name}") do |hash_info|
+        adapter.table(locator).clear hash_info
+      end
       define_method("#{name}_headers") do
         adapter.table(locator).headers
       end

data/lib/mohawk/version.rb

@@ -1,3 +1,3 @@
 module Mohawk
-  VERSION = "0.0.9"
+  VERSION = "0.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 'rautomation', '>= 0.12.0'
+  gem.add_dependency 'rautomation', '~> 0.13'
   gem.add_dependency 'require_all'
   gem.add_dependency 'page_navigation', '>= 0.7'
   gem.add_dependency 'childprocess', '~> 0.3.9'

data/spec/lib/mohawk/accessors/combo_spec.rb

@@ -26,9 +26,11 @@ describe Mohawk::Accessors::Combo do
   let(:screen) { ComboBoxScreen.new }
   let(:window) { double("RAutomation Window") }
   let(:combo_box_field) { double("ComboBox Field") }
+  let(:options) { double("ComboBox::Options").as_null_object }
 
   before(:each) do
     RAutomation::Window.stub(:new).and_return(window)
+    combo_box_field.stub(:options).and_return(options)
   end
 
   context "accessing combo box controls" do
@@ -42,16 +44,48 @@ describe Mohawk::Accessors::Combo do
       screen.nacho_combos.should eq("Selected Item")
     end
 
+    it 'knows the currently selected items' do
+      combo_box_field.should_receive(:values).and_return(['first', 'second'])
+      screen.nacho_combos_selections.should eq(['first', 'second'])
+    end
+
     it "selects items by index" do
-      combo_box_field.should_receive(:select).with(3)
+      options.should_receive(:[]).with(3).and_return(double.as_null_object)
       screen.nacho_combos = 3
     end
 
     it "selects items by value" do
-      combo_box_field.should_receive(:set).with("Desired Value")
+      option = double('combo option')
+      combo_box_field.should_receive(:option).with(text: "Desired Value").and_return(option)
+      option.should_receive(:select)
+
       screen.nacho_combos = "Desired Value"
     end
 
+    it 'select is an alias for equals' do
+      option = double('combo option')
+      combo_box_field.should_receive(:option).with(text: 'Desired Value').and_return(option)
+      option.should_receive(:select)
+
+      screen.select_nacho_combos 'Desired Value'
+    end
+
+    it 'clears items by index' do
+      option = double('combo option')
+      options.should_receive(:[]).with(3).and_return(option)
+      option.should_receive(:clear)
+
+      screen.clear_nacho_combos 3
+    end
+
+    it 'clears items by value' do
+      option = double('combo option')
+      combo_box_field.should_receive(:option).with(text: 'Desired Value').and_return(option)
+      option.should_receive(:clear)
+
+      screen.clear_nacho_combos 'Desired Value'
+    end
+
     it "is aware of the available options" do
       options = [Option.new("first"), Option.new("second"), Option.new("third")]
       combo_box_field.should_receive(:options).and_return(options)

data/spec/lib/mohawk/accessors/table_spec.rb

@@ -29,64 +29,120 @@ describe Mohawk::Accessors::Table do
     end
 
     it 'can select a row by index' do
-      table.should_receive(:select).with(1)
+      stubber = TableStubber.stub(table)
+        .with_headers('Name')
+        .and_row('First Person')
+        .and_row('Secont Person')
+
+      stubber.rows[1].should_receive(:select)
       screen.top = 1
     end
 
     it 'can select a row by value' do
-      table.should_receive(:select).with 'John Elway'
+      row = double('row')
+      table.should_receive(:row).with(text: 'John Elway').and_return(row)
+      row.should_receive(:select)
+
       screen.top = 'John Elway'
     end
 
-    it 'can find a row by hash' do
-      TableStubber.stub(table)
+    it 'can clear a row by index' do
+      stubber = TableStubber.stub(table)
+        .with_headers('Name').and_row('Whomever')
+
+      stubber.rows[0].should_receive(:clear)
+      screen.clear_top(0)
+    end
+
+    it 'can clear a row by value' do
+      row = double('row')
+      table.should_receive(:row).with(text: 'John Elway').and_return(row)
+      row.should_receive(:clear)
+
+      screen.clear_top('John Elway')
+    end
+
+    context 'finding rows by Hash' do
+      it 'can find a row by hash' do
+        TableStubber.stub(table)
         .with_headers('Favorite Color', 'Favorite Number', 'Name')
         .and_row('Blue', '7', 'Levi')
         .and_row('Purple', '9', 'Larry')
 
-      found_row = screen.find_top :favorite_number => 9
-      found_row.favorite_color.should eq('Purple')
-      found_row.favorite_number.should eq('9')
-      found_row.name.should eq('Larry')
-    end
+        found_row = screen.find_top :favorite_number => 9
+        found_row.favorite_color.should eq('Purple')
+        found_row.favorite_number.should eq('9')
+        found_row.name.should eq('Larry')
+      end
 
-    context 'selecting a row by hash' do
-      it 'selects the row if all values match' do
+      it 'matches all values' do
+        stubber = TableStubber.stub(table)
+        .with_headers('Column One', 'Column Two', 'Column Three')
+        .and_row('first', 'something', 'foo')
+        .and_row('second', 'another', 'bar')
+
+        screen.find_top(:column_one => 'second', :column_three => 'bar').row.should eq(stubber.rows[1])
+      end
+
+      it 'can handle non-string values' do
+        stubber = TableStubber.stub(table)
+        .with_headers('name', 'age')
+        .and_row('Levi', '33')
+
+        screen.find_top(:age => 33).row.should eq(stubber.rows.first)
+      end
+
+      it 'raises if no row is found' do
         TableStubber.stub(table)
-          .with_headers('Column One', 'Column Two', 'Column Three')
-          .and_row('first', 'something', 'foo')
-          .and_row('second', 'another', 'bar')
+        .with_headers('Column One', 'Column Two', 'Column Three')
+        .and_row('first', 'something', 'foo')
 
-        table.should_receive(:select).with(1)
-        screen.select_top :column_one => 'second', :column_three => 'bar'
+        expect { screen.find_top :column_one => 'not found' }.to raise_error "A row with {:column_one=>\"not found\"} was not found"
       end
+    end
 
+    context 'selecting a row by hash' do
       it 'returns the row that it selected' do
-        TableStubber.stub(table)
+        stubber = TableStubber.stub(table)
         .with_headers('name', 'age')
         .and_row('Levi', '33')
 
-        table.should_receive(:select).with(0)
+        stubber.rows[0].should_receive(:select)
         screen.select_top(:age => 33).name.should eq('Levi')
       end
 
-      it 'can handle non-string values' do
-        TableStubber.stub(table)
+      it 'uses the find_row semantics' do
+        stubber = TableStubber.stub(table)
           .with_headers('name', 'age')
           .and_row('Levi', '33')
 
-        table.should_receive(:select).with(0)
+        Mohawk::Accessors::Table.any_instance.should_receive(:find_row_with).with(:age => 33).and_call_original
+
+        stubber.rows[0].should_receive(:select)
         screen.select_top :age => 33
       end
+    end
 
-      it 'raises if no row is found' do
-        TableStubber.stub(table)
-        .with_headers('Column One', 'Column Two', 'Column Three')
-        .and_row('first', 'something', 'foo')
+    context 'clearing a row by hash' do
+      it 'returns the row that it cleared' do
+        stubber = TableStubber.stub(table)
+        .with_headers('name', 'age')
+        .and_row('Levi', '33')
 
-        lambda { screen.select_top :column_one => 'not found' }.should raise_error "A row with {:column_one=>\"not found\"} was not found"
+        stubber.rows[0].should_receive(:clear)
+        screen.clear_top(:age => 33).name.should eq('Levi')
       end
 
+      it 'uses the find_row semantics' do
+        stubber = TableStubber.stub(table)
+        .with_headers('name', 'age')
+        .and_row('Levi', '33')
+
+        Mohawk::Accessors::Table.any_instance.should_receive(:find_row_with).with(:age => 33).and_call_original
+
+        stubber.rows[0].should_receive(:clear)
+        screen.clear_top :age => 33
+      end
     end
 
     it 'has rows' do
@@ -108,8 +164,9 @@ describe Mohawk::Accessors::Table do
     end
 
     describe Mohawk::Accessors::TableRow do
+      let(:table_stubber) { TableStubber.stub(table) }
       before(:each) do
-        TableStubber.stub(table).with_headers('column').and_row('first row')
+        table_stubber.with_headers('column').and_row('first row')
       end
 
       it 'can get an individual row' do
@@ -117,12 +174,12 @@ describe Mohawk::Accessors::Table do
       end
 
       it 'knows if it is selected' do
-        table.should_receive(:selected?).with(0).and_return(true)
+        table_stubber.rows[0].should_receive(:selected?).and_return(true)
         screen.top[0].should be_selected
       end
 
       it 'can be selected' do
-        table.should_receive(:select).with(0)
+        table_stubber.rows[0].should_receive(:select)
         screen.top[0].select
       end
 

data/spec/lib/mohawk/accessors/tree_view_spec.rb

@@ -24,9 +24,12 @@ describe Mohawk::Accessors::TreeView do
   let(:screen) { TreeViewScreen.new }
   let(:window) { double("RAutomation Window") }
   let(:tree_field) { double("TreeView Field") }
+  let(:options) { double("TreeView Options") }
+  let(:option) { double("TreeView Option") }
 
   before(:each) do
     RAutomation::Window.stub(:new).and_return(window)
+    tree_field.stub(:options).and_return(options)
   end
 
   context "working with TreeView controls" do
@@ -40,12 +43,16 @@ describe Mohawk::Accessors::TreeView do
     end
 
     it "can select items by index" do
-      tree_field.should_receive(:select).with(7)
+      options.should_receive(:[]).with(7).and_return(option)
+      option.should_receive(:select)
+
       screen.oak = 7
     end
 
     it "can select items by their value" do
-      tree_field.should_receive(:set).with("item value")
+      tree_field.should_receive(:option).with(text: 'item value').and_return(option)
+      option.should_receive(:select)
+
       screen.oak = "item value"
     end
 

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rspec'
+require 'rspec/mocks'
 require 'ffi_stub'
 require 'mohawk'
 require 'coveralls'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mohawk
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rautomation
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement