page-object 0.2.5 → 0.3.0

data/lib/page-object/platforms/{selenium → selenium_webdriver}/element.rb

@@ -3,7 +3,7 @@ module PageObject
     #
     # Selenium implementation of the common functionality found across all elements
     #
-    module Selenium
+    module SeleniumWebDriver
       module Element
 
         #

data/lib/page-object/platforms/{watir → selenium_webdriver}/form.rb

@@ -1,6 +1,6 @@
 module PageObject
   module Platforms
-    module Watir
+    module SeleniumWebDriver
       module Form
 
         #

data/lib/page-object/platforms/{selenium → selenium_webdriver}/image.rb

@@ -1,6 +1,6 @@
 module PageObject
   module Platforms
-    module Selenium
+    module SeleniumWebDriver
       module Image
 
         #

data/lib/page-object/platforms/{selenium → selenium_webdriver}/link.rb

@@ -1,6 +1,6 @@
 module PageObject
   module Platforms
-    module Selenium
+    module SeleniumWebDriver
       module Link
         #
         # Override PageObject::PLatforms::SeleniumElement#value because

data/lib/page-object/platforms/{selenium → selenium_webdriver}/ordered_list.rb

@@ -1,6 +1,6 @@
 module PageObject
   module Platforms
-    module Selenium
+    module SeleniumWebDriver
       module OrderedList
 
         #
@@ -11,7 +11,7 @@ module PageObject
         #
         def [](idx)
           eles = list_items
-          Object::PageObject::Elements::ListItem.new(eles[idx], :platform => :selenium)
+          Object::PageObject::Elements::ListItem.new(eles[idx], :platform => :selenium_webdriver)
         end
 
         #

data/lib/page-object/platforms/{selenium → selenium_webdriver}/page_object.rb

@@ -3,7 +3,7 @@ require 'page-object/core_ext/string'
 
 module PageObject
   module Platforms
-    module Selenium
+    module SeleniumWebDriver
 
       #
       # Selenium implementation of the page object platform driver.  You should not use the
@@ -52,7 +52,7 @@ module PageObject
         # See PageObject#wait_until
         #
         def wait_until(timeout, message = nil, &block)
-          wait = Object::Selenium::WebDriver::Wait.new({:timeout => timeout, :message => message})
+          wait = ::Selenium::WebDriver::Wait.new({:timeout => timeout, :message => message})
           wait.until &block
         end
 
@@ -94,13 +94,13 @@ module PageObject
         # See PageObject#attach_to_window
         #
         def attach_to_window(identifier, &block)
-          match = identifier.values.first
+          value = identifier.values.first
+          key = identifier.keys.first
           handles = @browser.window_handles
           handles.each do |handle|
             @browser.switch_to.window handle
-            if identifier.keys.first == :title and @browser.title == match
-              return @browser.switch_to.window handle, &block
-            elsif identifier.keys.first == :url and @browser.current_url == match
+            if (key == :title and value == @browser.title) or
+              (key == :url and value == @browser.current_url)
               return @browser.switch_to.window handle, &block
             end
           end
@@ -138,7 +138,7 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::TextField, 'input', :type => 'text')
           switch_to_frame(frame_identifiers)
           text = @browser.find_element(how, what).attribute('value')
-          @browser.switch_to.default_content
+          @browser.switch_to.default_content unless frame_identifiers.nil?
           text
         end
 
@@ -151,7 +151,7 @@ module PageObject
           switch_to_frame(frame_identifiers)
           @browser.find_element(how, what).clear
           @browser.find_element(how, what).send_keys(value)
-          @browser.switch_to.default_content
+          @browser.switch_to.default_content unless frame_identifiers.nil?
         end
 
         #
@@ -162,8 +162,8 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::TextField, 'input', :type => 'text')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
-          @browser.switch_to.default_content
-          Object::PageObject::Elements::TextField.new(element, :platform => :selenium)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          ::PageObject::Elements::TextField.new(element, :platform => :selenium_webdriver)
         end
 
         #
@@ -174,7 +174,7 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::HiddenField, 'input', :type => 'hidden')
           switch_to_frame(frame_identifiers)
           value = @browser.find_element(how, what).attribute('value')
-          @browser.switch_to.default_content
+          @browser.switch_to.default_content unless frame_identifiers.nil?
           value
         end
 
@@ -186,8 +186,8 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::HiddenField, 'input', :type => 'hidden')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
-          @browser.switch_to.default_content
-          Elements::HiddenField.new(element, :platform => :selenium)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          Elements::HiddenField.new(element, :platform => :selenium_webdriver)
         end
 
         #
@@ -198,7 +198,7 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::TextArea, 'textarea')
           switch_to_frame(frame_identifiers)
           @browser.find_element(how, what).send_keys(value)
-          @browser.switch_to.default_content
+          @browser.switch_to.default_content unless frame_identifiers.nil?
         end
 
         #
@@ -209,7 +209,7 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::TextArea, 'textarea')
           switch_to_frame(frame_identifiers)
           value = @browser.find_element(how, what).attribute('value')
-          @browser.switch_to.default_content
+          @browser.switch_to.default_content unless frame_identifiers.nil?
           value
         end
 
@@ -221,8 +221,8 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::TextArea, 'textarea')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
-          @browser.switch_to.default_content
-          Elements::TextArea.new(element, :platform => :selenium)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          Elements::TextArea.new(element, :platform => :selenium_webdriver)
         end
 
         #
@@ -233,7 +233,7 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::SelectList, 'select')
           switch_to_frame(frame_identifiers)
           value = @browser.find_element(how, what).attribute('value')
-          @browser.switch_to.default_content
+          @browser.switch_to.default_content unless frame_identifiers.nil?
           value
         end
 
@@ -245,7 +245,7 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::SelectList, 'select')
           switch_to_frame(frame_identifiers)
           @browser.find_element(how, what).send_keys(value)
-          @browser.switch_to.default_content
+          @browser.switch_to.default_content unless frame_identifiers.nil?
         end
 
         #
@@ -256,8 +256,8 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::SelectList, 'select')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
-          @browser.switch_to.default_content
-          Elements::SelectList.new(element, :platform => :selenium)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          Elements::SelectList.new(element, :platform => :selenium_webdriver)
         end
 
         #
@@ -268,7 +268,7 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::Link, 'a')
           switch_to_frame frame_identifiers
           @browser.find_element(how, what).click
-          @browser.switch_to.default_content
+          @browser.switch_to.default_content unless frame_identifiers.nil?
         end
 
         #
@@ -279,8 +279,8 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::Link, 'a')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
-          @browser.switch_to.default_content
-          Elements::Link.new(element, :platform => :selenium)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          Elements::Link.new(element, :platform => :selenium_webdriver)
         end
 
         #
@@ -291,7 +291,7 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::CheckBox, 'input', :type => 'checkbox')
           switch_to_frame(frame_identifiers)
           @browser.find_element(how, what).click unless @browser.find_element(how, what).selected?
-          @browser.switch_to.default_content
+          @browser.switch_to.default_content unless frame_identifiers.nil?
         end
 
         #
@@ -302,7 +302,7 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::CheckBox, 'input', :type => 'checkbox')
           switch_to_frame(frame_identifiers)
           @browser.find_element(how, what).click if @browser.find_element(how, what).selected?
-          @browser.switch_to.default_content
+          @browser.switch_to.default_content unless frame_identifiers.nil?
         end
 
         #
@@ -313,7 +313,7 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::CheckBox, 'input', :type => 'checkbox')
           switch_to_frame(frame_identifiers)
           value = @browser.find_element(how, what).selected?
-          @browser.switch_to.default_content
+          @browser.switch_to.default_content unless frame_identifiers.nil?
           value
         end
 
@@ -325,8 +325,8 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::CheckBox, 'input', :type => 'checkbox')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
-          @browser.switch_to.default_content
-          Elements::CheckBox.new(element, :platform => :selenium)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          Elements::CheckBox.new(element, :platform => :selenium_webdriver)
         end
 
         #
@@ -337,7 +337,7 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::RadioButton, 'input', :type => 'radio')
           switch_to_frame(frame_identifiers)
           @browser.find_element(how, what).click unless @browser.find_element(how, what).selected?
-          @browser.switch_to.default_content
+          @browser.switch_to.default_content unless frame_identifiers.nil?
         end
 
         #
@@ -348,7 +348,7 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::RadioButton, 'input', :type => 'radio')
           switch_to_frame(frame_identifiers)
           @browser.find_element(how, what).click if @browser.find_element(how, what).selected?
-          @browser.switch_to.default_content
+          @browser.switch_to.default_content unless frame_identifiers.nil?
         end
 
         #
@@ -359,7 +359,7 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::RadioButton, 'input', :type => 'radio')
           switch_to_frame(frame_identifiers)
           value = @browser.find_element(how, what).selected?
-          @browser.switch_to.default_content
+          @browser.switch_to.default_content unless frame_identifiers.nil?
           value
         end
 
@@ -371,8 +371,8 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::RadioButton, 'input', :type => 'radio')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
-          @browser.switch_to.default_content
-          Object::PageObject::Elements::RadioButton.new(element, :platform => :selenium)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          ::PageObject::Elements::RadioButton.new(element, :platform => :selenium_webdriver)
         end
 
         #
@@ -383,7 +383,7 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::Div, 'div')
           switch_to_frame(frame_identifiers)
           value = @browser.find_element(how, what).text
-          @browser.switch_to.default_content
+          @browser.switch_to.default_content unless frame_identifiers.nil?
           value
         end
 
@@ -395,8 +395,8 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::Div, 'div')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
-          @browser.switch_to.default_content
-          Object::PageObject::Elements::Div.new(element, :platform => :selenium)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          ::PageObject::Elements::Div.new(element, :platform => :selenium_webdriver)
         end
 
         #
@@ -407,7 +407,7 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::Span, 'span')
           switch_to_frame(frame_identifiers)
           value = @browser.find_element(how, what).text
-          @browser.switch_to.default_content
+          @browser.switch_to.default_content unless frame_identifiers.nil?
           value
         end
 
@@ -419,8 +419,8 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::Span, 'span')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
-          @browser.switch_to.default_content
-          Object::PageObject::Elements::Span.new(element, :platform => :selenium)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          ::PageObject::Elements::Span.new(element, :platform => :selenium_webdriver)
         end
 
         #
@@ -431,7 +431,7 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::Button, 'input', :type => 'submit')
           switch_to_frame(frame_identifiers)
           @browser.find_element(how, what).click
-          @browser.switch_to.default_content
+          @browser.switch_to.default_content unless frame_identifiers.nil?
         end
 
         #
@@ -442,8 +442,8 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::Button, 'input', :type => 'submit')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
-          @browser.switch_to.default_content
-          Object::PageObject::Elements::Button.new(element, :platform => :selenium)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          ::PageObject::Elements::Button.new(element, :platform => :selenium_webdriver)
         end
 
         #
@@ -454,8 +454,8 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::Table, 'table')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
-          @browser.switch_to.default_content
-          Object::PageObject::Elements::Table.new(element, :platform => :selenium)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          ::PageObject::Elements::Table.new(element, :platform => :selenium_webdriver)
         end
 
         #
@@ -466,7 +466,7 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::TableCell, 'td')
           switch_to_frame(frame_identifiers)
           value = @browser.find_element(how, what).text
-          @browser.switch_to.default_content
+          @browser.switch_to.default_content unless frame_identifiers.nil?
           value
         end
 
@@ -478,8 +478,8 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::TableCell, 'td')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
-          @browser.switch_to.default_content
-          Object::PageObject::Elements::TableCell.new(element, :platform => :selenium)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          ::PageObject::Elements::TableCell.new(element, :platform => :selenium_webdriver)
         end
 
         #
@@ -490,8 +490,8 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::Image, 'img')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
-          @browser.switch_to.default_content
-          Object::PageObject::Elements::Image.new(element, :platform => :selenium)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          ::PageObject::Elements::Image.new(element, :platform => :selenium_webdriver)
         end
 
         #
@@ -502,8 +502,8 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::Form, 'form')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
-          @browser.switch_to.default_content
-          Object::PageObject::Elements::Form.new(element, :platform => :selenium)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          ::PageObject::Elements::Form.new(element, :platform => :selenium_webdriver)
         end
 
         #
@@ -526,8 +526,8 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::ListItem, 'li')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
-          @browser.switch_to.default_content
-          Object::PageObject::Elements::ListItem.new(element, :platform => :selenium)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          ::PageObject::Elements::ListItem.new(element, :platform => :selenium_webdriver)
         end
 
         #
@@ -538,8 +538,8 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::UnorderedList, 'ul')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
-          @browser.switch_to.default_content
-          Object::PageObject::Elements::UnorderedList.new(element, :platform => :selenium)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          ::PageObject::Elements::UnorderedList.new(element, :platform => :selenium_webdriver)
         end
 
         #
@@ -550,8 +550,8 @@ module PageObject
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::OrderedList, 'ol')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
-          @browser.switch_to.default_content
-          Object::PageObject::Elements::OrderedList.new(element, :platform => :selenium)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          ::PageObject::Elements::OrderedList.new(element, :platform => :selenium_webdriver)
         end
 
         private
@@ -584,7 +584,7 @@ module PageObject
         end
 
         def switch_to_frame(frame_identifiers)
-          if not frame_identifiers.nil?
+          unless frame_identifiers.nil?
             frame_identifiers.each do |frame_id|
               value = frame_id.values.first
               @browser.switch_to.frame(value)

data/lib/page-object/platforms/{selenium → selenium_webdriver}/radio_button.rb

@@ -1,6 +1,6 @@
 module PageObject
   module Platforms
-    module Selenium
+    module SeleniumWebDriver
       module RadioButton
 
         #

data/lib/page-object/platforms/{selenium → selenium_webdriver}/select_list.rb

@@ -1,6 +1,6 @@
 module PageObject
   module Platforms
-    module Selenium
+    module SeleniumWebDriver
       module SelectList
 
         #
@@ -28,7 +28,7 @@ module PageObject
           options = @element.find_elements(:xpath, child_xpath)
           elements = []
           options.each do |opt|
-            elements << Object::PageObject::Elements::Option.new(opt, :platform => :selenium)
+            elements << Object::PageObject::Elements::Option.new(opt, :platform => :selenium_webdriver)
           end
           elements
         end