page-object 0.5.4 → 0.5.5

data/lib/page-object/elements/span.rb

@@ -12,5 +12,8 @@ module PageObject
         [:class, :id, :name, :text, :xpath, :index]
       end
     end
+
+    ::PageObject::Elements.tag_to_class[:span] = ::PageObject::Elements::Span
+    
   end
-end
+end

data/lib/page-object/elements/table.rb

@@ -57,5 +57,7 @@ module PageObject
         end
       end
     end
+
+    ::PageObject::Elements.tag_to_class[:table] = ::PageObject::Elements::Table
   end
 end

data/lib/page-object/elements/table_cell.rb

@@ -13,5 +13,9 @@ module PageObject
       end
 
     end
+
+    ::PageObject::Elements.tag_to_class[:td] = ::PageObject::Elements::TableCell
+    ::PageObject::Elements.tag_to_class[:th] = ::PageObject::Elements::TableCell
+    
   end
-end
+end

data/lib/page-object/elements/table_row.rb

@@ -39,5 +39,7 @@ module PageObject
         end
       end
     end
+
+    ::PageObject::Elements.tag_to_class[:tr] = ::PageObject::Elements::TableRow
   end
 end

data/lib/page-object/elements/text_area.rb

@@ -39,5 +39,8 @@ module PageObject
         end
       end
     end
+
+    ::PageObject::Elements.tag_to_class[:textarea] = ::PageObject::Elements::TextArea
+    
   end
 end

data/lib/page-object/elements/text_field.rb

@@ -39,5 +39,8 @@ module PageObject
         end
       end
     end
+
+    ::PageObject::Elements.type_to_class[:text] = ::PageObject::Elements::TextField
+    ::PageObject::Elements.type_to_class[:password] = ::PageObject::Elements::TextField
   end
 end

data/lib/page-object/elements/unordered_list.rb

@@ -43,7 +43,9 @@ module PageObject
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
-
     end
+
+    ::PageObject::Elements.tag_to_class[:ul] = ::PageObject::Elements::UnorderedList
+    
   end
 end

data/lib/page-object/page_populator.rb

@@ -31,9 +31,9 @@ module PageObject
     #
     def populate_page_with(data)
       data.each do |key, value|
-        populate_checkbox(key, value) if is_checkbox?(key)
-        populate_radiobutton(key, value) if is_radiobutton?(key)
-        populate_text(key, value) if is_text?(key)
+        populate_checkbox(key, value) if is_checkbox?(key) and is_enabled?(key)
+        populate_radiobutton(key, value) if is_radiobutton?(key) and is_enabled?(key)
+        populate_text(key, value) if is_text?(key) and is_enabled?(key)
       end
     end
 
@@ -64,5 +64,9 @@ module PageObject
     def is_radiobutton?(key)
       respond_to?("select_#{key}".to_sym)
     end
+
+    def is_enabled?(key)
+      self.send("#{key}_element").enabled?
+    end
   end
 end

data/lib/page-object/platforms/selenium_webdriver/element.rb

@@ -1,3 +1,5 @@
+require 'watir-webdriver/atoms'
+
 module PageObject
   module Platforms
     #
@@ -5,6 +7,7 @@ module PageObject
     #
     module SeleniumWebDriver
       module Element
+        include Watir::Atoms
 
         #
         # return true if an element is visible
@@ -88,6 +91,36 @@ module PageObject
           @element.attribute attribute_name
         end
 
+        #
+        # Fire the provided event on the current element
+        #
+        def fire_event(event_name)
+          event_name = event_name.to_s.sub(/^on/, '').downcase
+          script = "return (%s).apply(null, arguments)" % ATOMS.fetch(:fireEvent)
+          bridge = @element.instance_variable_get(:@bridge)
+          bridge.executeScript(script, @element, event_name)
+        end
+
+        #
+        # find the parent element
+        #
+        def parent
+          script = "return (%s).apply(null, arguments)" % ATOMS.fetch(:getParentElement)
+          bridge = @element.instance_variable_get(:@bridge)
+          parent = bridge.executeScript(script, @element)
+          type = @element.type if parent.tag_name.to_sym == :input
+          cls = ::PageObject::Elements.element_class_for(parent.tag_name, type)
+          cls.new(parent, :platform => :selenium_webdriver)
+        end
+
+        #
+        # Set the focus to the current element
+        #
+        def focus
+          bridge = @element.instance_variable_get(:@bridge)
+          bridge.executeScript("return arguments[0].focus()", @element)
+        end
+
         #
         # Click this element
         #

data/lib/page-object/platforms/selenium_webdriver/page_object.rb

@@ -800,18 +800,20 @@ module PageObject
 
         def supported_identifier(identifier, tag, additional)
           return false if identifier[:index]
-          return false if identifier[:text] and tag == 'input' and additional[:type] == 'hidden'
+          return false if identifier[:action] and tag == 'form'
+          return false if identifier[:alt] and tag == 'img'
+          return false if identifier[:alt] and tag == 'input' and
+            ['submit', 'image', 'button', 'reset'].include? additional[:type]
           return false if identifier[:href] and tag == 'a'
+          return false if identifier[:src] and tag == 'input' and
+            ['submit', 'image', 'button', 'reset'].include? additional[:type]
+          return false if identifier[:src] and tag == 'img'
+          return false if identifier[:text] and tag == 'input' and additional[:type] == 'hidden'
           return false if identifier[:text] and ['div', 'span', 'td'].include? tag
-          return false if identifier[:value] and tag == 'input' and additional[:type] == 'submit'
-          return false if identifier[:src] and tag == 'input' and additional[:type] == 'submit'
-          return false if identifier[:alt] and tag == 'input' and additional[:type] == 'submit'
           return false if identifier[:title] and tag == 'input' and additional[:type] == 'text'
-          return false if identifier[:value] and tag == 'input' and additional[:type] == 'radio'
           return false if identifier[:title] and tag == 'input' and additional[:type] == 'file'
-          return false if identifier[:action] and tag == 'form'
-          return false if identifier[:alt] and tag == 'img'
-          return false if identifier[:src] and tag == 'img'
+          return false if identifier[:value] and tag == 'input' and
+            ['radio', 'submit', 'image', 'button', 'reset', 'checkbox', 'hidden'].include? additional[:type]
           true
         end
 

data/lib/page-object/platforms/watir_webdriver/element.rb

@@ -88,6 +88,30 @@ module PageObject
           @element.attribute_value attribute_name
         end
 
+        #
+        # Fire the provided event on the current element
+        #
+        def fire_event(event_name)
+          @element.fire_event(event_name)
+        end
+
+        #
+        # find the parent element
+        #
+        def parent
+          parent = @element.parent
+          type = @element.type if parent.tag_name.to_sym == :input
+          cls = ::PageObject::Elements.element_class_for(parent.tag_name, type)
+          cls.new(parent, :platform => :watir_webdriver)
+        end
+
+        #
+        # Set the focus to the current element
+        #
+        def focus
+          @element.focus
+        end
+        
         #
         # Waits until the element is present
         #

data/lib/page-object/platforms/watir_webdriver/file_field.rb

@@ -5,7 +5,7 @@ module PageObject
       module FileField
         
         #
-        # Set the value of the Fileield
+        # Set the value of the FileField
         #
         def value=(new_value)
           element.set(new_value)

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/spec/page-object/elements/button_spec.rb

@@ -23,6 +23,22 @@ describe PageObject::Elements::Button do
   describe "interface" do
     let(:button_element) { double('button_element') }
 
+    it "should register with type :submit" do
+      ::PageObject::Elements.element_class_for(:input, :submit).should == ::PageObject::Elements::Button
+    end
+
+    it "should register with type :image" do
+      ::PageObject::Elements.element_class_for(:input, :image).should == ::PageObject::Elements::Button
+    end
+
+    it "should register with type :button" do
+      ::PageObject::Elements.element_class_for(:input, :button).should == ::PageObject::Elements::Button
+    end
+
+    it "should retisger with type :reset" do
+      ::PageObject::Elements.element_class_for(:input, :reset).should == ::PageObject::Elements::Button
+    end
+
     context "for selenium" do
       it "should return error when asked for its' text" do
         button = PageObject::Elements::Button.new(button_element, :platform => :selenium_webdriver)

data/spec/page-object/elements/check_box_spec.rb

@@ -6,13 +6,13 @@ describe PageObject::Elements::CheckBox do
 
   describe "when mapping how to find an element" do
     it "should map watir types to same" do
-      [:class, :id, :index, :name, :xpath].each do |t|
+      [:class, :id, :index, :name, :xpath, :value].each do |t|
         identifier = checkbox.watir_identifier_for t => 'value'
         identifier.keys.first.should == t
       end
     end
     it "should map selenium types to same" do
-      [:class, :id, :name, :xpath, :index].each do |t|
+      [:class, :id, :name, :xpath, :index, :value].each do |t|
         key, value = checkbox.selenium_identifier_for t => 'value'
         key.should == t
       end
@@ -23,6 +23,9 @@ describe PageObject::Elements::CheckBox do
     let(:check_box) { double('check_box') }
     let(:selenium_cb) { PageObject::Elements::CheckBox.new(check_box, :platform => :selenium_webdriver) }
 
+    it "should register with type :checkbox" do
+      ::PageObject::Elements.element_class_for(:input, :checkbox).should == ::PageObject::Elements::CheckBox
+    end
     
     context "for selenium" do
       it "should check" do

data/spec/page-object/elements/div_spec.rb

@@ -18,5 +18,11 @@ describe PageObject::Elements::Div do
         key.should == t
       end
     end
+
+    describe "interface" do
+      it "should register with tag :div" do
+        ::PageObject::Elements.element_class_for(:div).should == ::PageObject::Elements::Div
+      end
+    end
   end
-end
+end

data/spec/page-object/elements/file_field_spec.rb

@@ -23,6 +23,10 @@ describe PageObject::Elements::FileField do
 
   describe "interface" do
     let(:filefield) { double('file_field') }
+
+    it "should register as type :file" do
+      ::PageObject::Elements.element_class_for(:input, :file).should == ::PageObject::Elements::FileField
+    end
     
     context "for selenium" do
       it "should set its' value" do

data/spec/page-object/elements/form_spec.rb

@@ -5,6 +5,10 @@ describe PageObject::Elements::Form do
   describe "interface" do
     let(:form_element) { double('form_element') }
 
+    it "should register with tag_name :form" do
+      ::PageObject::Elements.element_class_for(:form).should == ::PageObject::Elements::Form
+    end
+
     context "for watir" do
       it "should submit a form" do
         form = PageObject::Elements::Form.new(form_element, :platform => :watir_webdriver)
@@ -21,4 +25,4 @@ describe PageObject::Elements::Form do
       end
     end
   end
-end
+end

data/spec/page-object/elements/heading_spec.rb

@@ -19,4 +19,30 @@ describe PageObject::Elements::Heading do
       end
     end
   end
-end
+
+  describe "interface" do
+    it "should register with tag :h1" do
+      ::PageObject::Elements.element_class_for(:h1).should == ::PageObject::Elements::Heading
+    end
+
+    it "should register with tag :h2" do
+      ::PageObject::Elements.element_class_for(:h2).should == ::PageObject::Elements::Heading
+    end
+
+    it "should register with tag :h3" do
+      ::PageObject::Elements.element_class_for(:h3).should == ::PageObject::Elements::Heading
+    end
+
+    it "should register with tag :h4" do
+      ::PageObject::Elements.element_class_for(:h4).should == ::PageObject::Elements::Heading
+    end
+
+    it "should register with tag :h5" do
+      ::PageObject::Elements.element_class_for(:h5).should == ::PageObject::Elements::Heading
+    end
+
+    it "should register with tag :h6" do
+      ::PageObject::Elements.element_class_for(:h6).should == ::PageObject::Elements::Heading
+    end
+  end
+end

data/spec/page-object/elements/hidden_field_spec.rb

@@ -6,7 +6,7 @@ describe PageObject::Elements::HiddenField do
 
   describe "when mapping how to find an element" do
     it "should map watir types to same" do
-      [:class, :id, :index, :name, :tag_name, :text, :xpath].each do |t|
+      [:class, :id, :index, :name, :tag_name, :text, :xpath, :value].each do |t|
         identifier = hiddenfield.watir_identifier_for t => 'value'
         identifier.keys.first.should == t
       end
@@ -18,7 +18,7 @@ describe PageObject::Elements::HiddenField do
     end
 
     it "should map selenium types to same" do
-      [:class, :css, :id, :name, :xpath, :index].each do |t|
+      [:class, :css, :id, :name, :xpath, :index, :value].each do |t|
         key, value = hiddenfield.selenium_identifier_for t => 'value'
         key.should == t
       end
@@ -29,4 +29,10 @@ describe PageObject::Elements::HiddenField do
       key.should == :css
     end
   end
-end
+
+  describe "interface" do
+    it "should register with type :hidden" do
+      ::PageObject::Elements.element_class_for(:input, :hidden).should == ::PageObject::Elements::HiddenField
+    end
+  end
+end

data/spec/page-object/elements/image_spec.rb

@@ -27,6 +27,10 @@ describe PageObject::Elements::Image do
       image_element.stub(:size).and_return(image_element)
     end
 
+    it "should register with tag_name :img" do
+      ::PageObject::Elements.element_class_for(:img).should == ::PageObject::Elements::Image
+    end
+
     context "for watir" do
       it "should know the images width" do
         image = PageObject::Elements::Image.new(image_element, :platform => :watir_webdriver)

data/spec/page-object/elements/link_spec.rb

@@ -35,6 +35,10 @@ describe PageObject::Elements::Link do
   describe "interface" do
     let(:link_element) { double('link_element') }
 
+    it "should register with tag :a" do
+      ::PageObject::Elements.element_class_for(:a).should == ::PageObject::Elements::Link
+    end
+
     context "for selenium" do
       it "should return error when asked for its' value" do
         link = PageObject::Elements::Link.new(link_element, :platform => :selenium_webdriver)
@@ -42,4 +46,4 @@ describe PageObject::Elements::Link do
       end
     end
   end
-end
+end

data/spec/page-object/elements/list_item_spec.rb

@@ -18,5 +18,11 @@ describe PageObject::Elements::ListItem do
         key.should == t
       end
     end
+
+    describe "interface" do
+      it "should register as tag_name :li" do
+        ::PageObject::Elements.element_class_for(:li).should == ::PageObject::Elements::ListItem
+      end
+    end
   end
-end
+end

data/spec/page-object/elements/option_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'page-object/elements'
+
+describe PageObject::Elements::Option do
+
+  describe "interface" do
+    it "should register as tag_name :option" do
+      ::PageObject::Elements.element_class_for(:option).should == ::PageObject::Elements::Option
+    end
+  end
+end

data/spec/page-object/elements/ordered_list_spec.rb

@@ -23,6 +23,10 @@ describe PageObject::Elements::OrderedList do
   describe "interface" do
     let(:ol_element) { double('ol_element') }
 
+    it "should register as tag_name :ol" do
+      ::PageObject::Elements.element_class_for(:ol).should == ::PageObject::Elements::OrderedList
+    end
+
     context "for watir" do
       it "should return a list item when indexed" do
         ol = PageObject::Elements::OrderedList.new(ol_element, :platform => :watir_webdriver)
@@ -76,4 +80,4 @@ describe PageObject::Elements::OrderedList do
       end
     end
   end
-end
+end