watir-webdriver 0.3.9 → 0.4.0

data/.travis.yml

@@ -1,5 +1,6 @@
 rvm:
   - 1.9.2
+  - 1.9.3
 notifications:
   recipients:
     - jari.bakken@gmail.com
@@ -9,7 +10,7 @@ before_script:
 env:
   - WATIR_WEBDRIVER_BROWSER=firefox
   - WATIR_WEBDRIVER_BROWSER=firefox ALWAYS_LOCATE=false
+  # - WATIR_WEBDRIVER_BROWSER=chrome
+  # - WATIR_WEBDRIVER_BROWSER=chrome ALWAYS_LOCATE=false
   # - WATIR_WEBDRIVER_BROWSER=firefox NATIVE_EVENTS=true
-  - WATIR_WEBDRIVER_BROWSER=chrome
-  - WATIR_WEBDRIVER_BROWSER=chrome ALWAYS_LOCATE=false
   # - WATIR_WEBDRIVER_BROWSER=chrome NATIVE_EVENTS=true

data/lib/watir-webdriver.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'selenium-webdriver'
-require 'json'
 
 require 'watir-webdriver/version'
 require 'watir-webdriver/wait'
@@ -81,10 +80,3 @@ require 'watir-webdriver/elements/table_cell'
 require 'watir-webdriver/elements/table_section'
 
 Watir.tag_to_class.freeze
-
-# undefine deprecated methods to use them for Element attributes
-class Object
-  undef_method :id if method_defined? "id"
-  undef_method :type if method_defined? "type"
-end
-

data/lib/watir-webdriver/attribute_helper.rb

@@ -39,6 +39,13 @@ module Watir
 
     private
 
+    def self.extended(klass)
+      klass.class_eval do
+        # undefine deprecated methods to use them for Element attributes
+        [:id, :type].each { |m| undef_method m if method_defined? m }
+      end
+    end
+
     def define_attribute(type, name)
       method_name    = method_name_for(type, name)
       attribute_name = attribute_for_method(name)

data/lib/watir-webdriver/extensions/alerts.rb

@@ -53,7 +53,7 @@ module Watir
     #
 
     def prompt(answer, &blk)
-      execute_script "window.prompt = function(text, value) { window.__lastWatirPrompt = { message: text, default_value: value }; return #{answer.to_json}; }"
+      execute_script "window.prompt = function(text, value) { window.__lastWatirPrompt = { message: text, default_value: value }; return #{MultiJson.encode answer}; }"
       yield
       result = execute_script "return window.__lastWatirPrompt"
 

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.3.9"
+  VERSION = "0.4.0"
 end

data/lib/watir-webdriver/xpath_support.rb

@@ -8,6 +8,8 @@ module Watir
     #
 
     def element_by_xpath(xpath)
+      warn 'element_by_xpath is deprecated and replaced by .element(:xpath, ...)'
+
       e = wd.find_element(:xpath, xpath)
       Watir.element_class_for(e.tag_name.downcase).new(self, :element => e)
     rescue WebDriver::Error::NoSuchElementError
@@ -19,11 +21,13 @@ module Watir
     #
 
     def elements_by_xpath(xpath)
+      warn 'elements_by_xpath is deprecated and replaced by .elements(:xpath, ...)'
+
       wd.find_elements(:xpath, xpath).map do |e|
         Watir.element_class_for(e.tag_name.downcase).new(self, :element => e)
       end
     end
-    
+
     def self.escape(value)
       if value.include? "'"
         parts = value.split("'", -1).map { |part| "'#{part}'" }

data/support/travis.sh

@@ -4,11 +4,11 @@ sh -e /etc/init.d/xvfb start && git submodule update --init || exit 1
 
 if [[ "$WATIR_WEBDRIVER_BROWSER" = "chrome" ]]; then
   curl -L https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add - 
-  sudo -s 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list'
+  sudo -s 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
   sudo apt-get update
   sudo apt-get -y install google-chrome-unstable unzip
   # curl -k http://chromium.googlecode.com/files/chromedriver_linux32_14.0.836.0.zip | sudo -s 'funzip > /usr/bin/chromedriver'
-  sudo -s 'curl -L http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux/102682/chrome-linux.test/chromedriver > /usr/bin/chromedriver'
+  sudo -s 'curl -L http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux/109799/chrome-linux.test/chromedriver > /usr/bin/chromedriver'
   sudo chmod +x /usr/bin/chromedriver
 fi
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watir-webdriver
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 9
-  version: 0.3.9
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jari Bakken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-10 00:00:00 Z
+date: 2011-12-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: selenium-webdriver
@@ -296,3 +296,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/special_chars_spec.rb
 - spec/wait_spec.rb
+has_rdoc: