watir 6.0.3 → 6.1.0

data/lib/watir/window.rb

@@ -58,8 +58,8 @@ module Watir
     # @example
     #   browser.window.resize_to 1600, 1200
     #
-    # @param [Fixnum] width
-    # @param [Fixnum] height
+    # @param [Integer] width
+    # @param [Integer] height
     #
 
     def resize_to(width, height)
@@ -75,8 +75,8 @@ module Watir
     # @example
     #   browser.window.move_to 300, 200
     #
-    # @param [Fixnum] x
-    # @param [Fixnum] y
+    # @param [Integer] x
+    # @param [Integer] y
     #
 
     def move_to(x, y)

data/lib/watirspec.rb

@@ -72,15 +72,12 @@ module WatirSpec
       info = []
       info << instance.class.name
 
-      if instance.respond_to?(:driver) && instance.driver.class.name == "Selenium::WebDriver::Driver"
-        info << "(webdriver)"
-        caps = instance.driver.capabilities
+      caps = instance.driver.capabilities
 
-        info << "#{caps.browser_name}"
-        info << "#{caps.version}"
-      end
+      info << "#{caps.browser_name}"
+      info << "#{caps.version}"
 
-      $stderr.puts "running watirspec against #{info.join ' '} using args #{WatirSpec.implementation.browser_args.inspect}"
+      $stderr.puts "running watirspec against #{info.join ' '} using:\n#{WatirSpec.implementation.inspect_args}"
     rescue
       # ignored
     end

data/lib/watirspec/guards.rb

@@ -19,7 +19,9 @@ module WatirSpec
         else
           puts
           gs.each do |guard|
-            puts "\t#{guard[:name].to_s.ljust(20)}: #{guard[:data].inspect}"
+            guard[:data][:file] = guard[:data][:file][/\/spec\/(.*):/, 1]
+            guard_name = "#{guard[:name]}:".ljust(15)
+            puts " #{guard_name} #{guard[:data].inspect}"
           end
         end
       end

data/lib/watirspec/implementation.rb

@@ -29,5 +29,13 @@ module WatirSpec
       result
     end
 
+    def inspect_args
+      caps = browser_args.last.delete(:desired_capabilities).send(:capabilities)
+      string = "driver: #{browser_args.first}\n"
+      browser_args.last.each { |arg| string << "#{arg.inspect}\n" }
+      string << "capabilities:\n"
+      caps.each { |k, v| string << "\t#{k}: #{v}\n"}
+      string
+    end
   end # Implementation
 end # WatirSpec

data/spec/browser_spec.rb

@@ -77,10 +77,10 @@ describe Watir::Browser do
 
   describe "#wait_while" do
     it "delegates to the Wait module" do
-      expect(Watir::Wait).to receive(:while).with(timeout: 3, message: "foo", object: browser).and_yield
+      expect(Watir::Wait).to receive(:while).with(timeout: 3, message: "foo", interval: 0.2, object: browser).and_yield
 
       called = false
-      browser.wait_while(timeout: 3, message: "foo") { called = true }
+      browser.wait_while(timeout: 3, message: "foo", interval: 0.2) { called = true }
 
       expect(called).to be true
     end
@@ -88,10 +88,10 @@ describe Watir::Browser do
 
   describe "#wait_until" do
     it "delegates to the Wait module" do
-      expect(Watir::Wait).to receive(:until).with(timeout: 3, message: "foo", object: browser).and_yield
+      expect(Watir::Wait).to receive(:until).with(timeout: 3, message: "foo", interval: 0.2, object: browser).and_yield
 
       called = false
-      browser.wait_until(timeout: 3, message: "foo") { called = true }
+      browser.wait_until(timeout: 3, message: "foo", interval: 0.2) { called = true }
 
       expect(called).to be true
     end

data/spec/element_locator_spec.rb

@@ -283,14 +283,15 @@ describe Watir::Locators::Element::Locator do
     end
 
     describe "errors" do
-      it "raises a TypeError if :index is not a Fixnum" do
+      it "raises a TypeError if :index is not a Integer" do
         expect { locate_one(tag_name: "div", index: "bar") }.to \
-        raise_error(TypeError, %[expected Fixnum, got "bar":String])
+        raise_error(TypeError, %[expected Integer, got "bar":String])
       end
 
       it "raises a TypeError if selector value is not a String or Regexp" do
+        num_type = RUBY_VERSION[/^\d+\.(\d+)/, 1].to_i >= 4 ? 'Integer' : 'Fixnum'
         expect { locate_one(tag_name: 123) }.to \
-        raise_error(TypeError, %[expected one of [String, Regexp], got 123:Fixnum])
+        raise_error(TypeError, %[expected one of [String, Regexp], got 123:#{num_type}])
       end
 
       it "raises a MissingWayOfFindingObjectException if the attribute is not valid" do

data/spec/element_spec.rb

@@ -117,7 +117,7 @@ describe Watir::Element do
     it "displays selector string for element from colection" do
       browser.goto(WatirSpec.url_for("wait.html"))
       element = browser.divs.last
-      error = 'timed out after 0 seconds, waiting for true condition on {:tag_name=>"div", :index=>4}'
+      error = 'timed out after 0 seconds, waiting for true condition on {:tag_name=>"div", :index=>5}'
       expect { element.wait_until_present(timeout: 0) }.to raise_exception(Watir::Wait::TimeoutError, error)
     end
 

data/spec/watirspec/element_hidden_spec.rb

@@ -14,7 +14,7 @@ describe Watir::Locators::Element::Locator do
       end
 
       it "handles tag_name and index" do
-        element =  browser.div(visible: true, index: 1)
+        element = browser.div(visible: true, index: 1)
         expect(element.id).to eq 'buttons'
       end
 
@@ -32,6 +32,11 @@ describe Watir::Locators::Element::Locator do
         element = browser.element(visible: true, css: 'div#foo')
         expect(element.id).to eq 'foo'
       end
+
+      it "handles in collections" do
+        elements = browser.divs(visible: true)
+        expect(elements.size).to eq 3
+      end
     end
 
     context "when false" do
@@ -59,6 +64,11 @@ describe Watir::Locators::Element::Locator do
         element = browser.element(visible: false, css: 'div#bar')
         expect(element.id).to eq 'bar'
       end
+
+      it "handles in collections" do
+        elements = browser.divs(visible: false)
+        expect(elements.size).to eq 3
+      end
     end
   end
 end

data/spec/watirspec/elements/select_list_spec.rb

@@ -341,8 +341,8 @@ describe "SelectList" do
     end
 
     it "raises NoValueFoundException if the option doesn't exist" do
-      expect { browser.select_list(name: "new_user_country").select("missing_option") }.to raise_error(Watir::Exception::NoValueFoundException)
-      expect { browser.select_list(name: "new_user_country").select(/missing_option/) }.to raise_error(Watir::Exception::NoValueFoundException)
+      expect { browser.select_list(name: "new_user_country").select("missing_option") }.to raise_no_value_found_exception
+      expect { browser.select_list(name: "new_user_country").select(/missing_option/) }.to raise_no_value_found_exception
     end
 
     it "raises ObjectDisabledException if the option is disabled" do
@@ -371,8 +371,8 @@ describe "SelectList" do
     end
 
     it "raises NoValueFoundException if the option doesn't exist" do
-      expect { browser.select_list(name: "new_user_languages").select_value("no_such_option") }.to raise_error(Watir::Exception::NoValueFoundException)
-      expect { browser.select_list(name: "new_user_languages").select_value(/no_such_option/) }.to raise_error(Watir::Exception::NoValueFoundException)
+      expect { browser.select_list(name: "new_user_languages").select_value("no_such_option") }.to raise_no_value_found_exception
+      expect { browser.select_list(name: "new_user_languages").select_value(/no_such_option/) }.to raise_no_value_found_exception
     end
   end
 

data/spec/watirspec/html/wait.html

@@ -58,6 +58,20 @@
         show and enable btn
       </a>
     </div>
+    <div>
+      <a id="add_select" href="#" onclick="setTimeoutDisplay('languages', 'block', 500);">show select list</a>
+    </div>
+    <form>
+      <fieldset>
+        <select name="languages" id="languages", style="display: none">
+          <option id="danish" value="1">Danish</option>
+          <option selected="selected" value="2">English</option>
+          <option selected="selected" value="3">Norwegian</option>
+          <option value="4" disabled>Russian</option>
+          <option>Swedish</option>
+        </select> <br />
+      </fieldset>
+    </form>
     <div id="also_hidden" style="display:none;">
       <div id="hidden_child">Nothing to see here</div>
     </div>

data/spec/watirspec/relaxed_locate_spec.rb

@@ -14,6 +14,7 @@ describe 'Watir#relaxed_locate?' do
             Watir.default_timeout = time_out
             element = browser.link(id: 'not_there')
             start_time = ::Time.now
+            allow($stderr).to receive(:write).twice
             expect { element.click }.to raise_exception(Watir::Exception::UnknownObjectException)
             expect(::Time.now - start_time).to be > time_out
           ensure
@@ -83,6 +84,7 @@ describe 'Watir#relaxed_locate?' do
             element = browser.div(id: 'also_hidden').div(id: 'hidden_child')
             error = Watir::Exception::UnknownObjectException
             message = "element located, but timed out after #{Watir.default_timeout} seconds, waiting for true condition on #{selector}"
+            allow($stderr).to receive(:write).twice
             expect { element.click }.to raise_exception(error, message)
           ensure
             Watir.default_timeout = 30
@@ -96,6 +98,7 @@ describe 'Watir#relaxed_locate?' do
             element = browser.div(id: 'buttons').button(id: 'btn2')
             error = Watir::Exception::UnknownObjectException
             message = "element located, but timed out after #{Watir.default_timeout} seconds, waiting for true condition on #{selector}"
+            allow($stderr).to receive(:write).twice
             expect { element.click }.to raise_exception(error, message)
           ensure
             Watir.default_timeout = 30
@@ -162,6 +165,7 @@ describe 'Watir#relaxed_locate?' do
         begin
           Watir.default_timeout = 1.1
           browser.a(id: 'add_foobar').click
+          allow($stderr).to receive(:write).twice
           # Element created after 1 second, and displays after 2 seconds
           # Click will only raise this exception if the timer is not reset between #wait_for_exists and #wait_for_present
           expect { browser.div(id: 'foobar').click }.to raise_exception Watir::Exception::UnknownObjectException

data/spec/watirspec/support/raise_exception_matchers.rb

@@ -4,7 +4,8 @@ if defined?(RSpec)
     raise_no_matching_window_exception: Watir::Exception::NoMatchingWindowFoundException,
     raise_unknown_frame_exception: Watir::Exception::UnknownFrameException,
     raise_object_disabled_exception: Watir::Exception::ObjectDisabledException,
-    raise_object_read_only_exception: Watir::Exception::ObjectReadOnlyException
+    raise_object_read_only_exception: Watir::Exception::ObjectReadOnlyException,
+    raise_no_value_found_exception: Watir::Exception::NoValueFoundException
   }.freeze
 
   TIMING_EXCEPTIONS.each do |matcher, exception|

data/spec/watirspec/wait_spec.rb

@@ -23,6 +23,17 @@ not_compliant_on :safari do
         }.to raise_error(Watir::Wait::TimeoutError, "timed out after 0.5 seconds, oops")
       end
 
+      it "uses provided interval" do
+        begin
+          Watir::Wait.until(timeout: 0.4, interval: 0.2) do
+            @result = @result.nil? ? 1 : @result + 1
+            false
+          end
+        rescue Watir::Wait::TimeoutError
+        end
+        expect(@result).to eq 2
+      end
+
       it "uses timer for waiting" do
         timer = Watir::Wait.timer
         expect(timer).to receive(:wait).with(0.5).and_call_original
@@ -54,6 +65,17 @@ not_compliant_on :safari do
         }.to raise_error(Watir::Wait::TimeoutError, "timed out after 0.5 seconds, oops")
       end
 
+      it "uses provided interval" do
+        begin
+          Watir::Wait.while(timeout: 0.4, interval: 0.2) do
+            @result = @result.nil? ? 1 : @result + 1
+            true
+          end
+        rescue Watir::Wait::TimeoutError
+        end
+        expect(@result).to eq 2
+      end
+
       it "uses timer for waiting" do
         timer = Watir::Wait.timer
         expect(timer).to receive(:wait).with(0.5).and_call_original
@@ -168,7 +190,7 @@ not_compliant_on :safari do
     end
 
     describe "#wait_until_present" do
-      it "it waits until the element appears" do
+      it "waits until the element appears" do
         browser.a(id: 'show_bar').click
         expect { browser.div(id: 'bar').wait_until_present(timeout: 5) }.to_not raise_exception
       end
@@ -178,11 +200,34 @@ not_compliant_on :safari do
         expect { browser.div(id: 'bar').wait_until_present(timeout: 1) }.to raise_error(Watir::Wait::TimeoutError, message)
       end
 
+      it "uses provided interval" do
+        element = browser.div(id: 'bar')
+        expect(element).to receive(:present?).twice
+
+        begin
+          element.wait_until_present(timeout: 0.4, interval: 0.2)
+        rescue Watir::Wait::TimeoutError
+        end
+      end
+
       it "ordered pairs are deprecated" do
         browser.a(id: 'show_bar').click
         message = /Instead of passing arguments into #wait_until_present method, use keywords/
         expect { browser.div(id: 'bar').wait_until_present(5) }.to output(message).to_stderr
       end
+
+      it 'waits to select an option' do
+        browser.a(id: 'add_select').click
+        select_list = browser.select_list(id: 'languages')
+        Watir.default_timeout = 1
+        begin
+          start_time = ::Time.now
+          expect { select_list.select('No') }.to raise_error Watir::Exception::NoValueFoundException
+          expect(::Time.now - start_time).to be > 1
+        ensure
+          Watir.default_timeout = 1
+        end
+      end
     end
 
     describe "#wait_while_present" do
@@ -196,11 +241,32 @@ not_compliant_on :safari do
         expect { browser.div(id: 'foo').wait_while_present(timeout: 1) }.to raise_error(Watir::Wait::TimeoutError, message)
       end
 
+      it "uses provided interval" do
+        element = browser.div(id: 'foo')
+        expect(element).to receive(:present?).twice
+
+        begin
+          element.wait_until_present(timeout: 0.4, interval: 0.2)
+        rescue Watir::Wait::TimeoutError
+        end
+      end
+
       it "ordered pairs are deprecated" do
         browser.a(id: 'hide_foo').click
         message = /Instead of passing arguments into #wait_while_present method, use keywords/
         expect { browser.div(id: 'foo').wait_while_present(5) }.to output(message).to_stderr
       end
+
+      it "does not error when element goes stale" do
+        element = browser.div(id: 'foo')
+
+        allow(element).to receive(:stale?).and_return(false, true)
+        allow(element.wd).to receive(:displayed?).and_raise(Selenium::WebDriver::Error::StaleElementReferenceError)
+
+        browser.a(id: 'hide_foo').click
+        expect { element.wait_while_present(timeout: 1) }.to_not raise_exception
+      end
+
     end
 
     describe "#wait_until" do
@@ -229,6 +295,11 @@ not_compliant_on :safari do
         element = browser.div(id: 'bar')
         expect { element.wait_until(message: 'no') { true } }.to_not raise_exception
       end
+
+      it "accepts just an interval parameter" do
+        element = browser.div(id: 'bar')
+        expect { element.wait_until(interval: 0.1) { true } }.to_not raise_exception
+      end
     end
 
     describe "#wait_while" do
@@ -258,6 +329,11 @@ not_compliant_on :safari do
         element = browser.div(id: 'foo')
         expect { element.wait_while(message: 'no') { false } }.to_not raise_exception
       end
+
+      it "accepts just an interval parameter" do
+        element = browser.div(id: 'foo')
+        expect { element.wait_while(interval: 0.1) { false } }.to_not raise_exception
+      end
     end
   end
 

data/watir.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'watir'
-  s.version     = '6.0.3'
+  s.version     = '6.1.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Alex Rodionov', 'Titus Fortner']
   s.email       = ['p0deje@gmail.com', 'titusfortner@gmail.com']
@@ -21,7 +21,7 @@ It facilitates the writing of automated tests by mimicing the behavior of a user
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency "selenium-webdriver", "~> 3.0"
+  s.add_dependency 'selenium-webdriver', '~> 3.0'
 
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'yard', '> 0.8.2.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.1.0
 platform: ruby
 authors:
 - Alex Rodionov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -465,7 +465,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: watir
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Watir powered by Selenium