selenium-webdriver 0.0.9 → 0.0.10

data/common/src/rb/lib/selenium/webdriver/element.rb

@@ -5,6 +5,12 @@ module Selenium
 
       attr_reader :bridge
 
+      #
+      # Creates a new Element
+      #
+      # @api private
+      #
+
       def initialize(bridge, id)
         @bridge, @id = bridge, id
       end
@@ -13,26 +19,65 @@ module Selenium
         '#<%s:0x%x id=%s tag_name=%s>' % [self.class, hash*2, @id.inspect, tag_name.inspect]
       end
 
+      #
+      # Click the element
+      #
+
       def click
         bridge.clickElement @id
       end
 
+      #
+      # Get the tag name of this element
+      #
+      # @return [String]
+      #
+
       def tag_name
         bridge.getElementTagName @id
       end
 
+      #
+      # Get the value of this element
+      #
+      # @return [String]
+      #
+
       def value
         bridge.getElementValue @id
       end
 
+      #
+      # Get the value of the given attribute
+      #
+      # @param [String]
+      #   attribute name
+      # @return [String,nil]
+      #   attribute value
+      #
+
       def attribute(name)
         bridge.getElementAttribute @id, name
       end
 
+      #
+      # Get the text content of this element
+      #
+      # @return [String]
+      #
+
       def text
         bridge.getElementText @id
       end
 
+      #
+      # Send keystrokes to this element
+      #
+      # @param [String, Symbol]
+      #
+      # @see Keys::KEYS
+      #
+
       def send_keys(*args)
         args.each do |arg|
           if arg.kind_of?(Symbol)
@@ -44,54 +89,123 @@ module Selenium
       end
       alias_method :send_key, :send_keys
 
+      #
+      # Clear this element
+      #
+
       def clear
         bridge.clearElement @id
       end
 
+      #
+      # Is the element enabled?
+      #
+      # @return [Boolean]
+      #
+
       def enabled?
         bridge.isElementEnabled @id
       end
 
+      #
+      # Is the element selected?
+      #
+      # @return [Boolean]
+      #
+
       def selected?
         bridge.isElementSelected @id
       end
 
+      #
+      # Is the element displayed?
+      #
+      # @return [Boolean]
+      #
+
       def displayed?
         bridge.isElementDisplayed @id
       end
 
+      #
+      # Select this element
+      #
+
       def select
         bridge.setElementSelected @id
       end
 
+      #
+      # Submit this element
+      #
+
       def submit
         bridge.submitElement @id
       end
 
+      #
+      # Toggle this element
+      #
+
       def toggle
         bridge.toggleElement @id
       end
 
+      #
+      # Get the value of the given CSS property
+      #
+
       def style(prop)
         bridge.getElementValueOfCssProperty @id, prop
       end
 
+      #
+      # Hover over this element. Not applicable to all browsers.
+      #
+
       def hover
         bridge.hoverOverElement @id
       end
 
+      #
+      # Get the location of this element.
+      #
+      # @return [WebDriver::Point]
+      #
+
       def location
         bridge.getElementLocation @id
       end
 
+      #
+      # Get the size of this element
+      #
+      # @return [WebDriver::Dimension]
+      #
+
       def size
         bridge.getElementSize @id
       end
 
+      #
+      # Drag and drop this element
+      #
+      # @param [Integer] right_by
+      #   number of pixels to drag right
+      # @param [Integer] down_by
+      #   number of pixels to drag down
+      #
+
       def drag_and_drop_by(right_by, down_by)
         bridge.dragElement @id, right_by, down_by
       end
 
+      #
+      # Drag and drop this element on the given element
+      #
+      # @param [WebDriver::Element] other
+      #
+
       def drag_and_drop_on(other)
         current_location = location()
         destination      = other.location
@@ -105,25 +219,27 @@ module Selenium
       #-------------------------------- sugar  --------------------------------
 
       #
-      # element.first(:id, 'foo')
+      #   element.first(:id, 'foo')
       #
 
       alias_method :first, :find_element
 
       #
-      # element.all(:class, 'bar')
+      #   element.all(:class, 'bar')
       #
 
       alias_method :all, :find_elements
 
       #
-      # element['class'] or element[:class] #=> "someclass"
+      #   element['class'] or element[:class] #=> "someclass"
       #
       alias_method :[], :attribute
 
       #
       # for Find and execute_script
       #
+      # @api private
+      #
 
       def ref
         @id

data/common/src/rb/lib/selenium/webdriver/error.rb

@@ -1,9 +1,8 @@
 module Selenium
   module WebDriver
     module Error
-      class WebDriverError < StandardError; end
-
 
+      class WebDriverError < StandardError; end
       class IndexOutOfBoundsError < WebDriverError; end        # 1
       class NoCollectionError < WebDriverError; end            # 2
       class NoStringError < WebDriverError; end                # 3

data/common/src/rb/lib/selenium/webdriver/find.rb

@@ -14,12 +14,21 @@ module Selenium
         :xpath             => 'ByXpath',
       }
 
+      #
+      # Find the first element matching the given arguments.
+      #
+      # @param [:class, :class_name, :id, :link_text, :link, :partial_link_text, :name, :tag_name, :xpath] how
+      # @param [String] what
+      # @return [WebDriver::Element]
+      #
+      # @raise [NoSuchElementError] if the element doesn't exist
+      #
 
       def find_element(*args)
         how, what = extract_args(args)
 
         unless by = FINDERS[how.to_sym]
-          raise Error::UnsupportedOperationError, "Cannot find element by #{how.inspect}"
+          raise ArgumentError, "cannot find element by #{how.inspect}"
         end
 
         meth = "findElement#{by}"
@@ -28,11 +37,19 @@ module Selenium
         bridge.send meth, ref, what
       end
 
+      #
+      # Find all elements matching the given arguments
+      #
+      # @param [:class, :class_name, :id, :link_text, :link, :partial_link_text, :name, :tag_name, :xpath] how
+      # @param [String] what
+      # @return [Array<WebDriver::Element>]
+      #
+
       def find_elements(*args)
         how, what = extract_args(args)
 
         unless by = FINDERS[how.to_sym]
-          raise Error::UnsupportedOperationError, "Cannot find elements by #{how.inspect}"
+          raise ArgumentError, "cannot find elements by #{how.inspect}"
         end
 
         meth = "findElements#{by}"

data/common/src/rb/lib/selenium/webdriver/keys.rb

@@ -2,8 +2,12 @@ module Selenium
   module WebDriver
     module Keys
 
-      # \x works on both 1.8.6/1.9
+      #
+      # @see Element#send_keys
+      #
+
       KEYS = {
+      # \x works on both 1.8.6/1.9
         :null         => "\xEE\x80\x80",
         :cancel       => "\xEE\x80\x81",
         :help         => "\xEE\x80\x82",

data/common/src/rb/lib/selenium/webdriver/navigation.rb

@@ -3,19 +3,23 @@ module Selenium
     class Navigation
 
       def initialize(driver)
-        @driver = driver
+        @bridge = driver.bridge
       end
 
       def to(url)
-        @driver.bridge.get url
+        @bridge.get url
       end
 
       def back
-        @driver.bridge.goBack
+        @bridge.goBack
       end
 
       def forward
-        @driver.bridge.goForward
+        @bridge.goForward
+      end
+
+      def refresh
+        @bridge.refresh
       end
 
     end # Navigation

data/common/src/rb/lib/selenium/webdriver/platform.rb

@@ -17,7 +17,9 @@ module Selenium
                         :windows
                       when /darwin/
                         :macosx
-                      when /linux|solaris|bsd/
+                      when /linux/
+                        :linux
+                      when /solaris|bsd/
                         :unix
                       else
                         RUBY_PLATFORM
@@ -34,7 +36,7 @@ module Selenium
             os = case os_name
                   when /windows/i then :windows
                   when /mac os/i  then :macosx
-                  when /linux/i   then :unix
+                  when /linux/i   then :linux
                   else                 os_name
                   end
           end

data/common/src/rb/lib/selenium/webdriver/target_locator.rb

@@ -2,18 +2,36 @@ module Selenium
   module WebDriver
     class TargetLocator
 
+      #
+      # @api private
+      #
+
       def initialize(driver)
         @bridge = driver.bridge
       end
 
+      #
+      # switch to the frame with the given id
+      #
+
       def frame(id)
         @bridge.switchToFrame id
       end
 
+      #
+      # switch to the frame with the given id
+      #
+
       def window(id)
         @bridge.switchToWindow id
       end
 
+      #
+      # get the active element
+      #
+      # @return [WebDriver::Element]
+      #
+
       def active_element
         @bridge.switchToActiveElement
       end

data/firefox/src/extension/components/utils.js

@@ -1197,6 +1197,18 @@ Utils.unwrapParameters = function(wrappedParameters, resultArray, context) {
 };
 
 
+Utils.isArray_ = function(obj) {
+  return (obj !== undefined &&
+    obj.constructor.toString().indexOf("Array") != -1);
+}
+
+
+Utils.isHtmlCollection_ = function(obj) {
+  return (obj !== undefined && obj['length'] &&
+    obj['item'] && obj['namedItem']); 
+}
+
+
 Utils.wrapResult = function(result, context) {
   // Sophisticated.
   if (null === result || undefined === result) {
@@ -1204,8 +1216,7 @@ Utils.wrapResult = function(result, context) {
   } else if (result['tagName']) {
     return {type: "ELEMENT",
             value: Utils.addToKnownElements(result, context)};
-  } else if (result !== undefined &&
-             result.constructor.toString().indexOf("Array") != -1) {
+  } else if (Utils.isArray_(result) || Utils.isHtmlCollection_(result)) {
     var array = [];
     for (var i = 0; i < result.length; i++) {
       array.push(Utils.wrapResult(result[i], context));

data/firefox/src/extension/install.rdf

@@ -4,7 +4,7 @@
     <Description about="urn:mozilla:install-manifest">
         <em:id>fxdriver@googlecode.com</em:id>
         <em:name>Firefox WebDriver</em:name>
-        <em:version>0.6.680</em:version>
+        <em:version>2.0a1</em:version>
         <em:description>WebDriver implementation for Firefox</em:description>
         <em:creator>Simon Stewart</em:creator>
 

data/firefox/src/rb/lib/selenium/webdriver/firefox.rb

@@ -13,8 +13,9 @@ module Selenium
   module WebDriver
     module Firefox
 
-       DEFAULT_PROFILE_NAME = "WebDriver".freeze
-       DEFAULT_PORT         = 7055
+       DEFAULT_PROFILE_NAME         = "WebDriver".freeze
+       DEFAULT_PORT                 = 7055
+       DEFAULT_ENABLE_NATIVE_EVENTS = Platform.win?
 
     end
   end