watir-formhandler 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c34b9d70174d220290bce2a6c43ef4f61e83105b
-  data.tar.gz: 49658eef327f01c33e1375685256acd7c99e3d2f
+  metadata.gz: d1521feb2905d31223a4bd195a0e9f47515c7724
+  data.tar.gz: 80aae55990ee6c1280a63665c1bd017b7b957271
 SHA512:
-  metadata.gz: 36d753f787fbc9a90efe8bd09231837da5d5d510400275795bc266285dad53e1b438d1af956a798dc5b4016743821b855150d25412cbe9cba262aa67f4a2980d
-  data.tar.gz: 609060efa1df89be59e01794a1daba709a4c9cba54406246f5e8fbd6dc3567f2d89bb167fe45b21063272206f6d73f4afdffc00990a06af7a5671c49fca5d7ef
+  metadata.gz: 5b6fdfc3386724a26b1391181f9debcd5cf16b396423c2777766e6cc17c8f92537df9e6ef773b4684c4f2bf53f9b7f7cf9a3d20e62ed5a236f8917ce34c5e211
+  data.tar.gz: 5ba987627b5da309ca87a7b45bc0085af76d0a97485b02ffa2f3e108785fdfb30103694de06a00b611c1afd6b01cd9dd6ead3223d586b1af57cf8a36e3d0042a

data/README.md

@@ -110,19 +110,14 @@ its current value.
 ### OptionGroup
 
 A new Container sub class, which represents a group of radio buttons and/or checkboxes. Such a group
-may always be referred to, however, to prevent conflicts, _#field_ and _#fill_in_ will only search
-for these kind of groups, if the respective options has been activated.
+may always be referred to, but since 2.7.0 the group will also be automatically returned by #field of
+the described label is pointing to anything else but a regular input field.
 
     browser = Watir::Browser.new('example_site')
     form = browser.form(id: 'my_form')
 
-    form.field('OptionsGroupElement')                       # will return the Checkbox or Radio
-                                                            # which has label 'OptionsGroupElement'
-
-    form.field('OptionsGroupElement', include_groups: true) # returns OptionGroup node to which
-                                                            # the Checkbox/Radio with label
-                                                            # 'OptiongsGroupElement' belongs to.
-
+    form.field('OptionsGroupElement')                       # will return the the collection of checkboxes and radios
+                                                            # as OptionGroup instance
 
 
 ### :start_node
@@ -138,6 +133,13 @@ methods directly on your Watir::Browser instance.
 
 ### Latest Changes
 
+#### Version 2.7.0
+
+* Updated minimum watir-webdriver version to 0.7.0
+* Tests passed with selenium-webdriver 2.46.2, compatible with Firefox 38.0, Chromium 43
+* Changed OptionGroup to behave like a normal element now
+* OptionGroup will now automatically be returned by #field and used by the respective methods.
+
 #### Version 2.6.1
 
 * Fixed documentation of #value_of method

data/lib/watir-formhandler/container.rb

@@ -1,16 +1,20 @@
 module Watir
   module Container
+
+    FORM_FIELDS = [Input, Select, TextArea]
+
     # Searches for the specified label and returns the form field belonging to it, identified by the
     # 'for' attribute of the label. Alternatively, you may pass a Watir::Label.
     # @param [String, Watir::Label] label the label for which to find the form field.
     # @param [Watir::Element] start_node the node where to start searching for the label.
-    # @param [Boolean] include_groups whether to detect the group of a given label.
     # @param [Boolean] placeholder whether to handle label as Watir::Label or as placeholder
     #                              attribute for an input field.
     # @param [Boolean] id          assumes the given label is an HTML ID and searches for it.
     #
-    # @return [Watir::Element] form field of the given label.
-    def field(label, start_node: nil, include_groups: false, placeholder: false, id: false)
+    # @return [Watir::Element] form field of the given label. If the field is
+    #                          no form field, it will be assumed to be an
+    #                          OptionGroup.
+    def field(label, start_node: nil, placeholder: false, id: false)
       start_node ||= self
 
       if placeholder
@@ -19,7 +23,7 @@ module Watir
         start_node.element(id: label).to_subtype
       else
         field_label = label.respond_to?(:for) ? label : start_node.label(text: label)
-        determine_field(start_node, field_label, include_groups)
+        determine_field(start_node, field_label)
       end
     end
 
@@ -29,14 +33,12 @@ module Watir
     # @param [String, Watir::Label] label the label for which to find the form field.
     # @param [String, Boolean, Array] value to be set.
     # @param [Watir::Element] start_node the node where to start searching for the label.
-    # @param [Boolean] include_groups whether to detect the group of a given label.
     # @param [Boolean] placeholder whether to handle label as Watir::Label or as placeholder
     #                              attribute for an input field.
     # @param [Boolean] id          assumes the given label is an HTML ID and searches for it.
-    def fill_in(label, value, start_node: nil, include_groups: false, placeholder: false, id: false)
+    def fill_in(label, value, start_node: nil, placeholder: false, id: false)
       field(label,
             start_node:     start_node,
-            include_groups: include_groups,
             placeholder:    placeholder,
             id:             id
       ).set(value)
@@ -47,15 +49,13 @@ module Watir
     # parameters as the #field method.
     # @param [String, Watir::Label] label the label for which to find the form field.
     # @param [Watir::Element] start_node the node where to start searching for the label.
-    # @param [Boolean] include_groups whether to detect the group of a given label.
     # @param [Boolean] placeholder whether to handle label as Watir::Label or as placeholder
     #                              attribute for an input field.
     # @param [Boolean] id          assumes the given label is an HTML ID and searches for it.
     # @return [String, Boolean, Array] current value of the field.
-    def value_of(label, start_node: nil, include_groups: false, placeholder: false, id: false)
+    def value_of(label, start_node: nil, placeholder: false, id: false)
       field(label,
             start_node:     start_node,
-            include_groups: include_groups,
             placeholder:    placeholder,
             id:             id
       ).field_value
@@ -65,22 +65,29 @@ module Watir
     # Returns an OptionGroup
     # @return [OptionGroup] the selected OptionGroup
     def option_group(*args)
-      selector = args.first.respond_to?(:elements) ? args.first : extract_selector(args)
+      selector = if args.first.respond_to?(:elements)
+                   args.first
+                 else
+                   extract_selector(args)
+                 end
       OptionGroup.new(self, selector)
     end
     Watir.extend_tag_to_class(:option_group, OptionGroup)
 
 
-
     private
-    def determine_field(start_node, label, include_groups)
-      if include_groups
-        group_member_count = label.parent.checkboxes.count + label.parent.radios.count
-        return option_group(label.parent) if group_member_count > 1
-      end
-
+    def determine_field(start_node, label)
       found_field = start_node.element(id: label.for)
-      found_field ? found_field.to_subtype : nil
+      typed_field = found_field ? found_field.to_subtype : nil
+
+      is_group?(typed_field) ? option_group(found_field) : typed_field
+    end
+
+
+    def is_group?(field_to_inspect)
+      FORM_FIELDS.reduce(true) do |is_group, field_class|
+        is_group & !field_to_inspect.is_a?(field_class)
+      end
     end
   end
 end

data/lib/watir-formhandler/option_group.rb

@@ -12,8 +12,6 @@ module Watir
     def initialize(parent, selector)
       stripped_selector = selector.respond_to?(:selector) ? selector.selector : selector
       super parent, stripped_selector
-
-      @element = selector if selector.respond_to?(:selector)
     end
 
 
@@ -83,6 +81,11 @@ module Watir
     end
 
 
+    def tag_name
+      'option_group'
+    end
+
+
     private
     def select(options_to_select, value_to_set)
       options_to_select.each{ |option| @options[option].set(value_to_set) }

data/spec/container_spec.rb

@@ -8,6 +8,10 @@ module Watir
 
     before(:each) { browser.goto(local_url(FORM_PAGE)) }
 
+    def field_label(text)
+      browser.label(text: text)
+    end
+
     describe '#option_group' do
       context 'using a selector' do
         it "returns a Watir::OptionGroup for id: 'checkboxset'" do
@@ -22,7 +26,7 @@ module Watir
       context 'using a node' do
         it 'returns a Watir::OptionGroup for a given Watir::Element' do
           fieldset = browser.fieldset(id: 'checkboxset')
-          expect(browser.option_group(fieldset).tag_name).to eq('fieldset')
+          expect(browser.option_group(fieldset).tag_name).to eq('option_group')
         end
       end
     end # #option_group
@@ -44,11 +48,13 @@ module Watir
       describe 'with a start node' do
         context 'specifying the label with a string' do
           it 'searches the label within given Watir::Element' do
-            field_label = double('label', for: 'checkbox')
-            start_node = double('enter_element', label: field_label)
+            start_node = browser.div(id: 'main_content')
+            start_node.exists?
+            searched_field = start_node.element(id: 'checkbox')
+
 
-            expect(start_node).to receive(:label).with(text: 'Checkbox')
             expect(start_node).to receive(:element).with(id: 'checkbox')
+                                    .and_return(searched_field)
             browser.field('Checkbox', start_node: start_node)
           end
 
@@ -61,10 +67,13 @@ module Watir
 
         context 'specifying the label with a Watir::Label' do
           it 'searches the label within given Watir::Element' do
-            field_label = double('label', for: 'checkbox')
-            start_node = double('enter_element')
+            start_node = browser.div(id: 'main_content')
+            field_label = start_node.label(text: 'Checkbox')
+            searched_field = start_node.element(id: 'checkbox')
 
             expect(start_node).to receive(:element).with(id: 'checkbox')
+                                    .and_return(searched_field)
+
             browser.field(field_label, start_node: start_node)
           end
 
@@ -105,16 +114,8 @@ module Watir
         end
 
         context 'if fields are grouped' do
-          it 'returns Watir::OptionGroup for grouped checkboxes' do
-            expect(browser.field('Checkbox1', include_groups: true)).to be_a(Watir::OptionGroup)
-          end
-
-          it 'returns Watir::OptionGroup for grouped radio buttons' do
-            expect(browser.field('Radio1', include_groups: true)).to be_a(Watir::OptionGroup)
-          end
-
-          it 'returns Watir::OptionGroup for grouped chckboxes and radio buttons' do
-            expect(browser.field('Checkbox5', include_groups: true)).to be_a(Watir::OptionGroup)
+          it 'returns Watir::OptionGroup for fieldset' do
+            expect(browser.field('Checkboxset')).to be_a(Watir::OptionGroup)
           end
         end
       end # describe sybtype
@@ -185,7 +186,7 @@ module Watir
 
         it 'fills a Watir::OptionGroup' do
           options = %w(Checkbox5 Radio7)
-          browser.fill_in('Checkbox5', options, include_groups: true)
+          browser.fill_in('Radios and Checkboxes', options)
           option_group = browser.option_group(id: 'radio_and_checkbox')
           expect(option_group.selected_options.count).to eq(2)
           expect(option_group.selected_options).to eq(options)
@@ -194,31 +195,38 @@ module Watir
 
 
       describe 'with a start node' do
-        before(:all){ @browser.refresh }
-        let(:start_node){ browser.element(id: 'main_content') }
+        before(:all)      { @browser.refresh                    }
+        let(:start_node)  { browser.element(id: 'main_content') }
+
 
         it 'fills a Watir::Checkbox from start node' do
-          expect(start_node).to receive(:label).and_return(browser.label(text: 'Checkbox'))
+          expect(start_node).to receive(:label)
+                                  .and_return(field_label('Checkbox'))
           browser.fill_in('Checkbox', true, start_node: start_node)
           expect(browser.checkboxes.first).to be_checked
         end
 
         it 'fills a Watir::Radio from start node' do
-          expect(start_node).to receive(:label).and_return(browser.label(text: 'Radio'))
+          expect(start_node).to receive(:label)
+                                  .and_return(field_label('Radio'))
           browser.fill_in('Radio', true, start_node: start_node)
           expect(browser.radios.first).to be_checked
         end
 
         it 'fills a Watir::Select  with single select from start node' do
-          expect(start_node).to receive(:label).and_return(browser.label(text: 'Select'))
+          expect(start_node).to receive(:label)
+                                  .and_return(field_label('Select'))
           browser.fill_in('Select', 'Test2', start_node: start_node)
           expect(browser.selects.first.selected_options.count).to eq(1)
-          expect(browser.selects.first.selected_options.first.text).to eq('Test2')
+
+          expect(browser.selects.first.selected_options.first.text)
+            .to eq('Test2')
         end
 
         it 'fills a Watir::Select with multiple select from start node' do
           options = %w(Option2 Option3)
-          expect(start_node).to receive(:label).and_return(browser.label(text: 'Multi Select'))
+          expect(start_node).to receive(:label)
+                                  .and_return(field_label('Multi Select'))
           browser.fill_in('Multi Select', options, start_node: start_node)
 
           multiselect = browser.select(id: 'multiselect')
@@ -227,27 +235,39 @@ module Watir
         end
 
         it 'fills a Watir::TextField from start node' do
-          expect(start_node).to receive(:label).and_return(browser.label(text: 'Text Field'))
+          expect(start_node).to receive(:label)
+                                  .and_return(field_label('Text Field'))
           browser.fill_in('Text Field', 'test text', start_node: start_node)
           expect(browser.text_fields.first.value).to eq('test text')
         end
 
         it 'fills a Watir::TextArea from start node' do
-          expect(start_node).to receive(:label).and_return(browser.label(text: 'Text Area'))
+          expect(start_node).to receive(:label)
+                                  .and_return(field_label('Text Area'))
           browser.fill_in('Text Area', 'test text', start_node: start_node)
           expect(browser.textareas.first.value).to eq('test text')
         end
 
         it 'fills a Watir::FileField from start node' do
-          expect(start_node).to receive(:label).and_return(browser.label(text: 'File'))
-          browser.fill_in('File', File.join(HTML_DIR, FORM_PAGE), start_node: start_node)
+          expect(start_node).to receive(:label)
+                                  .and_return(field_label('File'))
+          browser.fill_in('File',
+                          File.join(HTML_DIR, FORM_PAGE),
+                          start_node: start_node
+          )
           expect(browser.file_fields.first.value).to eq(FORM_PAGE)
         end
 
         it 'fills a Watir::OptionGroup from start node' do
           options = %w(Checkbox5 Radio7)
-          expect(start_node).to receive(:label).and_return(browser.label(text: 'Checkbox5'))
-          browser.fill_in('Checkbox5', options, include_groups: true, start_node: start_node)
+          expect(start_node).to receive(:label)
+                                  .and_return(
+                                    field_label('Radios and Checkboxes')
+                                  )
+          browser.fill_in('Radios and Checkboxes',
+                          options,
+                          start_node: start_node
+          )
 
           option_group = browser.option_group(id: 'radio_and_checkbox')
           expect(option_group.selected_options.count).to eq(2)
@@ -325,8 +345,8 @@ module Watir
 
         it 'returns value of Watir::OptionGroup' do
           options = %w(Checkbox5 Radio7)
-          browser.fill_in('Checkbox5', options, include_groups: true)
-          expect(browser.value_of('Checkbox5', include_groups: true)).to eq(options)
+          browser.fill_in('Radios and Checkboxes', options)
+          expect(browser.value_of('Radios and Checkboxes')).to eq(options)
         end
       end # desribe: without a start node
 
@@ -337,55 +357,73 @@ module Watir
 
         it 'returns value of Watir::Checkbox from start node' do
           browser.fill_in('Checkbox', true, start_node: start_node)
-          expect(start_node).to receive(:label).and_return(browser.label(text: 'Checkbox'))
+          expect(start_node).to receive(:label)
+                                  .and_return(field_label('Checkbox'))
           expect(browser.value_of('Checkbox', start_node: start_node)).to be true
         end
 
         it 'returns value of Watir::Radio from start node' do
           browser.fill_in('Radio', true, start_node: start_node)
-          expect(start_node).to receive(:label).and_return(browser.label(text: 'Radio'))
+          expect(start_node).to receive(:label).and_return(field_label('Radio'))
           expect(browser.value_of('Radio', start_node: start_node)).to be true
         end
 
         it 'returns value of Watir::Select  with single select from start node' do
           browser.fill_in('Select', 'Test2', start_node: start_node)
-          expect(start_node).to receive(:label).and_return(browser.label(text: 'Select'))
-          expect(browser.value_of('Select', start_node: start_node)).to eq('Test2')
+          expect(start_node).to receive(:label)
+                                  .and_return(field_label('Select'))
+          expect(browser.value_of('Select', start_node: start_node))
+            .to eq('Test2')
         end
 
         it 'returns value of Watir::Select with multiple select from start node' do
           options = %w(Option2 Option3)
           browser.fill_in('Multi Select', options, start_node: start_node)
-          expect(start_node).to receive(:label).and_return(browser.label(text: 'Multi Select'))
-          expect(browser.value_of('Multi Select', start_node: start_node)).to eq(options)
+          expect(start_node).to receive(:label)
+                                  .and_return(field_label('Multi Select'))
+          expect(browser.value_of('Multi Select', start_node: start_node))
+            .to eq(options)
         end
 
         it 'returns value of Watir::TextField from start node' do
           browser.fill_in('Text Field', 'test text', start_node: start_node)
-          expect(start_node).to receive(:label).and_return(browser.label(text: 'Text Field'))
-          expect(browser.value_of('Text Field', start_node: start_node)).to eq('test text')
+          expect(start_node).to receive(:label)
+                                  .and_return(field_label('Text Field'))
+          expect(browser.value_of('Text Field', start_node: start_node))
+            .to eq('test text')
         end
 
         it 'returns value of Watir::TextArea from start node' do
           browser.fill_in('Text Area', 'test text', start_node: start_node)
-          expect(start_node).to receive(:label).and_return(browser.label(text: 'Text Area'))
-          expect(browser.value_of('Text Area', start_node: start_node)).to eq('test text')
+          expect(start_node).to receive(:label)
+                                  .and_return(field_label('Text Area'))
+          expect(browser.value_of('Text Area', start_node: start_node))
+            .to eq('test text')
         end
 
         it 'returns value of Watir::FileField from start node' do
-          browser.fill_in('File', File.join(HTML_DIR, FORM_PAGE), start_node: start_node)
-          expect(start_node).to receive(:label).and_return(browser.label(text: 'File'))
-          expect(browser.value_of('File', start_node: start_node)).to eq(FORM_PAGE)
+          browser.fill_in('File',
+                          File.join(HTML_DIR, FORM_PAGE),
+                          start_node: start_node
+          )
+          expect(start_node).to receive(:label)
+                                  .and_return(field_label('File'))
+          expect(browser.value_of('File', start_node: start_node))
+            .to eq(FORM_PAGE)
         end
 
         it 'returns value of Watir::OptionGroup from start node' do
           options = %w(Checkbox5 Radio7)
-          browser.fill_in('Checkbox5', options, include_groups: true, start_node: start_node)
-          expect(start_node).to receive(:label).and_return(browser.label(text: 'Checkbox5'))
-          expect(browser.value_of('Checkbox5',
-                                  start_node: start_node,
-                                  include_groups: true
-                                 )
+          browser.fill_in('Radios and Checkboxes',
+                          options,
+                          start_node: start_node
+          )
+          expect(start_node).to receive(:label)
+                                  .and_return(
+                                    field_label('Radios and Checkboxes')
+                                  )
+          expect(browser
+                   .value_of('Radios and Checkboxes', start_node: start_node)
           ).to eq(options)
         end
       end # descibe: with a start node
@@ -394,12 +432,14 @@ module Watir
       describe 'with placeholder: true' do
         it 'returns value of Watir::TextField with given text' do
           browser.fill_in('Placeholder Text', 'Test Text', placeholder: true)
-          expect(browser.value_of('Placeholder Text', placeholder: true)).to eq('Test Text')
+          expect(browser.value_of('Placeholder Text', placeholder: true))
+            .to eq('Test Text')
         end
 
         it 'returns value of Watir::TextArea with given text' do
           browser.fill_in('Placeholder Area', 'Test Text', placeholder: true)
-          expect(browser.value_of('Placeholder Area', placeholder: true)).to eq('Test Text')
+          expect(browser.value_of('Placeholder Area', placeholder: true))
+            .to eq('Test Text')
         end
       end# with placeholder: true
 

data/spec/html/form.html

@@ -51,6 +51,7 @@
       <br />
       <br />
 
+      <label for="checkboxset">Checkboxset</label><br />
       <fieldset id="checkboxset">
         <label for="checkbox1">
           <input type="checkbox" id="checkbox1">Checkbox1
@@ -66,6 +67,7 @@
         </label><br />
       </fieldset><br />
 
+      <label for="radioset">Radioset</label><br />
       <fieldset id="radioset" class="radioset">
         <label for="radio1">
           <input type="radio" name="radioset" id="radio1">Radio1
@@ -78,9 +80,10 @@
         </label><br />
         <label for="radio4">
           <input type="radio" name="radioset" id="radio4">Radio4
-        </label>
-      </fieldset>
+        </label><br />
+      </fieldset><br />
 
+      <label for="radio_and_checkbox">Radios and Checkboxes</label><br />
       <fieldset id="radio_and_checkbox">
         <label for="checkbox5">
           <input type="checkbox" id="checkbox5">Checkbox5

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: watir-formhandler
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Yves Komenda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.11
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.11
+        version: 0.7.0
 description: Adds some convenience methods to fill out forms in Watir.
 email:
 - b_d_v@web.de
@@ -89,20 +89,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Watir formhandler
 test_files:
-- spec/text_area_spec.rb
+- spec/radio_spec.rb
+- spec/file_field_spec.rb
 - spec/watir_spec.rb
-- spec/option_group_spec.rb
 - spec/container_spec.rb
-- spec/select_spec.rb
-- spec/check_box_spec.rb
-- spec/text_field_spec.rb
+- spec/option_group_spec.rb
 - spec/html/form.html
+- spec/text_area_spec.rb
+- spec/check_box_spec.rb
+- spec/select_spec.rb
 - spec/spec_helper.rb
-- spec/file_field_spec.rb
-- spec/radio_spec.rb
+- spec/text_field_spec.rb
 has_rdoc: