watir-webdriver 0.6.4 → 0.6.5

data/spec/locator_spec_helper.rb

@@ -2,7 +2,7 @@ require 'active_support/ordered_hash'
 
 module LocatorSpecHelper
   def driver
-    @driver ||= mock(Selenium::WebDriver::Driver)
+    @driver ||= double(Selenium::WebDriver::Driver)
   end
 
   def locator(selector, attrs)
@@ -28,10 +28,10 @@ module LocatorSpecHelper
 
   def element(opts = {})
     attrs = opts.delete(:attributes)
-    el = mock(Watir::Element, opts)
+    el = double(Watir::Element, opts)
 
     attrs.each do |key, value|
-      el.stub!(:attribute).with(key).and_return(value)
+      el.stub(:attribute).with(key).and_return(value)
     end if attrs
 
     el

data/spec/special_chars_spec.rb

@@ -7,7 +7,7 @@ describe Watir::Browser do
   end
 
   it "finds elements with single quotes" do
-    browser.div(:text => "single 'quotes'").should exist
+    expect(browser.div(:text => "single 'quotes'")).to exist
   end
 
 end

data/support/travis.sh

@@ -3,16 +3,30 @@
 set -e
 set -x
 
-CHROME_REVISION=191150
-sh -e /etc/init.d/xvfb start && git submodule update --init
+export CHROME_REVISION=228611
+export CHROMEDRIVER_VERSION=2.4
+
+sh -e /etc/init.d/xvfb start
+git submodule update --init
 
 if [[ "$WATIR_WEBDRIVER_BROWSER" = "chrome" ]]; then
+  sudo chmod 1777 /dev/shm
+
   sudo apt-get install -y unzip libxss1
-  curl -L -O "http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/$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_x64/$CHROME_REVISION/chrome-linux.test/chromedriver" > chrome-linux/chromedriver
+
+  # chrome sandbox doesn't currently work on travis: https://github.com/travis-ci/travis-ci/issues/938
+  sudo chown root:root chrome-linux/chrome_sandbox
+  sudo chmod 4755 chrome-linux/chrome_sandbox
+  export CHROME_DEVEL_SANDBOX="$PWD/chrome-linux/chrome_sandbox"
+
+  curl -L -O "http://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_linux64.zip"
+  unzip chromedriver_linux64.zip
+
+  mv chromedriver chrome-linux/chromedriver
   chmod +x chrome-linux/chromedriver
-  sudo chmod 1777 /dev/shm
 fi
 
 if [[ "$WATIR_WEBDRIVER_BROWSER" = "phantomjs" ]]; then

data/watir-webdriver.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/watir/watir-webdriver"
   s.summary     = %q{Watir on WebDriver}
   s.description = %q{WebDriver-backed Watir}
+  s.license     = 'MIT'
 
   s.rubyforge_project = "watir-webdriver"
 

metadata

@@ -1,167 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: watir-webdriver
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-28 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.18.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.2.1
 - !ruby/object:Gem::Dependency
   name: webidl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     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: nokogiri
   requirement: !ruby/object:Gem::Requirement
     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: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: WebDriver-backed Watir
@@ -171,11 +171,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .gitmodules
-- .travis.yml
-- .yardopts
+- ".document"
+- ".gitignore"
+- ".gitmodules"
+- ".travis.yml"
+- ".yardopts"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -197,6 +197,7 @@ files:
 - lib/watir-webdriver/container.rb
 - lib/watir-webdriver/cookies.rb
 - lib/watir-webdriver/element_collection.rb
+- lib/watir-webdriver/elements/area.rb
 - lib/watir-webdriver/elements/button.rb
 - lib/watir-webdriver/elements/checkbox.rb
 - lib/watir-webdriver/elements/dlist.rb
@@ -204,9 +205,9 @@ files:
 - lib/watir-webdriver/elements/file_field.rb
 - lib/watir-webdriver/elements/font.rb
 - lib/watir-webdriver/elements/form.rb
-- lib/watir-webdriver/elements/frame.rb
 - lib/watir-webdriver/elements/generated.rb
 - lib/watir-webdriver/elements/hidden.rb
+- lib/watir-webdriver/elements/iframe.rb
 - lib/watir-webdriver/elements/image.rb
 - lib/watir-webdriver/elements/input.rb
 - lib/watir-webdriver/elements/link.rb
@@ -234,6 +235,7 @@ files:
 - lib/watir-webdriver/locators/child_cell_locator.rb
 - lib/watir-webdriver/locators/child_row_locator.rb
 - lib/watir-webdriver/locators/element_locator.rb
+- lib/watir-webdriver/locators/text_area_locator.rb
 - lib/watir-webdriver/locators/text_field_locator.rb
 - lib/watir-webdriver/row_container.rb
 - lib/watir-webdriver/screenshot.rb
@@ -252,18 +254,17 @@ files:
 - spec/html/hover.html
 - spec/html/removed_element.html
 - spec/html/special_chars.html
-- spec/html/wait.html
 - spec/implementation.rb
 - spec/input_spec.rb
 - spec/locator_spec_helper.rb
 - spec/spec_helper.rb
 - spec/special_chars_spec.rb
-- spec/wait_spec.rb
 - support/travis.sh
 - support/version_differ.rb
 - watir-webdriver.gemspec
 homepage: http://github.com/watir/watir-webdriver
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -271,17 +272,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: watir-webdriver
-rubygems_version: 2.0.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Watir on WebDriver
@@ -295,11 +296,9 @@ test_files:
 - spec/html/hover.html
 - spec/html/removed_element.html
 - spec/html/special_chars.html
-- spec/html/wait.html
 - spec/implementation.rb
 - spec/input_spec.rb
 - spec/locator_spec_helper.rb
 - spec/spec_helper.rb
 - spec/special_chars_spec.rb
-- spec/wait_spec.rb
 has_rdoc: 

data/spec/html/wait.html

@@ -1,28 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-  <head>
-    <title>wait test</title>
-    <script type="text/javascript" charset="utf-8">
-      function setTimeoutDisplay(id, display, timeout) {
-          setTimeout(function() {
-              document.getElementById(id).style.display = display;
-          }, timeout);
-      }
-
-      function setTimeoutRemove(id, timeout) {
-          setTimeout(function() {
-              var e = document.getElementById(id);
-              e.parentNode.removeChild(e);
-          }, timeout);
-      }
-    </script>
-  </head>
-
-  <body>
-    <div id="foo" style="display:block;">foo</div>
-    <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', 1000);">remove foo</a>
-  </body>
-</html>

data/spec/wait_spec.rb

@@ -1,118 +0,0 @@
-require File.expand_path("watirspec/spec_helper", File.dirname(__FILE__))
-
-not_compliant_on [:webdriver, :safari] do
-  describe Watir::Wait do
-    describe "#until" do
-      it "waits until the block returns true" do
-        Wait.until(0.5) { true }.should be_true
-      end
-
-      it "times out" do
-        lambda do
-          Wait.until(0.5) { false }
-        end.should raise_error(Watir::Wait::TimeoutError)
-      end
-
-      it "times out with a custom message" do
-        lambda do
-          Wait.until(0.5, "oops") { false }
-        end.should raise_error(Watir::Wait::TimeoutError, "timed out after 0.5 seconds, oops")
-      end
-    end
-
-    describe "#while" do
-      it "waits while the block returns true" do
-        Wait.while(0.5) { false }.should == nil
-      end
-
-      it "times out" do
-        lambda do
-          Wait.while(0.5) { true }
-        end.should raise_error(Watir::Wait::TimeoutError)
-      end
-
-      it "times out with a custom message" do
-        lambda do
-          Wait.while(0.5, "oops") { true }
-        end.should raise_error(Watir::Wait::TimeoutError, "timed out after 0.5 seconds, oops")
-      end
-    end
-  end
-
-  describe Watir::Element do
-    before do
-      browser.goto WatirSpec.url_for("wait.html", :needs_server => true)
-    end
-
-    describe "#when_present" do
-      it "yields when the element becomes present" do
-        called = false
-
-        browser.a(:id, 'show_bar').click
-        browser.div(:id, 'bar').when_present(2) { called = true }
-
-        called.should be_true
-      end
-
-      it "invokes subsequent method calls when the element becomes present" do
-        browser.a(:id, 'show_bar').click
-
-        bar = browser.div(:id, 'bar')
-        bar.when_present(2).click
-        bar.text.should == "changed"
-      end
-
-      it "times out when given a block" do
-        lambda {
-          browser.div(:id, 'bar').when_present(1) {}
-        }.should raise_error(Watir::Wait::TimeoutError)
-      end
-
-      it "times out when not given a block" do
-        lambda {
-          browser.div(:id, 'bar').when_present(1).click
-        }.should raise_error(Watir::Wait::TimeoutError,
-          /^timed out after 1 seconds, waiting for (\{:id=>"bar", :tag_name=>"div"\}|\{:tag_name=>"div", :id=>"bar"\}) to become present$/
-        )
-      end
-
-      it "responds to Element methods" do
-        decorator = browser.div.when_present
-
-        decorator.should respond_to(:exist?)
-        decorator.should respond_to(:present?)
-        decorator.should respond_to(:click)
-      end
-    end
-
-    describe "#wait_until_present" do
-      it "it waits until the element appears" do
-        browser.a(:id, 'show_bar').click
-        browser.div(:id, 'bar').wait_until_present(5)
-      end
-
-      it "times out if the element doesn't appear" do
-        lambda do
-          browser.div(:id, 'bar').wait_until_present(1)
-        end.should raise_error(Watir::Wait::TimeoutError,
-          /^timed out after 1 seconds, waiting for (\{:id=>"bar", :tag_name=>"div"\}|\{:tag_name=>"div", :id=>"bar"\}) to become present$/
-        )
-      end
-    end
-
-    describe "#wait_while_present" do
-      it "waits until the element disappears" do
-        browser.a(:id, 'hide_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)
-        end.should raise_error(Watir::Wait::TimeoutError,
-          /^timed out after 1 seconds, waiting for (\{:id=>"foo", :tag_name=>"div"\}|\{:tag_name=>"div", :id=>"foo"\}) to disappear$/
-        )
-      end
-    end
-  end
-end