watir 6.16.3 → 6.16.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGES.md +4 -0
- data/lib/watir/locators/element/locator.rb +10 -5
- data/lib/watir/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fcbf81dd19c0ffd26538c95fa2bc4d60bbb586f9
|
4
|
+
data.tar.gz: ca4c040702c05688734b705a5289050a6639a7fd
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a4eed31e3b8b780fb95b776139ad26ab74f25675a355c3eaf8ba31d5aaeb780456b1b2d59691c25e6f582189dd5614b3e5f193076c586e030c6a75fb492fdde5
|
7
|
+
data.tar.gz: c46820e3e7698298e3c647fc739b4531dd405b81fa4dc42b2a3aa8fc67c62981cb04b64e7fad666283fdf4a20f1dfbaadc967f661602c682b8e8b4eb9162036a
|
data/CHANGES.md
CHANGED
@@ -36,11 +36,6 @@ module Watir
|
|
36
36
|
def matching_elements
|
37
37
|
return locate_element(*@built.to_a.flatten) if @built.size == 1 && @filter == :first
|
38
38
|
|
39
|
-
# SelectorBuilder only allows one of these
|
40
|
-
wd_locator_key = (Watir::Locators::W3C_FINDERS & @built.keys).first
|
41
|
-
wd_locator = @built.select { |k, _v| wd_locator_key == k }
|
42
|
-
match_values = @built.reject { |k, _v| wd_locator_key == k }
|
43
|
-
|
44
39
|
# TODO: Wrap this to continue trying until default timeout
|
45
40
|
retries = 0
|
46
41
|
begin
|
@@ -56,6 +51,16 @@ module Watir
|
|
56
51
|
end
|
57
52
|
end
|
58
53
|
|
54
|
+
def wd_locator
|
55
|
+
# SelectorBuilder only allows one of these
|
56
|
+
wd_locator_key = (Watir::Locators::W3C_FINDERS & @built.keys).first
|
57
|
+
@wd_locator ||= @built.select { |k, _v| wd_locator_key == k }
|
58
|
+
end
|
59
|
+
|
60
|
+
def match_values
|
61
|
+
@match_values ||= @built.reject { |k, _v| wd_locator.keys.first == k }
|
62
|
+
end
|
63
|
+
|
59
64
|
def locator_scope
|
60
65
|
@locator_scope ||= @built.delete(:scope) || @query_scope.browser
|
61
66
|
end
|
data/lib/watir/version.rb
CHANGED