watir-webdriver 0.6.11 → 0.7.0

data/spec/element_spec.rb

@@ -18,13 +18,26 @@ describe Watir::Element do
     it 'returns false if the element does not exist' do
       expect(browser.div(:id, 'should-not-exist')).to_not be_present
     end
+
+    it "returns false if the element is stale" do
+      wd_element = browser.div(:id => "foo").wd
+
+      # simulate element going stale during lookup
+      allow(browser.driver).to receive(:find_element).with(:id, 'foo') { wd_element }
+      browser.refresh
+
+      expect(browser.div(:id, 'foo')).to_not be_present
+    end
+
   end
 
   describe "#reset!" do
     it "successfully relocates collection elements after a reset!" do
-      element = browser.divs(:id, 'foo').to_a.first
-      expect(element).to_not be_nil
-
+      browser.goto(WatirSpec.url_for("wait.html", :needs_server => true))
+      element = browser.div(:id, 'foo')
+      expect(element).to exist
+      browser.refresh
+      expect(element.exist?).to be false unless Watir.always_locate?
       element.send :reset!
       expect(element).to exist
     end
@@ -35,8 +48,8 @@ describe Watir::Element do
       browser.goto WatirSpec.url_for('removed_element.html', :needs_server => true)
     end
 
-    it "should not propagate ObsoleteElementErrors" do
-      button  = browser.button(:id => "remove-button")
+    it "does not propagate StaleElementReferenceErrors" do
+      button = browser.button(:id => "remove-button")
       element = browser.div(:id => "text")
 
       expect(element).to exist
@@ -44,16 +57,16 @@ describe Watir::Element do
       expect(element).to_not exist
     end
 
-    it "should determine if element constructed with WebDriver element is stale" do
+    it "returns false when an element from a collection becomes stale" do
       button = browser.button(:id => "remove-button")
-      text   = browser.element(:element, browser.div(:id => "text").wd)
+      text = browser.divs(:id => "text").first
 
       expect(text).to exist
       button.click
       expect(text).to_not exist
     end
 
-    it "should handle element that becomes stale during lookup" do
+    it "returns false when an element becomes stale" do
       wd_element = browser.div(:id => "text").wd
 
       # simulate element going stale during lookup
@@ -62,6 +75,28 @@ describe Watir::Element do
 
       expect(browser.div(:id, 'text')).to_not exist
     end
+  end
+
+  describe "#element_call" do
+
+    it 'handles exceptions when taking an action on an element that goes stale during execution' do
+      browser.goto WatirSpec.url_for('removed_element.html', :needs_server => true)
+
+      watir_element = browser.div(:id => "text")
+
+        # simulate element going stale after assert_exists and before action taken
+      allow(watir_element).to receive(:text) do
+        watir_element.send :assert_exists
+        browser.refresh
+        watir_element.send(:element_call) { watir_element.instance_variable_get('@element').text }
+      end
+
+      if Watir.always_locate?
+        expect { watir_element.text }.to_not raise_error
+      else
+        expect { watir_element.text }.to raise_error Selenium::WebDriver::Error::StaleElementReferenceError
+      end
+    end
 
   end
 

data/spec/input_spec.rb

@@ -6,37 +6,6 @@ describe Watir::Input do
     browser.goto WatirSpec.url_for("forms_with_input_elements.html")
   end
 
-  describe "#to_subtype" do
-    it "returns a CheckBox instance" do
-      e = browser.input(:xpath => "//input[@type='checkbox']").to_subtype
-      expect(e).to be_kind_of(Watir::CheckBox)
-    end
-
-    it "returns a Radio instance" do
-      e = browser.input(:xpath => "//input[@type='radio']").to_subtype
-      expect(e).to be_kind_of(Watir::Radio)
-    end
-
-    it "returns a Button instance" do
-      es = [
-        browser.input(:xpath => "//input[@type='button']").to_subtype,
-        browser.input(:xpath => "//input[@type='submit']").to_subtype
-      ]
-
-      es.all? { |e| expect(e).to be_kind_of(Watir::Button) }
-    end
-
-    it "returns a TextField instance" do
-      e = browser.input(:xpath => "//input[@type='text']").to_subtype
-      expect(e).to be_kind_of(Watir::TextField)
-    end
-
-    it "returns a TextField instance" do
-      e = browser.input(:xpath => "//input[@type='file']").to_subtype
-      expect(e).to be_kind_of(Watir::FileField)
-    end
-  end
-
   describe "#type" do
     it "returns an email type" do
       expect(browser.input(:name => "html5_email").type).to eq 'email'

data/spec/spec_helper.rb

@@ -11,7 +11,6 @@ require 'rubygems'
 require 'rspec'
 
 include Watir
-include Watir::Exception
 
 if ENV['ALWAYS_LOCATE'] == "false"
   Watir.always_locate = false

data/support/doctest_helper.rb

@@ -0,0 +1,72 @@
+require 'watir-webdriver'
+require 'spec/watirspec/lib/watirspec'
+
+#
+# 1. If example does not start browser, start new one, reuse until example
+#    finishes and close after
+# 2. If example starts browser and assigns it to local variable `browser`,
+#    it will still be closed
+#
+
+def browser
+  @browser ||= Watir::Browser.start(WatirSpec.url_for('forms_with_input_elements.html'))
+end
+
+YARD::Doctest.configure do |doctest|
+  doctest.skip 'Watir::Browser.start'
+  doctest.skip 'Watir::Cookies'
+  doctest.skip 'Watir::Element#to_subtype'
+  doctest.skip 'Watir::Option'
+  doctest.skip 'Watir::Screenshot'
+  doctest.skip 'Watir::Window#size'
+  doctest.skip 'Watir::Window#position'
+
+  %w[text ok close exists?].each do |name|
+    doctest.before("Watir::Alert##{name}") do
+      browser.goto WatirSpec.url_for('alerts.html')
+      browser.button(:id => 'alert').click
+    end
+  end
+
+  doctest.before('Watir::Alert#set') do
+    browser.goto WatirSpec.url_for('alerts.html')
+    browser.button(:id => 'prompt').click
+  end
+
+  doctest.before('Watir::CheckBox#set') do
+    browser.goto WatirSpec.url_for('forms_with_input_elements.html')
+    checkbox = browser.checkbox(:id => 'new_user_interests_cars')
+  end
+
+  %w[Watir::Browser#execute_script Watir::Element#drag_and_drop].each do |name|
+    doctest.before(name) do
+      browser.goto WatirSpec.url_for('drag_and_drop.html')
+    end
+  end
+
+  doctest.before('Watir::Element#attribute_value') do
+    browser.goto WatirSpec.url_for('non_control_elements.html')
+  end
+
+  %w[inner_html outer_html].each do |name|
+    doctest.before("Watir::Element##{name}") do
+      browser.goto WatirSpec.url_for('inner_outer.html')
+    end
+  end
+
+  %w[Watir::HasWindow Watir::Window#== Watir::Window#use].each do |name|
+    doctest.before(name) do
+      browser.goto WatirSpec.url_for('window_switching.html')
+      browser.a(:id => 'open').click
+    end
+  end
+
+  doctest.after do
+    browser.quit
+    @browser = nil
+  end
+end
+
+if ENV['TRAVIS']
+  ENV['DISPLAY'] = ':99.0'
+end

data/support/travis.sh

@@ -9,9 +9,13 @@ export CHROMEDRIVER_VERSION=2.9
 sh -e /etc/init.d/xvfb start
 git submodule update --init
 
+mkdir ~/.yard
+bundle exec yard config -a autoload_plugins yard-doctest
+
 if [[ "$WATIR_WEBDRIVER_BROWSER" = "chrome" ]]; then
   sudo chmod 1777 /dev/shm
 
+  sudo apt-get update
   sudo apt-get install -y unzip libxss1
 
   curl -L -O "http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/${CHROME_REVISION}/chrome-linux.zip"

data/watir-webdriver.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "selenium-webdriver", '>= 2.18.0'
+  s.add_dependency "selenium-webdriver", '>= 2.45'
 
   s.add_development_dependency "rspec", "~> 2.6"
   s.add_development_dependency "yard", "~> 0.8.2.1"
@@ -32,4 +32,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "activesupport", "~> 3.0" # for pluralization during code generation
   s.add_development_dependency "pry"
   s.add_development_dependency "coveralls"
+  s.add_development_dependency "yard-doctest"
 end

metadata

@@ -1,167 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: watir-webdriver
 version: !ruby/object:Gem::Version
-  version: 0.6.11
+  version: 0.7.0
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2015-03-02 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
+        version: '2.45'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.18.0
+        version: '2.45'
 - !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'
+- !ruby/object:Gem::Dependency
+  name: yard-doctest
+  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,10 +185,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .gitmodules
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".gitmodules"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -245,6 +259,7 @@ files:
 - lib/watir-webdriver/wait/timer.rb
 - lib/watir-webdriver/window.rb
 - lib/watir-webdriver/xpath_support.rb
+- spec/always_locate_spec.rb
 - spec/browser_spec.rb
 - spec/click_spec.rb
 - spec/container_spec.rb
@@ -252,7 +267,6 @@ files:
 - spec/element_spec.rb
 - spec/html/clicks.html
 - spec/html/hover.html
-- spec/html/inner_outer.html
 - spec/html/removed_element.html
 - spec/html/special_chars.html
 - spec/implementation.rb
@@ -260,6 +274,7 @@ files:
 - spec/locator_spec_helper.rb
 - spec/spec_helper.rb
 - spec/special_chars_spec.rb
+- support/doctest_helper.rb
 - support/travis.sh
 - support/version_differ.rb
 - watir-webdriver.gemspec
@@ -273,21 +288,22 @@ 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.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Watir on WebDriver
 test_files:
+- spec/always_locate_spec.rb
 - spec/browser_spec.rb
 - spec/click_spec.rb
 - spec/container_spec.rb
@@ -295,7 +311,6 @@ test_files:
 - spec/element_spec.rb
 - spec/html/clicks.html
 - spec/html/hover.html
-- spec/html/inner_outer.html
 - spec/html/removed_element.html
 - spec/html/special_chars.html
 - spec/implementation.rb