watir-webdriver 0.6.2 → 0.6.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9407ab3824340922a6ed7724f6f86dde94837cfa
+  data.tar.gz: ac0da8d422e29382fa8349a0942b345925d279d0
+SHA512:
+  metadata.gz: 691b6c764ab1d227294fd4fcd3d6eb00afbf1d1c878b1cc444359fb27169646a846998c2964716b1e5d6ed047f43a5e6dbab224746a1a410723ff4e1196c080c
+  data.tar.gz: 27656d8ffe2229a8a92735406772909b2d7b24ea18df726c0bf0bc5449d1d246bb3aa782fbd6b2b3350b6d9b22a6ff0680c6b023bc8d58ad25b5835eff175814

data/.gitignore

@@ -11,4 +11,5 @@ Gemfile.lock
 *.rbc
 .rbx/*
 chromedriver.log
-support/html5.html
+support/html5.html
+/doc

data/.travis.yml

@@ -1,10 +1,11 @@
 rvm:
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
 notifications:
   recipients:
     - jari.bakken@gmail.com
     - p0deje@gmail.com
+    - jarmo.p@gmail.com
   irc: "irc.freenode.net#watir"
 before_script:
   - support/travis.sh
@@ -15,3 +16,11 @@ env:
   - WATIR_WEBDRIVER_BROWSER=chrome
   - WATIR_WEBDRIVER_BROWSER=chrome ALWAYS_LOCATE=false
   - WATIR_WEBDRIVER_BROWSER=chrome PREFER_CSS=1 SELECTOR_STATS=1
+  - WATIR_WEBDRIVER_BROWSER=phantomjs
+  - WATIR_WEBDRIVER_BROWSER=phantomjs ALWAYS_LOCATE=false
+  - WATIR_WEBDRIVER_BROWSER=phantomjs PREFER_CSS=1 SELECTOR_STATS=1
+matrix:
+  allow_failures:
+    - env: WATIR_WEBDRIVER_BROWSER=phantomjs
+    - env: WATIR_WEBDRIVER_BROWSER=phantomjs ALWAYS_LOCATE=false
+    - env: WATIR_WEBDRIVER_BROWSER=phantomjs PREFER_CSS=1 SELECTOR_STATS=1

data/.yardopts

@@ -0,0 +1 @@
+--load ./lib/yard/handlers/watir.rb

data/CHANGES.md

@@ -1,3 +1,9 @@
+0.6.3
+=====
+
+* Always use custom YARD handler (should give full docs on rubydoc.info)
+* Window resizing coerces string arguments
+
 0.6.2
 =====
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2012 Jari Bakken
+Copyright (c) 2009-2013 Jari Bakken
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -4,7 +4,11 @@ watir-webdriver
 Watir implementation built on WebDriver's Ruby bindings.
 See http://rubyforge.org/pipermail/wtr-development/2009-October/001313.html.
 
+[![Gem Version](https://badge.fury.io/rb/watir-webdriver.png)](http://badge.fury.io/rb/watir-webdriver)
 [![Build Status](https://secure.travis-ci.org/watir/watir-webdriver.png)](http://travis-ci.org/watir/watir-webdriver)
+[![Code Climate](https://codeclimate.com/github/watir/watir-webdriver.png)](https://codeclimate.com/github/watir/watir-webdriver)
+[![Dependency Status](https://gemnasium.com/watir/watir-webdriver.png)](https://gemnasium.com/watir/watir-webdriver)
+[![Coverage Status](https://coveralls.io/repos/watir/watir-webdriver/badge.png?branch=master)](https://coveralls.io/r/watir/watir-webdriver)
 
 Example
 -------
@@ -67,4 +71,4 @@ Note on Patches/Pull Requests
 Copyright
 ---------
 
-Copyright (c) 2009-2012 Jari Bakken. See LICENSE for details.
+Copyright (c) 2009-2013 Jari Bakken. See LICENSE for details.

data/Rakefile

@@ -87,7 +87,6 @@ end # html5
 
 
 require 'yard'
-require "yard/handlers/watir"
 YARD::Rake::YardocTask.new do |task|
   task.options = %w[--debug] # this is pretty slow, so nice with some output
 end

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.6.2"
-end # Watir
+  VERSION = "0.6.3"
+end

data/lib/watir-webdriver/window.rb

@@ -26,8 +26,7 @@ module Watir
     #
     # @example
     #   size = browser.window.size
-    #   "%sx%s" % [size.width, size.height]
-    #   #=> "1600x1200"
+    #   [size.width, size.height] #=> [1600, 1200]
     #
 
     def size
@@ -42,8 +41,7 @@ module Watir
     #
     # @example
     #   position = browser.window.position
-    #   "%sx%s" % [position.x, position.y]
-    #   #=> "92x76"
+    #   [position.x, position.y] #=> [92, 76]
     #
 
     def position
@@ -64,7 +62,7 @@ module Watir
     #
 
     def resize_to(width, height)
-      dimension = Selenium::WebDriver::Dimension.new(width, height)
+      dimension = Selenium::WebDriver::Dimension.new(Integer(width), Integer(height))
       use { @driver.manage.window.size = dimension }
 
       dimension
@@ -81,7 +79,7 @@ module Watir
     #
 
     def move_to(x, y)
-      point = Selenium::WebDriver::Point.new(x, y)
+      point = Selenium::WebDriver::Point.new(Integer(x), Integer(y))
       use { @driver.manage.window.position = point }
 
       point

data/lib/yard/handlers/watir.rb

@@ -18,7 +18,7 @@ module YARD
           attributes = try_eval
 
           if attributes.nil?
-            p :ignoring => statement.source, :in => namespace.to_s
+            p :ignoring => statement.source, :in => namespace.to_s if $DEBUG
             return
           end
 
@@ -33,7 +33,7 @@ module YARD
 
         def create_attributes(names, return_type)
           names.each do |attribute_name|
-            p :adding => "#{namespace}##{attribute_name}"
+            p :adding => "#{namespace}##{attribute_name}" if $DEBUG
             attribute_name = "#{attribute_name}?".to_sym if return_type == "Boolean"
             register MethodObject.new(namespace, attribute_name, scope) do |o|
               o.visibility = :public

data/spec/element_spec.rb

@@ -45,7 +45,7 @@ describe Watir::Element do
 
   describe "#hover" do
     not_compliant_on [:webdriver, :firefox, :synthesized_events],
-                     [:webdriver, :ie],
+                     [:webdriver, :internet_explorer],
                      [:webdriver, :iphone],
                      [:webdriver, :safari] do
       it "should hover over the element" do

data/spec/implementation.rb

@@ -11,7 +11,7 @@ class ImplementationConfig
     set_guard_proc
     add_html_routes
 
-    WatirSpec.always_use_server = mobile? || ie? || safari? || remote?
+    WatirSpec.always_use_server = mobile? || ie? || safari? || phantomjs? || remote?
   end
 
   private
@@ -47,41 +47,55 @@ class ImplementationConfig
   end
 
   def ie?
-    [:ie, :internet_explorer].include? browser
+    [:internet_explorer].include? browser
   end
 
   def safari?
     browser == :safari
   end
 
+  def phantomjs?
+    browser == :phantomjs
+  end
+
   def remote?
     browser == :remote
   end
 
   def set_guard_proc
     matching_browser = remote? ? remote_browser : browser
+    browser_instance = WatirSpec.new_browser
+    browser_version = browser_instance.driver.capabilities.version
+    matching_browser_with_version = "#{matching_browser}#{browser_version}".to_sym
     matching_guards = [
       :webdriver,                     # guard only applies to webdriver
       matching_browser,               # guard only applies to this browser
-      [:webdriver, matching_browser]  # guard only applies to this browser on webdriver
+      matching_browser_with_version,  # guard only applies to this browser with specific version
+      [:webdriver, matching_browser], # guard only applies to this browser on webdriver
+      [:webdriver, matching_browser_with_version]  # guard only applies to this browser with specific version on webdriver
     ]
 
     if native_events?
       # guard only applies to this browser on webdriver with native events enabled
       matching_guards << [:webdriver, matching_browser, :native_events]
+      matching_guards << [:webdriver, matching_browser_with_version, :native_events]
     else
       # guard only applies to this browser on webdriver with native events disabled
       matching_guards << [:webdriver, matching_browser, :synthesized_events]
+      matching_guards << [:webdriver, matching_browser_with_version, :synthesized_events]
     end
 
     if !Selenium::WebDriver::Platform.linux? || ENV['DESKTOP_SESSION']
       # some specs (i.e. Window#maximize) needs a window manager on linux
       matching_guards << [:webdriver, matching_browser, :window_manager]
+      matching_guards << [:webdriver, matching_browser_with_version, :window_manager]
     end
 
     @imp.guard_proc = lambda { |args|
       args.any? { |arg| matching_guards.include?(arg) }
     }
+  ensure
+    browser_instance.close if browser_instance
   end
 
   def firefox_args
@@ -128,7 +142,7 @@ class ImplementationConfig
   end
 
   def remote_browser
-    remote_browser = @imp.browser_class.new(*@imp.browser_args)
+    remote_browser = WatirSpec.new_browser
     remote_browser.browser.name
   ensure
     remote_browser.close
@@ -145,7 +159,7 @@ class ImplementationConfig
   end
 
   def native_events_by_default?
-    Selenium::WebDriver::Platform.windows? && [:firefox, :ie].include?(browser)
+    Selenium::WebDriver::Platform.windows? && [:firefox, :internet_explorer].include?(browser)
   end
 
   class SelectorListener < Selenium::WebDriver::Support::AbstractEventListener

data/spec/spec_helper.rb

@@ -2,12 +2,8 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-if ENV['coverage']
-  raise "simplecov only works on Ruby 1.9" unless RUBY_VERSION =~ /^1\.9/
-
-  require 'simplecov'
-  SimpleCov.start { add_filter "spec/" }
-end
+require 'coveralls'
+Coveralls.wear!
 
 require 'watir-webdriver'
 require 'locator_spec_helper'

data/support/travis.sh

@@ -3,13 +3,23 @@
 set -e
 set -x
 
-CHROME_REVISION=142910
+CHROME_REVISION=191150
 sh -e /etc/init.d/xvfb start && git submodule update --init
 
 if [[ "$WATIR_WEBDRIVER_BROWSER" = "chrome" ]]; then
   sudo apt-get install -y unzip libxss1
-  curl -L -O "http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux/$CHROME_REVISION/chrome-linux.zip"
+  curl -L -O "http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/$CHROME_REVISION/chrome-linux.zip"
   unzip chrome-linux.zip
-  curl -L "http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux/$CHROME_REVISION/chrome-linux.test/chromedriver" > chrome-linux/chromedriver
+  curl -L "http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/$CHROME_REVISION/chrome-linux.test/chromedriver" > chrome-linux/chromedriver
   chmod +x chrome-linux/chromedriver
+  sudo chmod 1777 /dev/shm
+fi
+
+if [[ "$WATIR_WEBDRIVER_BROWSER" = "phantomjs" ]]; then
+  PHANTOMJS_NAME=phantomjs-1.9.0-linux-x86_64
+  curl -L -O "https://phantomjs.googlecode.com/files/$PHANTOMJS_NAME.tar.bz2"
+  tar -xvjf $PHANTOMJS_NAME.tar.bz2
+  chmod +x $PHANTOMJS_NAME/bin/phantomjs
+  sudo cp $PHANTOMJS_NAME/bin/phantomjs /usr/local/phantomjs/bin/phantomjs
+  phantomjs --version
 fi

data/watir-webdriver.gemspec

@@ -26,8 +26,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "webidl", ">= 0.1.5"
   s.add_development_dependency "sinatra", "~> 1.0"
   s.add_development_dependency "rake", "~> 0.9.2"
-  s.add_development_dependency "fuubar", "~> 0.0.6"
+  s.add_development_dependency "fuubar"
   s.add_development_dependency "nokogiri"
   s.add_development_dependency "activesupport", "~> 3.0" # for pluralization during code generation
   s.add_development_dependency "pry"
+  s.add_development_dependency "coveralls"
 end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: watir-webdriver
 version: !ruby/object:Gem::Version
-  version: 0.6.2
-  prerelease: 
+  version: 0.6.3
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.18.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,23 +55,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webidl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,39 +97,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,17 +139,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: WebDriver-backed Watir
@@ -182,6 +175,7 @@ files:
 - .gitignore
 - .gitmodules
 - .travis.yml
+- .yardopts
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -270,27 +264,26 @@ files:
 - watir-webdriver.gemspec
 homepage: http://github.com/watir/watir-webdriver
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: watir-webdriver
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Watir on WebDriver
 test_files:
 - spec/browser_spec.rb