page-object 0.6.3 → 0.6.4

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

@@ -7,14 +7,14 @@ module PageObject
         # Return the width of the image.
         #
         def width
-          @element.width
+          element.width
         end
 
         #
         # Return the height of the image
         #
         def height
-          @element.height
+          element.height
         end
       end
     end

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

@@ -110,7 +110,7 @@ module PageObject
         # See PageObject#execute_script
         #
         def execute_script(script)
-          @browser.wd.execute_script(script)
+          @browser.execute_script(script)
         end
     
         #
@@ -122,6 +122,13 @@ module PageObject
           @browser.window(win_id).use &block
         end
 
+        def element_with_focus
+          element = browser.execute_script("return document.activeElement")
+          type = element.type.to_sym if element.tag_name.to_sym == :input
+          cls = ::PageObject::Elements.element_class_for(element.tag_name, type)
+          cls.new(element, :platform => :watir_webdriver)    
+        end
+
         #
         # platform method to switch to a frame and execute a block
         # See PageObject#in_frame
@@ -130,7 +137,6 @@ module PageObject
           frame = [] if frame.nil?
           frame << identifier
           block.call(frame)
-
         end
     
         #
@@ -297,8 +303,8 @@ module PageObject
         # See PageObject::Accessors#link
         #
         def click_link_for(identifier)
-          process_watir_call("link(identifier).click if identifier", Elements::Link,
-                             identifier)
+          call = call_for_watir_element(identifier, "link(identifier)")
+          process_watir_call("#{call}.click if identifier", Elements::Link, identifier)
         end
 
         #
@@ -306,14 +312,16 @@ module PageObject
         # see PageObject::Accessors#link
         #
         def link_for(identifier)
-          find_watir_element("link(identifier)", Elements::Link, identifier)
+          call = call_for_watir_element(identifier, "link(identifier)")
+          find_watir_element(call, Elements::Link, identifier)
         end
 
         #
         # platform method to retrieve an array of link elements
         #
         def links_for(identifier)
-          find_watir_elements("links(identifier)", Elements::Link, identifier)
+          call = call_for_watir_elements(identifier, "links(identifier)")
+          find_watir_elements(call, Elements::Link, identifier)
         end
 
         #
@@ -445,7 +453,8 @@ module PageObject
         # See PageObject::Accessors#button
         #
         def click_button_for(identifier)
-          process_watir_call("button(identifier).click", Elements::Button, identifier)
+          call = call_for_watir_element(identifier, "button(identifier)")
+          process_watir_call("#{call}.click", Elements::Button, identifier)
         end
 
         #
@@ -453,14 +462,16 @@ module PageObject
         # See PageObject::Accessors#button
         #
         def button_for(identifier)
-          find_watir_element("button(identifier)", Elements::Button, identifier)
+          call = call_for_watir_element(identifier, "button(identifier)")
+          find_watir_element(call, Elements::Button, identifier)
         end
 
         #
         # platform method to retrieve an array of button elements
         #
         def buttons_for(identifier)
-          find_watir_elements("buttons(identifier)", Elements::Button, identifier)
+          call = call_for_watir_elements(identifier, "buttons(identifier)")
+          find_watir_elements(call, Elements::Button, identifier)
         end
 
         #
@@ -746,6 +757,30 @@ module PageObject
           find_watir_elements("ps(identifier)", Elements::Paragraph, identifier, 'p')
         end
 
+        #
+        # platform method to return the text for a label
+        # See PageObject::Accessors#label
+        #
+        def label_text_for(identifier)
+          process_watir_call("label(identifier).text", Elements::Label, identifier, nil, 'label')
+        end
+
+        #
+        # platform method to return a PageObject::Elements::Label element
+        # See PageObject::Accessors#label
+        #
+        def label_for(identifier)
+          find_watir_element("label(identifier)", Elements::Label, identifier, 'label')
+        end
+
+        #
+        #
+        # platform method to retrieve an array of label elements
+        #
+        def labels_for(identifier)
+          find_watir_elements("labels(identifier)", Elements::Label, identifier, 'label')
+        end
+
         #
         # platform method to set the file on a file_field element
         # See PageObject::Accessors#file_field
@@ -763,6 +798,18 @@ module PageObject
           find_watir_element("file_field(identifier)", Elements::FileField, identifier)
         end
 
+        #
+        # platform method to return a PageObject::Elements::Element element
+        # See PageObject::Accessors#elem
+        #
+        def element_for(tag, identifier)
+          find_watir_element("#{tag.to_s}(identifier)", Elements::Element, identifier, tag.to_s)
+        end
+
+        def elements_for(tag, identifier)
+          find_watir_elements("#{tag.to_s}s(identifier)", Elements::Element, identifier, tag.to_s)
+        end
+
         private
     
         def find_watir_elements(the_call, type, identifier, tag_name=nil)
@@ -814,6 +861,22 @@ module PageObject
           @browser.wd.switch_to.default_content unless frame_identifiers.nil?          
         end
 
+        def css_element
+          "element(identifier)"
+        end
+
+        def css_elements
+          "elements(identifier)"
+        end
+
+        def call_for_watir_element(identifier, call)
+          identifier[:css] ? "#{css_element}" : call
+        end
+
+        def call_for_watir_elements(identifier, call)
+          identifier[:css] ? "#{css_elements}" : call          
+        end
+
         def switch_to_frame(frame_identifiers)
           unless frame_identifiers.nil?
             frame_identifiers.each do |frame_id|

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

@@ -17,7 +17,7 @@ module PageObject
         # Select a value from the list
         #
         def select(value)
-          @element.select(value)
+          element.select(value)
         end
 
         #
@@ -27,7 +27,7 @@ module PageObject
         #
         def options
           elements = []
-          options = @element.wd.find_elements(:xpath, child_xpath)
+          options = element.wd.find_elements(:xpath, child_xpath)
           options.each do |opt|
             elements << Object::PageObject::Elements::Option.new(opt, :platform => :watir_webdriver)
           end
@@ -38,7 +38,7 @@ module PageObject
         # @return [Array<String>] An array of strings representing the text value of the currently selected options.
         #
         def selected_options
-          @element.selected_options.map { |e| e.text }.compact
+          element.selected_options.map { |e| e.text }.compact
         end
 
         #
@@ -47,7 +47,7 @@ module PageObject
         # @param [String, Regexp] value A value.
         # @return [Boolean]
         def include?(value)
-          @element.include? value
+          element.include? value
         end
         
         #
@@ -56,7 +56,7 @@ module PageObject
         # @param [String, Regexp] value A value.
         # @return [Boolean]
         def selected?(value)
-          @element.selected? value
+          element.selected? value
         end
       end
     end

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

@@ -11,7 +11,7 @@ module PageObject
         # @return [PageObject::Elements::TableRow]
         #
         def [](idx)
-          Object::PageObject::Elements::TableRow.new(@element[idx], :platform => :watir_webdriver)
+          Object::PageObject::Elements::TableRow.new(element[idx], :platform => :watir_webdriver)
         end
 
         #
@@ -24,4 +24,4 @@ module PageObject
       end
     end
   end
-end
+end

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/page-object.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'watir-webdriver', '>= 0.5.3'
+  s.add_dependency 'watir-webdriver', '>= 0.5.4'
   s.add_dependency 'selenium-webdriver', '>= 2.20.0' 
   
   s.add_development_dependency 'rspec', '>= 2.6.0'

data/spec/page-object/accessors_spec.rb

@@ -130,17 +130,29 @@ describe PageObject::Accessors do
   describe "goto a page" do
     it "should navigate to a page when requested" do
       watir_browser.should_receive(:goto)
-      page = AccessorsTestPageObject.new(watir_browser, true)
+      AccessorsTestPageObject.new(watir_browser, true)
+    end
+
+    it "should call a method when page_url called with a symbol" do
+      class SymbolPageUrl
+        include PageObject
+        page_url :custom_url
+        def custom_url
+          "custom"
+        end
+      end
+      watir_browser.should_receive(:goto).with('custom')
+      SymbolPageUrl.new(watir_browser, true)
     end
 
     it "should not navigate to a page when not requested" do
       watir_browser.should_not_receive(:goto)
-      page = AccessorsTestPageObject.new(watir_browser)
+      AccessorsTestPageObject.new(watir_browser)
     end
 
     it "should not navigate to a page when 'page_url' not specified" do
       watir_browser.should_not_receive(:goto)
-      page = BlockPageObject.new(watir_browser, true)
+      BlockPageObject.new(watir_browser, true)
     end
   end
 

data/spec/page-object/element_locators_spec.rb

@@ -299,6 +299,18 @@ describe PageObject::ElementLocators do
       elements[0].should be_instance_of PageObject::Elements::Paragraph 
     end
 
+    it "should find a label" do
+      watir_browser.should_receive(:label).with(:id => 'blah').and_return(watir_browser)
+      element = watir_page_object.label_element(:id => 'blah')
+      element.should be_instance_of PageObject::Elements::Label
+    end
+
+    it "should find all label elements" do
+      watir_browser.should_receive(:labels).with(:id => 'blah').and_return([watir_browser])
+      elements = watir_page_object.label_elements(:id => 'blah')
+      elements[0].should be_instance_of PageObject::Elements::Label
+    end    
+
     it "should find a file field element" do
       watir_browser.should_receive(:file_field).with(:id => 'blah').and_return(watir_browser)
       element = watir_page_object.file_field_element(:id => 'blah')
@@ -599,6 +611,18 @@ describe PageObject::ElementLocators do
       elements[0].should be_instance_of PageObject::Elements::Paragraph 
     end
 
+    it "should find a label" do
+      selenium_browser.should_receive(:find_element).with(:id, 'blah').and_return(selenium_browser)
+      element = selenium_page_object.label_element(:id => 'blah')
+      element.should be_instance_of PageObject::Elements::Label
+    end
+
+    it "should find all label elements" do
+      selenium_browser.should_receive(:find_elements).with(:id, 'blah').and_return([selenium_browser])
+      elements = selenium_page_object.label_elements(:id => 'blah')
+      elements[0].should be_instance_of PageObject::Elements::Label
+    end    
+
     it "should find a file field element" do
       selenium_browser.should_receive(:find_element).with(:id, 'blah').and_return(selenium_browser)
       element = selenium_page_object.file_field_element(:id => 'blah')

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

@@ -6,14 +6,14 @@ describe PageObject::Elements::Button do
 
   context "when mapping how to find an element" do
     it "should map watir types to same" do
-      [:class, :id, :index, :name, :value, :xpath, :src, :alt].each do |t|
+      [:class, :id, :index, :name, :value, :xpath, :src, :alt, :css].each do |t|
         identifier = button.watir_identifier_for t => 'value'
         identifier.keys.first.should == t
       end
     end
 
     it "should map selenium types to same" do
-      [:class, :id, :index, :name, :value, :xpath, :src, :alt].each do |t|
+      [:class, :id, :index, :name, :value, :xpath, :src, :alt, :css].each do |t|
         key, value = button.selenium_identifier_for t => 'value'
         key.should == t
       end

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

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'page-object/elements'
+
+describe PageObject::Elements::Label do
+  let(:label) { PageObject::Elements::Label }
+
+  describe "when mapping how to find an element" do
+    it "should map watir types to same" do
+      [:class, :id, :text, :index, :xpath].each do |t|
+        identifier = label.watir_identifier_for t => 'value'
+        identifier.keys.first.should == t
+      end
+    end
+
+    it "should map selenium types to same" do
+      [:class, :id, :text, :index, :xpath].each do |t|
+        key, value = label.selenium_identifier_for t => 'value'
+        key.should == t
+      end
+    end
+
+    describe "interface" do
+      it "should register with tag :label" do
+        ::PageObject::Elements.element_class_for(:label).should == ::PageObject::Elements::Label
+      end
+    end
+  end
+end
+

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

@@ -6,7 +6,7 @@ describe PageObject::Elements::Link do
 
   describe "when mapping how to find an element" do
     it "should map watir types to same" do
-      [:class, :href, :id, :index, :name, :text, :xpath].each do |t|
+      [:class, :href, :id, :index, :name, :text, :xpath, :css].each do |t|
         identifier = link.watir_identifier_for t => 'value'
         identifier.keys.first.should == t
       end
@@ -20,7 +20,7 @@ describe PageObject::Elements::Link do
     end
 
     it "should map selenium types to same" do
-      [:class, :id, :link, :link_text, :name, :xpath, :index].each do |t|
+      [:class, :id, :link, :link_text, :name, :xpath, :index, :css].each do |t|
         key, value = link.selenium_identifier_for t => 'value'
         key.should == t
       end

data/spec/page-object/page-object_spec.rb

@@ -75,6 +75,13 @@ describe PageObject do
         @page = CallbackPage.new(watir_browser)
         @page.initialize_page.should be_true
       end
+
+      it "should know which element has focus" do
+        watir_browser.should_receive(:execute_script).and_return(watir_browser)
+        watir_browser.should_receive(:tag_name).twice.and_return(:input)
+        watir_browser.should_receive(:type).and_return(:submit)
+        watir_page_object.element_with_focus.class.should == PageObject::Elements::Button
+      end
     end
     
     context "when using WatirPageObject" do
@@ -131,7 +138,6 @@ describe PageObject do
       end
 
       it "should execute javascript on the browser" do
-        watir_browser.should_receive(:wd).and_return(watir_browser)
         watir_browser.should_receive(:execute_script).and_return("abc")
         watir_page_object.execute_script("333").should == "abc"
       end

data/spec/page-object/page_factory_spec.rb

@@ -6,6 +6,11 @@ class FactoryTestPage
   page_url "http://google.com"
 end
 
+class TestPageWithDirectUrl
+  include PageObject
+  direct_url "http//google.com"
+end
+
 class AnotherPage
   include PageObject
 end
@@ -33,12 +38,33 @@ describe PageObject::PageFactory do
     end
   end
 
+  it "should create a new page object and execute a block using 'on'" do
+    @world.browser.should_not_receive(:goto)
+    @world.on FactoryTestPage do |page|
+      page.should be_instance_of FactoryTestPage
+    end
+  end
+
   it "should create and visit a new page" do
     @world.browser.should_receive(:goto)
     @world.visit_page FactoryTestPage do |page|
       page.should be_instance_of FactoryTestPage
     end
   end
+
+  it "should create and visit a new page using 'visit'" do
+    @world.browser.should_receive(:goto)
+    @world.visit FactoryTestPage do |page|
+      page.should be_instance_of FactoryTestPage
+    end
+  end
+
+  it "should create and visit a new page when url is defined as 'direct_url'" do
+    @world.browser.should_receive(:goto)
+    @world.visit TestPageWithDirectUrl do |page|
+      page.should be_instance_of TestPageWithDirectUrl
+    end
+  end
   
   it "should set an instance variable that can be used outside of the block" do
     page = @world.on_page FactoryTestPage