page-object 0.2.5 → 0.3.0

data/lib/page-object/platforms/{watir → watir_webdriver}/radio_button.rb

@@ -1,6 +1,6 @@
 module PageObject
   module Platforms
-    module Watir
+    module WatirWebDriver
       module RadioButton
 
         #

data/lib/page-object/platforms/{watir → watir_webdriver}/select_list.rb

@@ -1,6 +1,6 @@
 module PageObject
   module Platforms
-    module Watir
+    module WatirWebDriver
       module SelectList
 
         #
@@ -10,7 +10,7 @@ module PageObject
         # @return [PageObject::Elements::Option]
         #
         def [](idx)
-          PageObject::Elements::Option.new(options[idx], :platform => :watir)
+          Object::PageObject::Elements::Option.new(options[idx], :platform => :watir_webdriver)
         end
 
         #
@@ -29,7 +29,7 @@ module PageObject
           elements = []
           options = @element.wd.find_elements(:xpath, child_xpath)
           options.each do |opt|
-            elements << PageObject::Elements::Option.new(opt, :platform => :watir)
+            elements << Object::PageObject::Elements::Option.new(opt, :platform => :watir_webdriver)
           end
           elements
         end

data/lib/page-object/platforms/{watir → watir_webdriver}/table.rb

@@ -1,6 +1,6 @@
 module PageObject
   module Platforms
-    module Watir
+    module WatirWebDriver
 
       module Table
 
@@ -11,7 +11,7 @@ module PageObject
         # @return [PageObject::Elements::TableRow]
         #
         def [](idx)
-          PageObject::Elements::TableRow.new(@element[idx], :platform => :watir)
+          Object::PageObject::Elements::TableRow.new(@element[idx], :platform => :watir_webdriver)
         end
 
         #

data/lib/page-object/platforms/{watir → watir_webdriver}/table_row.rb

@@ -1,6 +1,6 @@
 module PageObject
   module Platforms
-    module Watir
+    module WatirWebDriver
       module TableRow
 
         #
@@ -8,7 +8,7 @@ module PageObject
         # is zero based.
         #
         def [](idx)
-          PageObject::Elements::TableCell.new(element[idx], :platform => :watir)
+          Object::PageObject::Elements::TableCell.new(element[idx], :platform => :watir_webdriver)
         end
 
         #

data/lib/page-object/platforms/{watir → watir_webdriver}/text_area.rb

@@ -1,6 +1,6 @@
 module PageObject
   module Platforms
-    module Watir
+    module WatirWebDriver
 
       module TextArea
         

data/lib/page-object/platforms/{watir → watir_webdriver}/text_field.rb

@@ -1,6 +1,6 @@
 module PageObject
   module Platforms
-    module Watir
+    module WatirWebDriver
 
       module TextField
         

data/lib/page-object/platforms/{watir → watir_webdriver}/unordered_list.rb

@@ -1,6 +1,6 @@
 module PageObject
   module Platforms
-    module Watir
+    module WatirWebDriver
       module UnorderedList
 
         #
@@ -11,7 +11,7 @@ module PageObject
         #
         def [](idx)
           eles = list_items
-          PageObject::Elements::ListItem.new(eles[idx], :platform => :watir)
+          Object::PageObject::Elements::ListItem.new(eles[idx], :platform => :watir_webdriver)
         end
 
         #

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

data/page-object.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'watir-webdriver', '>= 0.3.2'
-  s.add_dependency 'selenium-webdriver', '>= 2.4.0' 
+  s.add_dependency 'selenium-webdriver', '>= 2.5.0' 
   
   s.add_development_dependency 'rspec', '>= 2.6.0'
   s.add_development_dependency 'cucumber', '>= 1.0.0'

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

@@ -25,7 +25,7 @@ describe PageObject::Elements::Button do
 
     context "for selenium" do
       it "should return error when asked for its' text" do
-        button = PageObject::Elements::Button.new(button_element, :platform => :selenium)
+        button = PageObject::Elements::Button.new(button_element, :platform => :selenium_webdriver)
         lambda { button.text }.should raise_error
       end
     end

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

@@ -21,7 +21,7 @@ describe PageObject::Elements::CheckBox do
   
   describe "interface" do
     let(:check_box) { double('check_box') }
-    let(:selenium_cb) { PageObject::Elements::CheckBox.new(check_box, :platform => :selenium) }
+    let(:selenium_cb) { PageObject::Elements::CheckBox.new(check_box, :platform => :selenium_webdriver) }
 
     
     context "for selenium" do

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

@@ -3,14 +3,12 @@ require 'page-object/elements'
 
 
 describe PageObject::Elements::Element do
-  let(:watir_driver) { double('watir') }
-  let(:selenium_driver) { double('selenium') }
-  let(:watir_element) { PageObject::Elements::Element.new(watir_driver, :platform => :watir) }
-  let(:selenium_element) { PageObject::Elements::Element.new(selenium_driver, :platform => :selenium) }
   let(:element) { PageObject::Elements::Element }
 
   context "when handling unknown requests" do
     it "should delegate to the driver element" do
+      watir_driver = double('watir')
+      watir_element = PageObject::Elements::Element.new(watir_driver, :platform => :watir_webdriver)
       watir_driver.should_receive(:do_this)
       watir_element.do_this
     end
@@ -90,6 +88,9 @@ describe PageObject::Elements::Element do
   end
 
   context "when using Watir" do
+    let(:watir_driver) { double('watir_element_driver') }
+    let(:watir_element) { PageObject::Elements::Element.new(watir_driver, :platform => :watir_webdriver) }
+
     it "should know when it is visible" do
       watir_driver.should_receive(:present?).and_return(true)
       watir_element.visible?.should == true
@@ -183,6 +184,9 @@ describe PageObject::Elements::Element do
   end
 
   context "when using Selenium" do
+    let(:selenium_driver) { double('selenium') }
+    let(:selenium_element) { PageObject::Elements::Element.new(selenium_driver, :platform => :selenium_webdriver) }
+
     it "should know when it is visible" do
       selenium_driver.should_receive(:displayed?).and_return(true)
       selenium_element.visible?.should == true
@@ -198,7 +202,7 @@ describe PageObject::Elements::Element do
     end
 
     it "should know when it does not exist" do
-      selenium_element = PageObject::Elements::Element.new(nil, :platform => :selenium)
+      selenium_element = PageObject::Elements::Element.new(nil, :platform => :selenium_webdriver)
       selenium_element.exists?.should == false
     end
 

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

@@ -7,7 +7,7 @@ describe PageObject::Elements::Form do
 
     context "for watir" do
       it "should submit a form" do
-        form = PageObject::Elements::Form.new(form_element, :platform => :watir)
+        form = PageObject::Elements::Form.new(form_element, :platform => :watir_webdriver)
         form_element.should_receive(:submit)
         form.submit
       end
@@ -15,7 +15,7 @@ describe PageObject::Elements::Form do
 
     context "for selenium" do
       it "should submit a form" do
-        form = PageObject::Elements::Form.new(form_element, :platform => :selenium)
+        form = PageObject::Elements::Form.new(form_element, :platform => :selenium_webdriver)
         form_element.should_receive(:submit)
         form.submit
       end

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

@@ -29,13 +29,13 @@ describe PageObject::Elements::Image do
 
     context "for watir" do
       it "should know the images width" do
-        image = PageObject::Elements::Image.new(image_element, :platform => :watir)
+        image = PageObject::Elements::Image.new(image_element, :platform => :watir_webdriver)
         image_element.should_receive(:width).and_return(100)
         image.width.should == 100
       end
 
       it "should know the images height" do
-        image = PageObject::Elements::Image.new(image_element, :platform => :watir)
+        image = PageObject::Elements::Image.new(image_element, :platform => :watir_webdriver)
         image_element.should_receive(:height).and_return(120)
         image.height.should == 120
       end
@@ -44,7 +44,7 @@ describe PageObject::Elements::Image do
     context "for selenium" do
       it "should know the images width" do
         dim = double('dimension')
-        image = PageObject::Elements::Image.new(image_element, :platform => :selenium)
+        image = PageObject::Elements::Image.new(image_element, :platform => :selenium_webdriver)
         image_element.should_receive(:size).and_return(dim)
         dim.should_receive(:width).and_return(100)
         image.width.should == 100
@@ -52,7 +52,7 @@ describe PageObject::Elements::Image do
 
       it "should know the images height" do
         dim = double('dimension')
-        image = PageObject::Elements::Image.new(image_element, :platform => :selenium)
+        image = PageObject::Elements::Image.new(image_element, :platform => :selenium_webdriver)
         image_element.should_receive(:size).and_return(dim)
         dim.should_receive(:height).and_return(120)
         image.height.should == 120

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

@@ -37,7 +37,7 @@ describe PageObject::Elements::Link do
 
     context "for selenium" do
       it "should return error when asked for its' value" do
-        link = PageObject::Elements::Link.new(link_element, :platform => :selenium)
+        link = PageObject::Elements::Link.new(link_element, :platform => :selenium_webdriver)
         lambda { link.value }.should raise_error
       end
     end

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

@@ -0,0 +1,185 @@
+require 'spec_helper'
+require 'page-object/elements'
+
+
+describe "Element with nested elements" do
+  let(:watir_driver) { double('watir') }
+  let(:watir_element) { PageObject::Elements::Element.new(watir_driver, :platform => :watir_webdriver) }
+  let(:selenium_driver) { double('selenium') }
+  let(:selenium_element) { PageObject::Elements::Element.new(selenium_driver, :platform => :selenium_webdriver) }
+
+
+  context "in Watir" do
+    it "should find nested links" do
+      watir_driver.should_receive(:link).with(:id => 'blah').and_return(watir_driver)
+      watir_element.link_element(:id => 'blah')
+    end
+
+    it "should find nested buttons" do
+      watir_driver.should_receive(:button).with(:id => 'blah').and_return(watir_driver)
+      watir_element.button_element(:id => 'blah')
+    end
+    
+    it "should find nested text fields" do
+      watir_driver.should_receive(:text_field).with(:id => 'blah').and_return(watir_driver)
+      watir_element.text_field_element(:id => 'blah')
+    end
+
+    it "should find nested hidden fields" do
+      watir_driver.should_receive(:hidden).and_return(watir_driver)
+      watir_element.hidden_field_element
+    end
+
+    it "should find nested text areas" do
+      watir_driver.should_receive(:textarea).and_return(watir_driver)
+      watir_element.text_area_element
+    end
+
+    it "should find a nested select list" do
+      watir_driver.should_receive(:select_list).and_return(watir_driver)
+      watir_element.select_list_element
+    end
+
+    it "should find a nested checkbox" do
+      watir_driver.should_receive(:checkbox).and_return(watir_driver)
+      watir_element.checkbox_element
+    end
+    
+    it "should find a nested radio button" do
+      watir_driver.should_receive(:radio).and_return(watir_driver)
+      watir_element.radio_button_element
+    end
+    
+    it "should find a nested div" do
+      watir_driver.should_receive(:div).and_return(watir_driver)
+      watir_element.div_element
+    end
+    
+    it "should find a nested span" do
+      watir_driver.should_receive(:span).and_return(watir_driver)
+      watir_element.span_element
+    end
+    
+    it "should find a nested table" do
+      watir_driver.should_receive(:table).and_return(watir_driver)
+      watir_element.table_element
+    end
+
+    it "should find a nested cell" do
+      watir_driver.should_receive(:td).and_return(watir_driver)
+      watir_element.cell_element
+    end
+    
+    it "should find a nested image" do
+      watir_driver.should_receive(:image).and_return(watir_driver)
+      watir_element.image_element
+    end
+    
+    it "should find a nested form" do
+      watir_driver.should_receive(:form).and_return(watir_driver)
+      watir_element.form_element
+    end
+    
+    it "should find an ordered list" do
+      watir_driver.should_receive(:ol).and_return(watir_driver)
+      watir_element.ordered_list_element
+    end
+    
+    it "should find an unordered list" do
+      watir_driver.should_receive(:ul).and_return(watir_driver)
+      watir_element.unordered_list_element
+    end
+    
+    it "should find a list item" do
+      watir_driver.should_receive(:li).and_return(watir_driver)
+      watir_element.list_item_element
+    end
+  end
+  
+  context "in Selenium" do
+    it "should find nested links" do
+      selenium_driver.should_receive(:find_element).with(:id, 'blah').and_return(selenium_driver)
+      selenium_element.link_element(:id => 'blah')
+    end
+
+    it "should find nested buttons" do
+      selenium_driver.should_receive(:find_element).with(:id, 'blah').and_return(selenium_driver)
+      selenium_element.button_element(:id => 'blah')
+    end
+    
+    it "should find nested text fields" do
+      selenium_driver.should_receive(:find_element).with(:id, 'blah').and_return(selenium_driver)
+      selenium_element.text_field_element(:id => 'blah')
+    end
+    
+    it "should find nested hidden fields" do
+      selenium_driver.should_receive(:find_element).and_return(selenium_driver)
+      selenium_element.hidden_field_element
+    end
+    
+    it "should find nested text areas" do
+      selenium_driver.should_receive(:find_element).and_return(selenium_driver)
+      selenium_element.text_area_element
+    end
+    
+    it "should find a nested select list" do
+      selenium_driver.should_receive(:find_element).and_return(selenium_driver)
+      selenium_element.select_list_element
+    end
+    
+    it "should find a nested checkbox" do
+      selenium_driver.should_receive(:find_element).and_return(selenium_driver)
+      selenium_element.checkbox_element
+    end
+    
+    it "should find a nested radio button" do
+      selenium_driver.should_receive(:find_element).and_return(selenium_driver)
+      selenium_element.radio_button_element
+    end
+    
+    it "should find a nested div" do
+      selenium_driver.should_receive(:find_element).and_return(selenium_driver)
+      selenium_element.div_element
+    end
+    
+    it "should find a nested span" do
+      selenium_driver.should_receive(:find_element).and_return(selenium_driver)
+      selenium_element.span_element
+    end
+    
+    it "should find a nested table" do
+      selenium_driver.should_receive(:find_element).and_return(selenium_driver)
+      selenium_element.table_element
+    end
+
+    it "should find a nested cell" do
+      selenium_driver.should_receive(:find_element).and_return(selenium_driver)
+      selenium_element.cell_element
+    end
+    
+    it "should find a nested image" do
+      selenium_driver.should_receive(:find_element).and_return(selenium_driver)
+      selenium_element.image_element
+    end
+    
+    it "should find a nested form" do
+      selenium_driver.should_receive(:find_element).and_return(selenium_driver)
+      selenium_element.form_element
+    end
+    
+    it "should find an ordered list" do
+      selenium_driver.should_receive(:find_element).and_return(selenium_driver)
+      selenium_element.ordered_list_element
+    end
+    
+    it "should find an unordered list" do
+      selenium_driver.should_receive(:find_element).and_return(selenium_driver)
+      selenium_element.unordered_list_element
+    end
+    
+    it "should find a nested list item" do
+      selenium_driver.should_receive(:find_element).and_return(selenium_driver)
+      selenium_element.list_item_element
+    end
+  end
+end

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

@@ -25,7 +25,7 @@ describe PageObject::Elements::OrderedList do
 
     context "for watir" do
       it "should return a list item when indexed" do
-        ol = PageObject::Elements::OrderedList.new(ol_element, :platform => :watir)
+        ol = PageObject::Elements::OrderedList.new(ol_element, :platform => :watir_webdriver)
         ol_element.stub(:wd).and_return(ol_element)
         ol_element.should_receive(:find_elements).with(:xpath, ".//child::li").and_return(ol_element)
         ol_element.stub(:[]).and_return(ol_element)
@@ -33,7 +33,7 @@ describe PageObject::Elements::OrderedList do
       end
 
       it "should know how many list items it contains" do
-        ol = PageObject::Elements::OrderedList.new(ol_element, :platform => :watir)
+        ol = PageObject::Elements::OrderedList.new(ol_element, :platform => :watir_webdriver)
         ol_element.stub(:wd).and_return(ol_element)
         ol_element.should_receive(:find_elements).with(:xpath, ".//child::li").and_return(ol_element)
         ol_element.stub(:[]).and_return(ol_element)
@@ -42,7 +42,7 @@ describe PageObject::Elements::OrderedList do
       end
 
       it "should iterate over the list items" do
-        ol = PageObject::Elements::OrderedList.new(ol_element, :platform => :watir)
+        ol = PageObject::Elements::OrderedList.new(ol_element, :platform => :watir_webdriver)
         ol.should_receive(:items).and_return(5)
         ol.stub(:[])
         count = 0
@@ -53,21 +53,21 @@ describe PageObject::Elements::OrderedList do
 
     context "for selenium" do
       it "should return a list item when indexed" do
-        ol = PageObject::Elements::OrderedList.new(ol_element, :platform => :selenium)
+        ol = PageObject::Elements::OrderedList.new(ol_element, :platform => :selenium_webdriver)
         ol_element.should_receive(:find_elements).with(:xpath, ".//child::li").and_return(ol_element)
         ol_element.should_receive(:[]).and_return(ol_element)
         ol[1].should be_instance_of PageObject::Elements::ListItem
       end
 
       it "should know how many list items it contains" do
-        ol = PageObject::Elements::OrderedList.new(ol_element, :platform => :selenium)
+        ol = PageObject::Elements::OrderedList.new(ol_element, :platform => :selenium_webdriver)
         ol_element.should_receive(:find_elements).with(:xpath, ".//child::li").and_return(ol_element)
         ol_element.should_receive(:size).and_return(5)
         ol.items.should == 5
       end
 
       it "should iterate over the list items" do
-        ol = PageObject::Elements::OrderedList.new(ol_element, :platform => :selenium)
+        ol = PageObject::Elements::OrderedList.new(ol_element, :platform => :selenium_webdriver)
         ol.should_receive(:items).and_return(5)
         ol.stub(:[])
         count = 0