watir 6.4.3 → 6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02350fa770d3f560edf82f8fdb3efb33667b5c79
-  data.tar.gz: f25ed98f3c07012a3e7e6f940939872bd08e0a7b
+  metadata.gz: 6e19bc6a7d28d78bba208d88dd97a58bce85fc9d
+  data.tar.gz: 0031cc40646d67219270b7914369df5a7e084144
 SHA512:
-  metadata.gz: 62938c328cc2a16ac0d4ba6c48aa2bc09f0ac155a73adcd1bf63449120ed49139ecdba3cda0a4eab39e7eb4d6cde1e598e0a023f867be83aca6813336b5b4f94
-  data.tar.gz: 7b206faceabf70654fb6217fdcd7bb2be3f2ba9096c13dcbf97aaf68c5ea1af09e3d959b1c069397bf46caa7e5d990feae92fe77e7ced866df13c95e95ae5667
+  metadata.gz: f71791589c4bc26c594d25ffb755fec75a8cbf41c2d93e0bf8c9671573a66e2fac01a21618159c169fa79a25387963a5a79c6940a329b177939b305ede9c3dbd
+  data.tar.gz: 7ca2f02eb0a3c950f2e8b8e16ce8e1acb9c3dd8766637d8bc5c3594b49634c0dce2af3d7ec216add6d36f81968df69eb3b35215bd5a43c216b2c04883d350c98

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 6.5.0 (2017-07-25)
+
+* Add support for locating multiple classes using :class parameter 
+
 ### 6.4.3 (2017-07-19)
 
 * Fix bug with element relocation from ElementCollection 

data/lib/watir/locators/element/selector_builder.rb

@@ -2,7 +2,7 @@ module Watir
   module Locators
     class Element
       class SelectorBuilder
-        VALID_WHATS = [String, Regexp, TrueClass, FalseClass].freeze
+        VALID_WHATS = [Array, String, Regexp, TrueClass, FalseClass].freeze
         WILDCARD_ATTRIBUTE = /^(aria|data)_(.+)$/
 
         def initialize(query_scope, selector, valid_attributes)
@@ -35,6 +35,9 @@ module Watir
               raise TypeError, "expected TrueClass or FalseClass, got #{what.inspect}:#{what.class}"
             end
           else
+            if what.is_a?(Array) && how != :class
+              raise TypeError, "Only :class locator can have a value of an Array"
+            end
             unless VALID_WHATS.any? { |t| what.is_a? t }
               raise TypeError, "expected one of #{VALID_WHATS.inspect}, got #{what.inspect}:#{what.class}"
             end

data/lib/watir/locators/element/selector_builder/xpath.rb

@@ -26,7 +26,9 @@ module Watir
           # @todo Get rid of building
           def attribute_expression(building, selectors)
             f = selectors.map do |key, val|
-              if val.is_a?(Array)
+              if val.is_a?(Array) && key == :class
+                "(" + val.map { |v| build_class_match(v) }.join(" and ") + ")"
+              elsif val.is_a?(Array)
                 "(" + val.map { |v| equal_pair(building, key, v) }.join(" or ") + ")"
               elsif val == true
                 attribute_presence(key)
@@ -42,8 +44,10 @@ module Watir
           # @todo Get rid of building
           def equal_pair(building, key, value)
             if key == :class
-              klass = XpathSupport.escape " #{value} "
-              "contains(concat(' ', @class, ' '), #{klass})"
+              if value.strip.include?(' ')
+                warn 'Using the :class locator to locate multiple classes with a String value is deprecated; use an Array instead'
+              end
+              build_class_match(value)
             elsif key == :label && @should_use_label_element
               # we assume :label means a corresponding label element, not the attribute
               text = "normalize-space()=#{XpathSupport.escape value}"
@@ -72,6 +76,16 @@ module Watir
 
           private
 
+          def build_class_match(value)
+            if value.match(/^!/)
+              klass = XpathSupport.escape " #{value[1..-1]} "
+              "not(contains(concat(' ', @class, ' '), #{klass}))"
+            else
+              klass = XpathSupport.escape " #{value} "
+              "contains(concat(' ', @class, ' '), #{klass})"
+            end
+          end
+
           def attribute_presence(attribute)
             lhs_for(nil, attribute)
           end

data/spec/element_locator_spec.rb

@@ -303,7 +303,7 @@ describe Watir::Locators::Element::Locator do
       it "raises a TypeError if selector value is not a String, Regexp or Boolean" 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, TrueClass, FalseClass], got 123:#{num_type}])
+        raise_error(TypeError, %[expected one of [Array, String, Regexp, TrueClass, FalseClass], got 123:#{num_type}])
       end
 
       it "raises a MissingWayOfFindingObjectException if the attribute is not valid" do

data/spec/locator_spec_helper.rb

@@ -1,5 +1,3 @@
-require 'active_support/ordered_hash'
-
 module LocatorSpecHelper
   def browser
     @browser ||= double(Watir::Browser, wd: driver)
@@ -48,7 +46,7 @@ module LocatorSpecHelper
     when Hash
       selector
     when Array
-      ActiveSupport::OrderedHash[*selector]
+      Hash[*selector]
     else
       raise ArgumentError, "couldn't create hash for #{selector.inspect}"
     end

data/spec/watirspec/elements/element_spec.rb

@@ -237,16 +237,42 @@ describe "Element" do
       it "matches when the element has several classes" do
         e = browser.div(class: "b")
         expect(e).to exist
-        expect(e.class_name).to eq "a b"
+        expect(e.class_name).to eq "a b c"
       end
 
       it "does not match only part of the class name" do
-        expect(browser.div(class: "c")).to_not exist
+        expect(browser.div(class: "bc")).to_not exist
       end
 
       it "matches part of the class name when given a regexp" do
         expect(browser.div(class: /c/)).to exist
       end
+
+      context "with multiple classes" do
+        it "matches when the element has a single class" do
+          e = browser.div(class: ["a"])
+          expect(e).to exist
+          expect(e.class_name).to eq "a"
+        end
+
+        it "matches a non-ordered subset" do
+          e = browser.div(class: ["c", "a"])
+          expect(e).to exist
+          expect(e.class_name).to eq "a b c"
+        end
+
+        it "matches one with a negation" do
+          e = browser.div(class: ["!a"])
+          expect(e).to exist
+          expect(e.class_name).to eq "abc"
+        end
+
+        it "matches multiple with a negation" do
+          e = browser.div(class: ["a", "!c", "b"])
+          expect(e).to exist
+          expect(e.class_name).to eq "a b"
+        end
+      end
     end
 
     context "attribute presence" do

data/spec/watirspec/html/class_locator.html

@@ -2,6 +2,7 @@
 <html>
   <body>
     <div class="a">a</div>
+    <div class="a b c">a b c</div>
     <div class="a b">a b</div>
     <div class="abc">abc</div>
   </body>

data/watir.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'watir'
-  s.version     = '6.4.3'
+  s.version     = '6.5.0'
   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.4.3
+  version: 6.5.0
 platform: ruby
 authors:
 - Alex Rodionov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -481,7 +481,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: watir
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Watir powered by Selenium