watir-webdriver 0.5.1 → 0.5.2

data/lib/watir-webdriver.rb

@@ -18,8 +18,6 @@ require 'watir-webdriver/locators/child_cell_locator'
 require 'watir-webdriver/browser'
 
 module Watir
-  include Selenium
-
   @always_locate = true
 
   class << self

data/lib/watir-webdriver/browser.rb

@@ -185,7 +185,7 @@ module Watir
 
     def wrap_elements_in(obj)
       case obj
-      when WebDriver::Element
+      when Selenium::WebDriver::Element
         wrap_element(obj)
       when Array
         obj.map { |e| wrap_elements_in(e) }

data/lib/watir-webdriver/elements/element.rb

@@ -11,7 +11,6 @@ module Watir
 
     include Exception
     include Container
-    include Selenium
     include EventuallyPresent
 
     #
@@ -206,7 +205,7 @@ module Watir
 
       begin
         @element.attribute('value') || ''
-      rescue WebDriver::Error::InvalidElementStateError
+      rescue Selenium::WebDriver::Error::InvalidElementStateError
         ""
       end
     end
@@ -254,7 +253,7 @@ module Watir
 
       e = execute_atom :getParentElement, @element
 
-      if e.kind_of?(WebDriver::Element)
+      if e.kind_of?(Selenium::WebDriver::Element)
         Watir.element_class_for(e.tag_name.downcase).new(@parent, :element => e)
       end
     end
@@ -408,7 +407,7 @@ module Watir
     end
 
     def assert_has_input_devices_for(name)
-      unless driver.kind_of? WebDriver::DriverExtensions::HasInputDevices
+      unless driver.kind_of? Selenium::WebDriver::DriverExtensions::HasInputDevices
         raise NotImplementedError, "#{self.class}##{name} is not supported by this driver"
       end
     end

data/lib/watir-webdriver/elements/select.rb

@@ -146,7 +146,7 @@ module Watir
       else
         begin
           e = @element.find_element(:xpath, xpath)
-        rescue WebDriver::Error::NoSuchElementError
+        rescue Selenium::WebDriver::Error::NoSuchElementError
           no_value_found(string)
         end
 

data/lib/watir-webdriver/locators/element_locator.rb

@@ -2,7 +2,6 @@
 module Watir
   class ElementLocator
     include Watir::Exception
-    include Selenium
 
     WD_FINDERS =  [
       :class,
@@ -36,7 +35,7 @@ module Watir
       # this actually only applies when finding by xpath - browser.text_field(:xpath, "//input[@type='radio']")
       # we don't need to validate the element if we built the xpath ourselves.
       validate_element(element) if element
-    rescue WebDriver::Error::NoSuchElementError => wde
+    rescue Selenium::WebDriver::Error::NoSuchElementError => wde
       nil
     end
 
@@ -245,7 +244,7 @@ module Watir
       return if tag_name && !tag_name_matches?(element.tag_name.downcase, tag_name)
 
       element
-    rescue WebDriver::Error::NoSuchElementError => wde
+    rescue Selenium::WebDriver::Error::NoSuchElementError => wde
       nil
     end
 

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watir-webdriver
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Jari Bakken