page-object 0.6.3 → 0.6.4

data/features/link.feature

@@ -24,6 +24,7 @@ Feature: Links
     | text      |
     | index     |
     | href      |
+    | css       |
 
   Scenario: Support for multiple parameters
     When I select a link labeled "Hello" and index "0"

data/features/sample-app/public/prototype.html

@@ -32,3 +32,4 @@
   </div>
 
 </body>
+</html>

data/features/step_definitions/element_steps.rb

@@ -58,19 +58,19 @@ Then /^I should know it is not visible$/ do
   @element.should_not be_visible
 end
 
-Then /^I should know its' text is "([^"]*)"$/ do |text|
+Then /^I should know the text is "(.*)"$/ do |text|
   @element.text.should == text
 end
 
-Then /^I should know its' text includes "([^"]*)"$/ do |text|
+Then /^I should know the text includes "(.*)"$/ do |text|
   @element.text.should include text
 end
 
-Then /^I should know its' value is "([^"]*)"$/ do |value|
+Then /^I should know the value is "(.*)"$/ do |value|
   @element.value.should == value
 end
 
-Then /^I should know its' value is nil$/ do
+Then /^I should know the value is nil$/ do
   @element.value.should be_nil
 end
 
@@ -78,11 +78,11 @@ Then /^I should know it is equal to itself$/ do
   @element.should == @element
 end
 
-Then /^I should know its' tag name is "([^"]*)"$/ do |tagname|
+Then /^I should know the tag name is "(.+)"$/ do |tagname|
   @element.tag_name.should == tagname
 end
 
-Then /^I should know the attribute "([^"]*)" is false$/ do |attr_name|
+Then /^I should know the attribute "(.+)" is false$/ do |attr_name|
   @attr = @element.attribute(attr_name)
   @attr.should be_false if @attr.is_a? FalseClass
   @attr.should == "false" if @attr.is_a? String
@@ -155,3 +155,19 @@ end
 Then /^I should have a div parent$/ do
   @parent.should be_instance_of ::PageObject::Elements::Div
 end
+
+Then /^I should know that the text_field has the focus$/ do
+  element = @page.element_with_focus
+  element.should_not be_nil
+  element.class.should == PageObject::Elements::TextField
+end
+
+When /^I set the focus to the test text_field$/ do
+  @page.text_field_element(:id => 'onfocus_text_field').focus
+end
+
+When /^I retrieve the label element$/ do
+  @element = @page.label_id_element
+end
+
+

data/features/step_definitions/frames_steps.rb

@@ -42,6 +42,10 @@ Then /^I should verify "([^\"]*)" is in the text field for frame 2 using "([^\"]
   result.should == text
 end
 
+#Then /^I should be able to get the text fields text from frame 2 using "([^\"]*)"$/ do |arg_type|
+#  @page.send("text_field_2_#{arg_type}_element").text
+#end
+
 When /^I type "([^\"]*)" into the text field from frame 1 using "([^\"]*)"$/ do |text, arg_type|
   @page.send "text_field_1_#{arg_type}=".to_sym, text
 end

data/features/step_definitions/generic_element_steps.rb

@@ -0,0 +1,19 @@
+When /^I get the text from the article$/ do
+  @text = @page.article_id
+end
+
+When /^I get the text from the header$/ do
+  @text = @page.header_id
+end
+
+When /^I get the text from the footer$/ do
+	@text = @page.footer_id
+end
+
+When /^I get the text from the summary$/ do
+	@text = @page.summary_id
+end
+
+When /^I get the text from the details$/ do
+	@text = @page.details_id
+end

data/features/step_definitions/label_steps.rb

@@ -0,0 +1,19 @@
+When /^I get the text from the label$/ do
+  @text = @page.label_id
+end
+
+When /^I search for the label by "([^\"]*)"$/ do |how|
+  @text = @page.send "label_#{how}".to_sym
+end
+
+When /^I search for the label by "(.*)" and "(.*)"$/ do |param1, param2|
+  @text = @page.send "label_#{param1}_#{param2}".to_sym
+end
+
+When /^I get the text from a label while the script is executing$/ do
+  @text = @page.label_element(:id => 'label_id').text
+end
+
+Then /^I should see that the label exists$/ do
+  @page.label_id?.should be_true
+end

data/features/support/page.rb

@@ -54,6 +54,7 @@ class Page
   link(:google_search_href, :href => "success.html")
   link(:google_search_text, :text => "Google Search")
   link(:google_search_index, :index => 0)
+  link(:google_search_css, :css => "a.link_class")
 
   select_list(:sel_list_id, :id => "sel_list_id")
   select_list(:sel_list_class, :class => "sel_list_class")
@@ -127,6 +128,7 @@ class Page
   button(:button_xpath, :xpath=> "//input[@type='submit']")
   button(:button_text, :text => 'Click Me')
   button(:button_value, :value => 'Click Me')
+  button(:button_css, :css => "input[type='submit']")
   button(:button_class_index, :class => "button_class", :index => 0)
   button(:button_name_index, :name => "button_name", :index => 0)
 
@@ -256,8 +258,23 @@ class Page
   file_field(:file_field_class_index, :class => 'file_field_class', :index => 0)
   file_field(:file_field_name_index, :name => 'file_field_name', :index => 0)
   file_field(:file_field_xpath, :xpath => "//input[@type='file']")
+
+  label(:label_id, :id => 'label_id')
+  label(:label_name, :name => 'label_name')
+  label(:label_class, :class => 'label_class')
+  label(:label_text, :text => 'page-object is the best!')
+  label(:label_index, :index => 0)
+  label(:label_xpath, :xpath => '//label')
+  label(:label_class_index, :class => "label_class", :index => 0)
+  label(:label_name_index, :name => "label_name", :index => 0)
   
   link(:open_window, :text => 'New Window')
   link(:child, :id => 'child')
+
+  element(:article_id, :article, :id => 'article_id')
+  element(:header_id, :header, :id => 'header_id')
+  element(:footer_id, :footer, :id => 'footer_id')
+  element(:summary_id, :summary, :id => 'summary_id')
+  element(:details_id, :details, :id => 'details_id')
 end
 

data/lib/page-object.rb

@@ -283,6 +283,13 @@ module PageObject
       platform.attach_to_window(identifier, &block)
     end
   end
+
+  #
+  # Find the element that has focus on the page
+  #
+  def element_with_focus
+    platform.element_with_focus
+  end
   
   #
   # Refresh to current page

data/lib/page-object/accessors.rb

@@ -14,12 +14,15 @@ module PageObject
     # 'goto' method to take you to the page.
     #
     # @param [String] the url for the page.
+    # @param [Symbol] a method name to call to get the url
     #
     def page_url(url)
       define_method("goto") do
+        url = url.kind_of?(Symbol) ? self.send(url) : url
         platform.navigate_to url
       end
     end
+    alias_method :direct_url, :page_url
 
     #
     # Creates a method that compares the expected_title of a page against the actual.
@@ -111,7 +114,7 @@ module PageObject
         self.send("#{name}_element").value
       end
       define_method("#{name}=") do |value|
-         return platform.text_field_value_set(identifier.clone, value) unless block_given?
+        return platform.text_field_value_set(identifier.clone, value) unless block_given?
         self.send("#{name}_element").value = value
       end
       define_method("#{name}_element") do
@@ -261,6 +264,7 @@ module PageObject
     # @param [Hash] identifier how we find a link.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
+    #   * :css => Watir and Selenium
     #   * :href => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
@@ -392,6 +396,7 @@ module PageObject
     # @param [Hash] identifier how we find a button.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -982,5 +987,72 @@ module PageObject
         platform.file_field_for(identifier.clone).exists?
       end
     end
+
+    #
+    # adds three methods - one to retrieve the text from a label,
+    # another to return the label element, and another to check the label's existence.
+    #
+    # @example
+    #   label(:message, :id => 'message')
+    #   # will generate 'message', 'message_element', and 'message?' methods
+    #
+    # @param [String] the name used for the generated methods
+    # @param [Hash] identifier how we find a label.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :text => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    # @param optional block to be invoked when element method is called
+    #
+    def label(name, identifier=nil, &block)
+      define_method(name) do
+        return platform.label_text_for identifier.clone unless block_given?
+        self.send("#{name}_element").text
+      end
+      define_method("#{name}_element") do
+        return call_block(&block) if block_given?
+        platform.label_for(identifier.clone)
+      end
+      define_method("#{name}?") do
+        return call_block(&block).exists? if block_given?
+        platform.label_for(identifier.clone).exists?
+      end
+      alias_method "#{name}_label".to_sym, "#{name}_element".to_sym
+    end
+
+    #
+    # adds three methods - one to retrieve the text of an element, another
+    # to retrieve an element, and another to check the element's existence.
+    #
+    # @example
+    #   element(:title, :id => 'title')
+    #   # will generate 'title', 'title_element', and 'title?' methods
+    #
+    # @param [String] the name used for the generated methods
+    # @param [Hash] identifier how we find an element.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    # @param optional block to be invoked when element method is called
+    #
+    def element(name, tag, identifier=nil, &block)
+      define_method("#{name}") do
+        self.send("#{name}_element").text
+      end
+      define_method("#{name}_element") do
+        return call_block(&block) if block_given?
+        platform.element_for(tag, identifier.clone)
+      end
+      define_method("#{name}?") do
+        self.send("#{name}_element").exists?
+      end      
+    end
+
   end
 end

data/lib/page-object/element_locators.rb

@@ -7,6 +7,7 @@ module PageObject
     # @param [Hash] identifier how we find a button.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -26,6 +27,7 @@ module PageObject
     # @param [Hash] identifier how we find a button.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
+    #   * :css => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -189,6 +191,7 @@ module PageObject
     # @param [Hash] identifier how we find a link.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
+    #   * :css => Watir and Selenium
     #   * :href => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
@@ -208,6 +211,7 @@ module PageObject
     # @param [Hash] identifier how we find a link.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
+    #   * :css => Watir and Selenium
     #   * :href => Watir and Selenium
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
@@ -763,6 +767,38 @@ module PageObject
       platform.paragraphs_for(identifier.clone)
     end
 
+    #
+    # Finds a label
+    #
+    # @param [Hash] identifier how we find a label.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :text => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def label_element(identifier)
+      platform.label_for(identifier.clone)
+    end
+
+    #
+    # Finds all labels that match the provided identifier
+    #
+    # @param [Hash] identifier how we find a label.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :text => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def label_elements(identifier)
+      platform.labels_for(identifier.clone)
+    end
+
     #
     # Finds a paragraph
     #

data/lib/page-object/elements.rb

@@ -17,7 +17,7 @@ module PageObject
       # method to return the element for a tag_name
       #
       def element_class_for(tag_name, type=nil)
-        return type_to_class[type] if type
+        return type_to_class[type.to_sym] if type
         tag_to_class[tag_name.to_sym] || ::PageObject::Elements::Element
       end
       
@@ -48,5 +48,6 @@ require 'page-object/elements/ordered_list'
 require 'page-object/elements/option'
 require 'page-object/elements/heading'
 require 'page-object/elements/paragraph'
+require 'page-object/elements/label'
 require 'page-object/elements/file_field'
 

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

@@ -11,11 +11,11 @@ module PageObject
       protected
 
       def self.watir_finders
-        super + [:text, :value, :src, :alt]
+        super + [:text, :value, :src, :alt, :css]
       end
 
       def self.selenium_finders
-        super + [:value, :src, :alt]
+        super + [:value, :src, :alt, :css]
       end
 
       def include_platform_for platform

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

@@ -22,21 +22,21 @@ module PageObject
       # click the element
       #
       def click
-        @element.click
+        element.click
       end
 
       #
       # double click the element
       #
       def double_click
-        @element.double_click
+        element.double_click
       end
 
       #
       # return true if the element is enabled
       #
       def enabled?
-        @element.enabled?
+        element.enabled?
       end
 
       #
@@ -50,11 +50,11 @@ module PageObject
       # get the value of the given CSS property
       #
       def style(property)
-        @element.style property
+        element.style property
       end
       
       def inspect
-        @element.inspect
+        element.inspect
       end
 
       # @private
@@ -105,7 +105,7 @@ module PageObject
       protected
 
       def self.should_build_watir_xpath identifier
-        ['table', 'span', 'div', 'td', 'li', 'ul', 'ol', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p'].include? identifier[:tag_name] and identifier[:name]
+        ['table', 'span', 'div', 'td', 'li', 'ul', 'ol', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'label'].include? identifier[:tag_name] and identifier[:name]
       end
 
       def self.build_xpath_for identifier

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

@@ -0,0 +1,19 @@
+module PageObject
+  module Elements
+    class Label < Element
+
+      protected
+
+      def self.watir_finders
+        super + [:text]
+      end
+
+      def self.selenium_finders
+        super + [:text]
+      end
+
+    end
+
+    ::PageObject::Elements.tag_to_class[:label] = ::PageObject::Elements::Label
+  end
+end