watir-webdriver 0.3.4 → 0.3.5

data/.gitignore

@@ -8,4 +8,5 @@ rdoc
 .yardoc
 Gemfile.lock
 .rvmrc
-*.rbc
+*.rbc
+.rbx/*

data/.travis.yml

@@ -1,8 +1,12 @@
 rvm:
   - 1.9.2
+  - 1.9.3
 notifications:
   recipients:
     - jari.bakken@gmail.com
   irc: "irc.freenode.net#watir"
-before_script: 
-  - git submodule update --init
+before_script:
+  - support/travis.sh
+env:
+  - WATIR_WEBDRIVER_BROWSER=firefox
+  - WATIR_WEBDRIVER_BROWSER=chrome

data/README.md

@@ -4,6 +4,8 @@ watir-webdriver
 Watir implementation built on WebDriver's Ruby bindings.
 See http://rubyforge.org/pipermail/wtr-development/2009-October/001313.html.
 
+[![Build Status](https://secure.travis-ci.org/jarib/watir-webdriver.png)](http://travis-ci.org/jarib/watir-webdriver)
+
 API docs
 --------
 

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/watir-webdriver/window_switching.rb

@@ -116,7 +116,7 @@ module Watir
       handle = if @selector.has_key?(:index)
                   @driver.window_handles[Integer(@selector[:index])]
                 else
-                  @driver.window_handles.find { |handle| matches?(handle) }
+                  @driver.window_handles.find { |wh| matches?(wh) }
                 end
 
       handle or raise Exception::NoMatchingWindowFoundException, @selector.inspect
@@ -129,6 +129,9 @@ module Watir
 
         matches_title && matches_url
       }
+    rescue Selenium::WebDriver::Error::NoSuchWindowError, Selenium::WebDriver::Error::NoSuchDriverError
+      # the window may disappear while we're iterating.
+      false
     end
 
   end # Window

data/spec/browser_spec.rb

@@ -66,14 +66,12 @@ describe Watir::Browser do
     end
   end
 
-  not_compliant_on [:webdriver, :chrome] do
-    it "raises an error when trying to interact with a closed browser" do
-      b = WatirSpec.new_browser
-      b.goto(WatirSpec.files + "/definition_lists.html")
-      b.close
+  it "raises an error when trying to interact with a closed browser" do
+    b = WatirSpec.new_browser
+    b.goto(WatirSpec.files + "/definition_lists.html")
+    b.close
 
-      lambda { b.dl(:id => "experience-list").id }.should raise_error(Error, "browser was closed")
-    end
+    lambda { b.dl(:id => "experience-list").id }.should raise_error(Error, "browser was closed")
   end
 
   describe "#wait_while" do

data/spec/html/wait.html

@@ -23,6 +23,6 @@
     <div id="bar" style="display:none;" onclick='this.innerHTML = "changed"'>bar</div>
     <a id="show_bar" href="#" onclick="setTimeoutDisplay('bar', 'block', 500);">show bar</a>
     <a id="hide_foo" href="#" onclick="setTimeoutDisplay('foo', 'none', 500);">hide foo</a>
-    <a id="remove_foo" href="#" onclick="setTimeoutRemove('foo', 500);">remove foo</a>
+    <a id="remove_foo" href="#" onclick="setTimeoutRemove('foo', 1000);">remove foo</a>
   </body>
 </html>

data/spec/spec_helper.rb

@@ -20,10 +20,9 @@ include Watir::Exception
 WEBDRIVER_SELECTORS = [:class, :class_name, :css, :id, :name, :tag_name, :xpath]
 
 if ENV['TRAVIS']
-  require 'headless'
-  display = Headless.new
-  display.start
+  ENV['DISPLAY'] = ":99.0"
+end
 
-  pid = Process.pid
-  at_exit { display.stop if Process.pid == pid }
+if Selenium::WebDriver::Platform.linux? && ENV['DISPLAY'].nil?
+  raise "DISPLAY not set"
 end

data/spec/wait_spec.rb

@@ -93,16 +93,11 @@ describe Watir::Element do
   end
 
   describe "#wait_while_present" do
-    it "invokes subsequent methods after waiting until the element's disappearance" do
+    it "waits until the element disappears" do
       browser.a(:id, 'hide_foo').click
       browser.div(:id, 'foo').wait_while_present(1)
     end
 
-    it "invokes subsequent methods after waiting until the element's removal" do
-      browser.a(:id, 'remove_foo').click
-      browser.div(:id, 'foo').wait_while_present(1)
-    end
-
     it "times out" do
       lambda do
         browser.div(:id, 'foo').wait_while_present(1)

data/support/travis.sh

@@ -0,0 +1,14 @@
+#/bin/sh
+
+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 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 chmod +x /usr/bin/chromedriver
+fi
+

data/watir-webdriver.gemspec

@@ -21,11 +21,10 @@ Gem::Specification.new do |s|
 
   s.add_dependency "selenium-webdriver", '>= 0.2.2'
 
-  s.add_development_dependency "rspec", "~> 2.3.0"
+  s.add_development_dependency "rspec", "~> 2.6"
   s.add_development_dependency "yard", "~> 0.6"
   s.add_development_dependency "webidl", ">= 0.1.1"
   s.add_development_dependency "sinatra", "~> 1.0"
-  s.add_development_dependency "headless", "~> 0.2"
   s.add_development_dependency "rake", "~> 0.9.2"
   s.add_development_dependency "fuubar", "~> 0.0.6"
   s.add_development_dependency "nokogiri"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir-webdriver
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-23 00:00:00.000000000Z
+date: 2011-10-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &2166058680 !ruby/object:Gem::Requirement
+  requirement: &2169429060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *2166058680
+  version_requirements: *2169429060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2166057780 !ruby/object:Gem::Requirement
+  requirement: &2169428560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2166057780
+  version_requirements: *2169428560
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2166057120 !ruby/object:Gem::Requirement
+  requirement: &2169427520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *2166057120
+  version_requirements: *2169427520
 - !ruby/object:Gem::Dependency
   name: webidl
-  requirement: &2166056540 !ruby/object:Gem::Requirement
+  requirement: &2169426200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.1
   type: :development
   prerelease: false
-  version_requirements: *2166056540
+  version_requirements: *2169426200
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2166055760 !ruby/object:Gem::Requirement
+  requirement: &2169412600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,21 +65,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2166055760
-- !ruby/object:Gem::Dependency
-  name: headless
-  requirement: &2166054120 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: *2166054120
+  version_requirements: *2169412600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2166052140 !ruby/object:Gem::Requirement
+  requirement: &2169411380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +76,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2166052140
+  version_requirements: *2169411380
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &2166051540 !ruby/object:Gem::Requirement
+  requirement: &2169410480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +87,10 @@ dependencies:
         version: 0.0.6
   type: :development
   prerelease: false
-  version_requirements: *2166051540
+  version_requirements: *2169410480
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2166044680 !ruby/object:Gem::Requirement
+  requirement: &2169409940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166044680
+  version_requirements: *2169409940
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2166043680 !ruby/object:Gem::Requirement
+  requirement: &2169409400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +109,7 @@ dependencies:
         version: 2.3.5
   type: :development
   prerelease: false
-  version_requirements: *2166043680
+  version_requirements: *2169409400
 description: WebDriver-backed Watir
 email:
 - jari.bakken@gmail.com
@@ -205,6 +194,7 @@ files:
 - spec/special_chars_spec.rb
 - spec/wait_spec.rb
 - support/html5.html
+- support/travis.sh
 - watir-webdriver.gemspec
 homepage: http://github.com/jarib/watir-webdriver
 licenses: []