watir 6.0.2 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c452d14d2ec0f55db84854a88fa81bf2631c8be0
-  data.tar.gz: 212508555b65ff6e62c953e4b1a2d81827a86502
+  metadata.gz: b31273840de10dfe1602617e11a26791aeaa987c
+  data.tar.gz: 46d8f8dce7328f9c0a565b1192b76ff8a043c991
 SHA512:
-  metadata.gz: 11db8f172a9752d82e1388972427b8b4a3857674f29ac78a36255c56465d9d3ff3f0b0d93c591941d38976ceb9f1cbc7ef18fba06006e331ce82208069cb96d8
-  data.tar.gz: 72118e5609b15e570bc2c1c75a8fc68a84b29122da6faef9b81f58b605d970ff0ec6aa38403d96c6c4f4d7ed061be39d63359bb8fb2391d98184922dbfff0f2d
+  metadata.gz: 9ef6b109c77b683ec6a6cc9d8fd539bb87538c8ebe5eda2d5991ca34edd4600f187ed4df7b353c73e9916dbb030308039cdd09eddc0ea17953be4540708aa002
+  data.tar.gz: f806448ab1781831144860d84640e2f85739f05b25d58e6094125aeab51b332ea5b2e372edeb1e1ba0f4fcf4fa762cd1a9197150cf7897109d354570858582af

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 6.0.3 (2016-12-22)
+
+* No notable changes, only includes fixes for WatirSpec
+
 ### 6.0.2 (2016-11-15)
 
 * Fix bug for `Timer#current_time` calling the wrong `Time`

data/lib/watirspec.rb

@@ -13,6 +13,7 @@ module WatirSpec
     end
 
     def run!
+      load_support
       WatirSpec::Runner.execute_if_necessary
     end
 
@@ -28,6 +29,13 @@ module WatirSpec
       @unguarded ||= false
     end
 
+    def load_support
+      root = File.expand_path("../../spec/watirspec", __FILE__)
+      Dir.glob("#{root}/support/**/*.rb").each do |file|
+        require file
+      end
+    end
+
     def implementation
       @implementation ||= (
         imp = WatirSpec::Implementation.new

data/lib/watirspec/guards.rb

@@ -15,7 +15,7 @@ module WatirSpec
         print "\n\nWatirSpec guards for this implementation: "
 
         if gs.empty?
-         puts "none."
+          puts "none."
         else
           puts
           gs.each do |guard|
@@ -48,7 +48,7 @@ module WatirSpec
     def bug(key, *impls)
       Guards.record :bug, impls, file: caller.first, key: key
       return yield if WatirSpec.unguarded?
-      yield unless WatirSpec.implementation.matches_guard?(impls)
+      yield if impls.any? && !WatirSpec.implementation.matches_guard?(impls)
     end
   end
 end

data/lib/watirspec/implementation.rb

@@ -24,7 +24,7 @@ module WatirSpec
 
     def matching_guards_in(guards)
       result = []
-      guards.each { |args, data| data.each { |d| result << d } if matches_guard?(args) }
+      guards.each { |args, data| data.each { |d| result << d } if args.empty? || matches_guard?(args) }
 
       result
     end

data/spec/spec_helper.rb

@@ -26,34 +26,3 @@ end
 if Selenium::WebDriver::Platform.linux? && ENV['DISPLAY'].nil?
   raise "DISPLAY not set"
 end
-
-TIMING_EXCEPTIONS = { raise_unknown_object_exception: Watir::Exception::UnknownObjectException,
-                      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}
-
-TIMING_EXCEPTIONS.each do |matcher, exception|
-  RSpec::Matchers.define matcher do |_expected|
-    match do |actual|
-      original_timeout = Watir.default_timeout
-      Watir.default_timeout = 0
-      begin
-        actual.call
-        false
-      rescue exception
-        true
-      ensure
-        Watir.default_timeout = original_timeout
-      end
-    end
-
-    failure_message do |actual|
-      "expected #{exception} but nothing was raised"
-    end
-
-    def supports_block_expectations?
-      true
-    end
-  end
-end

data/spec/watirspec/browser_spec.rb

@@ -78,7 +78,7 @@ describe "Browser" do
   bug "Capitalization bug fixed in upcoming release", %i(remote firefox) do
     describe "#name" do
       it "returns browser name" do
-        expect(browser.name).to eq WatirSpec.implementation.browser_args[1][:desired_capabilities].browser_name.to_sym
+        expect(browser.name).to eq(WatirSpec.implementation.browser_args.first)
       end
     end
   end

data/spec/watirspec/elements/forms_spec.rb

@@ -6,9 +6,11 @@ describe "Forms" do
     browser.goto(WatirSpec.url_for("forms_with_input_elements.html"))
   end
 
-  describe "with selectors" do
-    it "returns the matching elements" do
-      expect(browser.forms(method: "post").to_a).to eq [browser.form(method: "post")]
+  bug "https://github.com/watir/watir/issues/507" do
+    describe "with selectors" do
+      it "returns the matching elements" do
+        expect(browser.forms(method: "post").to_a).to eq [browser.form(method: "post")]
+      end
     end
   end
 

data/spec/watirspec/support/raise_exception_matchers.rb

@@ -0,0 +1,34 @@
+if defined?(RSpec)
+  TIMING_EXCEPTIONS = {
+    raise_unknown_object_exception: Watir::Exception::UnknownObjectException,
+    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
+  }.freeze
+
+  TIMING_EXCEPTIONS.each do |matcher, exception|
+    RSpec::Matchers.define matcher do |_expected|
+      match do |actual|
+        original_timeout = Watir.default_timeout
+        Watir.default_timeout = 0
+        begin
+          actual.call
+          false
+        rescue exception
+          true
+        ensure
+          Watir.default_timeout = original_timeout
+        end
+      end
+
+      failure_message do |_actual|
+        "expected #{exception} but nothing was raised"
+      end
+
+      def supports_block_expectations?
+        true
+      end
+    end
+  end
+end

data/watir.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'watir'
-  s.version     = '6.0.2'
+  s.version     = '6.0.3'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Alex Rodionov', 'Titus Fortner']
   s.email       = ['p0deje@gmail.com', 'titusfortner@gmail.com']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.0.3
 platform: ruby
 authors:
 - Alex Rodionov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -291,7 +291,6 @@ files:
 - spec/locator_spec_helper.rb
 - spec/spec_helper.rb
 - spec/special_chars_spec.rb
-- spec/watirspec/.gitignore
 - spec/watirspec/after_hooks_spec.rb
 - spec/watirspec/alert_spec.rb
 - spec/watirspec/browser_spec.rb
@@ -437,6 +436,7 @@ files:
 - spec/watirspec/html/window_switching.html
 - spec/watirspec/relaxed_locate_spec.rb
 - spec/watirspec/screenshot_spec.rb
+- spec/watirspec/support/raise_exception_matchers.rb
 - spec/watirspec/wait_spec.rb
 - spec/watirspec/window_switching_spec.rb
 - spec/watirspec_helper.rb
@@ -465,7 +465,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: watir
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Watir powered by Selenium
@@ -480,7 +480,6 @@ test_files:
 - spec/locator_spec_helper.rb
 - spec/spec_helper.rb
 - spec/special_chars_spec.rb
-- spec/watirspec/.gitignore
 - spec/watirspec/after_hooks_spec.rb
 - spec/watirspec/alert_spec.rb
 - spec/watirspec/browser_spec.rb
@@ -626,6 +625,7 @@ test_files:
 - spec/watirspec/html/window_switching.html
 - spec/watirspec/relaxed_locate_spec.rb
 - spec/watirspec/screenshot_spec.rb
+- spec/watirspec/support/raise_exception_matchers.rb
 - spec/watirspec/wait_spec.rb
 - spec/watirspec/window_switching_spec.rb
 - spec/watirspec_helper.rb

data/spec/watirspec/.gitignore

@@ -1,2 +0,0 @@
-*.rbc
-.idea