capybara 3.23.0 → 3.35.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/History.md +264 -11
- data/README.md +10 -6
- data/lib/capybara.rb +20 -8
- data/lib/capybara/config.rb +10 -8
- data/lib/capybara/cucumber.rb +1 -1
- data/lib/capybara/driver/base.rb +4 -0
- data/lib/capybara/driver/node.rb +4 -0
- data/lib/capybara/dsl.rb +10 -2
- data/lib/capybara/helpers.rb +28 -2
- data/lib/capybara/minitest.rb +232 -144
- data/lib/capybara/minitest/spec.rb +156 -97
- data/lib/capybara/node/actions.rb +36 -36
- data/lib/capybara/node/base.rb +6 -6
- data/lib/capybara/node/document.rb +2 -2
- data/lib/capybara/node/document_matchers.rb +3 -3
- data/lib/capybara/node/element.rb +77 -33
- data/lib/capybara/node/finders.rb +24 -17
- data/lib/capybara/node/matchers.rb +79 -64
- data/lib/capybara/node/simple.rb +11 -4
- data/lib/capybara/queries/ancestor_query.rb +6 -10
- data/lib/capybara/queries/base_query.rb +2 -1
- data/lib/capybara/queries/current_path_query.rb +14 -4
- data/lib/capybara/queries/selector_query.rb +259 -23
- data/lib/capybara/queries/sibling_query.rb +5 -11
- data/lib/capybara/queries/style_query.rb +1 -1
- data/lib/capybara/queries/text_query.rb +13 -1
- data/lib/capybara/rack_test/browser.rb +13 -4
- data/lib/capybara/rack_test/driver.rb +2 -1
- data/lib/capybara/rack_test/form.rb +2 -2
- data/lib/capybara/rack_test/node.rb +42 -6
- data/lib/capybara/registration_container.rb +44 -0
- data/lib/capybara/registrations/drivers.rb +18 -12
- data/lib/capybara/registrations/patches/puma_ssl.rb +29 -0
- data/lib/capybara/registrations/servers.rb +9 -2
- data/lib/capybara/result.rb +39 -19
- data/lib/capybara/rspec.rb +2 -0
- data/lib/capybara/rspec/matcher_proxies.rb +5 -5
- data/lib/capybara/rspec/matchers.rb +97 -74
- data/lib/capybara/rspec/matchers/base.rb +19 -6
- data/lib/capybara/rspec/matchers/count_sugar.rb +2 -1
- data/lib/capybara/rspec/matchers/have_ancestor.rb +5 -7
- data/lib/capybara/rspec/matchers/have_current_path.rb +2 -2
- data/lib/capybara/rspec/matchers/have_selector.rb +15 -10
- data/lib/capybara/rspec/matchers/have_sibling.rb +4 -7
- data/lib/capybara/rspec/matchers/have_text.rb +4 -7
- data/lib/capybara/rspec/matchers/have_title.rb +2 -2
- data/lib/capybara/rspec/matchers/match_selector.rb +3 -3
- data/lib/capybara/rspec/matchers/match_style.rb +7 -2
- data/lib/capybara/rspec/matchers/spatial_sugar.rb +39 -0
- data/lib/capybara/selector.rb +46 -19
- data/lib/capybara/selector/builders/css_builder.rb +10 -6
- data/lib/capybara/selector/builders/xpath_builder.rb +4 -2
- data/lib/capybara/selector/css.rb +1 -1
- data/lib/capybara/selector/definition.rb +13 -11
- data/lib/capybara/selector/definition/button.rb +32 -15
- data/lib/capybara/selector/definition/checkbox.rb +2 -2
- data/lib/capybara/selector/definition/css.rb +3 -1
- data/lib/capybara/selector/definition/datalist_input.rb +2 -2
- data/lib/capybara/selector/definition/datalist_option.rb +1 -1
- data/lib/capybara/selector/definition/element.rb +3 -2
- data/lib/capybara/selector/definition/field.rb +1 -1
- data/lib/capybara/selector/definition/file_field.rb +1 -1
- data/lib/capybara/selector/definition/fillable_field.rb +2 -2
- data/lib/capybara/selector/definition/label.rb +5 -3
- data/lib/capybara/selector/definition/link.rb +8 -0
- data/lib/capybara/selector/definition/option.rb +1 -1
- data/lib/capybara/selector/definition/radio_button.rb +2 -2
- data/lib/capybara/selector/definition/select.rb +33 -14
- data/lib/capybara/selector/definition/table.rb +6 -3
- data/lib/capybara/selector/definition/table_row.rb +2 -2
- data/lib/capybara/selector/filter_set.rb +13 -11
- data/lib/capybara/selector/filters/base.rb +6 -1
- data/lib/capybara/selector/filters/locator_filter.rb +1 -1
- data/lib/capybara/selector/regexp_disassembler.rb +7 -0
- data/lib/capybara/selector/selector.rb +13 -3
- data/lib/capybara/selenium/atoms/getAttribute.min.js +1 -1
- data/lib/capybara/selenium/atoms/isDisplayed.min.js +1 -1
- data/lib/capybara/selenium/atoms/src/getAttribute.js +1 -1
- data/lib/capybara/selenium/atoms/src/isDisplayed.js +10 -10
- data/lib/capybara/selenium/driver.rb +86 -24
- data/lib/capybara/selenium/driver_specializations/chrome_driver.rb +24 -21
- data/lib/capybara/selenium/driver_specializations/edge_driver.rb +21 -19
- data/lib/capybara/selenium/driver_specializations/firefox_driver.rb +17 -1
- data/lib/capybara/selenium/driver_specializations/safari_driver.rb +0 -4
- data/lib/capybara/selenium/extensions/file_input_click_emulation.rb +34 -0
- data/lib/capybara/selenium/extensions/find.rb +37 -26
- data/lib/capybara/selenium/extensions/html5_drag.rb +55 -11
- data/lib/capybara/selenium/extensions/modifier_keys_stack.rb +28 -0
- data/lib/capybara/selenium/extensions/scroll.rb +8 -10
- data/lib/capybara/selenium/logger_suppressor.rb +8 -2
- data/lib/capybara/selenium/node.rb +160 -40
- data/lib/capybara/selenium/nodes/chrome_node.rb +72 -12
- data/lib/capybara/selenium/nodes/edge_node.rb +32 -14
- data/lib/capybara/selenium/nodes/firefox_node.rb +28 -32
- data/lib/capybara/selenium/nodes/safari_node.rb +5 -29
- data/lib/capybara/selenium/patches/action_pauser.rb +26 -0
- data/lib/capybara/selenium/patches/atoms.rb +4 -4
- data/lib/capybara/selenium/patches/is_displayed.rb +16 -0
- data/lib/capybara/selenium/patches/logs.rb +32 -7
- data/lib/capybara/server.rb +19 -3
- data/lib/capybara/server/animation_disabler.rb +8 -3
- data/lib/capybara/server/checker.rb +1 -1
- data/lib/capybara/server/middleware.rb +22 -10
- data/lib/capybara/session.rb +66 -40
- data/lib/capybara/session/config.rb +11 -3
- data/lib/capybara/session/matchers.rb +11 -11
- data/lib/capybara/spec/public/offset.js +6 -0
- data/lib/capybara/spec/public/test.js +75 -7
- data/lib/capybara/spec/session/accept_alert_spec.rb +1 -1
- data/lib/capybara/spec/session/all_spec.rb +60 -5
- data/lib/capybara/spec/session/ancestor_spec.rb +5 -0
- data/lib/capybara/spec/session/assert_text_spec.rb +9 -5
- data/lib/capybara/spec/session/check_spec.rb +6 -0
- data/lib/capybara/spec/session/click_button_spec.rb +16 -0
- data/lib/capybara/spec/session/click_link_or_button_spec.rb +9 -0
- data/lib/capybara/spec/session/current_url_spec.rb +11 -1
- data/lib/capybara/spec/session/fill_in_spec.rb +29 -0
- data/lib/capybara/spec/session/find_spec.rb +55 -0
- data/lib/capybara/spec/session/has_ancestor_spec.rb +2 -0
- data/lib/capybara/spec/session/has_button_spec.rb +51 -0
- data/lib/capybara/spec/session/has_css_spec.rb +26 -4
- data/lib/capybara/spec/session/has_current_path_spec.rb +15 -2
- data/lib/capybara/spec/session/has_field_spec.rb +34 -0
- data/lib/capybara/spec/session/has_select_spec.rb +32 -4
- data/lib/capybara/spec/session/has_selector_spec.rb +4 -4
- data/lib/capybara/spec/session/has_table_spec.rb +51 -5
- data/lib/capybara/spec/session/has_text_spec.rb +30 -0
- data/lib/capybara/spec/session/html_spec.rb +1 -1
- data/lib/capybara/spec/session/matches_style_spec.rb +2 -2
- data/lib/capybara/spec/session/node_spec.rb +394 -9
- data/lib/capybara/spec/session/refresh_spec.rb +2 -1
- data/lib/capybara/spec/session/save_and_open_screenshot_spec.rb +2 -2
- data/lib/capybara/spec/session/save_page_spec.rb +4 -4
- data/lib/capybara/spec/session/save_screenshot_spec.rb +4 -15
- data/lib/capybara/spec/session/selectors_spec.rb +16 -3
- data/lib/capybara/spec/session/window/switch_to_window_spec.rb +1 -1
- data/lib/capybara/spec/session/window/window_opened_by_spec.rb +1 -1
- data/lib/capybara/spec/session/window/window_spec.rb +8 -8
- data/lib/capybara/spec/session/window/windows_spec.rb +1 -1
- data/lib/capybara/spec/spec_helper.rb +14 -14
- data/lib/capybara/spec/test_app.rb +27 -21
- data/lib/capybara/spec/views/form.erb +47 -4
- data/lib/capybara/spec/views/offset.erb +32 -0
- data/lib/capybara/spec/views/spatial.erb +31 -0
- data/lib/capybara/spec/views/with_animation.erb +37 -1
- data/lib/capybara/spec/views/with_dragula.erb +24 -0
- data/lib/capybara/spec/views/with_html.erb +24 -2
- data/lib/capybara/spec/views/with_jquery_animation.erb +24 -0
- data/lib/capybara/spec/views/with_js.erb +4 -1
- data/lib/capybara/spec/views/with_jstree.erb +26 -0
- data/lib/capybara/spec/views/with_sortable_js.erb +1 -1
- data/lib/capybara/version.rb +1 -1
- data/lib/capybara/window.rb +3 -7
- data/spec/basic_node_spec.rb +15 -14
- data/spec/capybara_spec.rb +28 -28
- data/spec/dsl_spec.rb +16 -3
- data/spec/filter_set_spec.rb +5 -5
- data/spec/fixtures/selenium_driver_rspec_failure.rb +1 -1
- data/spec/fixtures/selenium_driver_rspec_success.rb +1 -1
- data/spec/minitest_spec.rb +3 -2
- data/spec/minitest_spec_spec.rb +46 -46
- data/spec/rack_test_spec.rb +38 -15
- data/spec/regexp_dissassembler_spec.rb +52 -38
- data/spec/result_spec.rb +43 -32
- data/spec/rspec/features_spec.rb +4 -1
- data/spec/rspec/scenarios_spec.rb +4 -0
- data/spec/rspec/shared_spec_matchers.rb +68 -56
- data/spec/rspec_spec.rb +9 -5
- data/spec/selector_spec.rb +32 -17
- data/spec/selenium_spec_chrome.rb +78 -11
- data/spec/selenium_spec_chrome_remote.rb +23 -6
- data/spec/selenium_spec_edge.rb +15 -12
- data/spec/selenium_spec_firefox.rb +24 -19
- data/spec/selenium_spec_firefox_remote.rb +0 -8
- data/spec/selenium_spec_ie.rb +1 -6
- data/spec/server_spec.rb +106 -44
- data/spec/session_spec.rb +5 -5
- data/spec/shared_selenium_node.rb +56 -2
- data/spec/shared_selenium_session.rb +122 -15
- data/spec/spec_helper.rb +2 -2
- metadata +63 -17
- data/lib/capybara/spec/session/source_spec.rb +0 -0
@@ -4,43 +4,60 @@ Capybara.add_selector(:button, locator_type: [String, Symbol]) do
|
|
4
4
|
xpath(:value, :title, :type, :name) do |locator, **options|
|
5
5
|
input_btn_xpath = XPath.descendant(:input)[XPath.attr(:type).one_of('submit', 'reset', 'image', 'button')]
|
6
6
|
btn_xpath = XPath.descendant(:button)
|
7
|
+
aria_btn_xpath = XPath.descendant[XPath.attr(:role).equals('button')]
|
7
8
|
image_btn_xpath = XPath.descendant(:input)[XPath.attr(:type) == 'image']
|
8
9
|
|
9
10
|
unless locator.nil?
|
10
11
|
locator = locator.to_s
|
11
|
-
locator_matchers =
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
locator_matchers |= XPath.attr(:'aria-label').is(locator) if enable_aria_label
|
16
|
-
locator_matchers |= XPath.attr(test_id) == locator if test_id
|
12
|
+
locator_matchers = combine_locators(locator, config: self)
|
13
|
+
btn_matchers = locator_matchers |
|
14
|
+
XPath.string.n.is(locator) |
|
15
|
+
XPath.descendant(:img)[XPath.attr(:alt).is(locator)]
|
17
16
|
|
18
|
-
input_btn_xpath = input_btn_xpath[locator_matchers]
|
19
|
-
|
20
|
-
|
21
|
-
XPath.string.n.is(locator) |
|
22
|
-
XPath.descendant(:img)[XPath.attr(:alt).is(locator)]]
|
17
|
+
input_btn_xpath = input_btn_xpath[locator_matchers] + locate_label(locator).descendant(input_btn_xpath)
|
18
|
+
btn_xpath = btn_xpath[btn_matchers] + locate_label(locator).descendant(btn_xpath)
|
19
|
+
aria_btn_xpath = aria_btn_xpath[btn_matchers]
|
23
20
|
|
24
21
|
alt_matches = XPath.attr(:alt).is(locator)
|
25
22
|
alt_matches |= XPath.attr(:'aria-label').is(locator) if enable_aria_label
|
26
|
-
image_btn_xpath = image_btn_xpath[alt_matches]
|
23
|
+
image_btn_xpath = image_btn_xpath[alt_matches] + locate_label(locator).descendant(image_btn_xpath)
|
27
24
|
end
|
28
25
|
|
29
|
-
|
30
|
-
|
26
|
+
btn_xpaths = [input_btn_xpath, btn_xpath, image_btn_xpath]
|
27
|
+
btn_xpaths << aria_btn_xpath if enable_aria_role
|
28
|
+
|
29
|
+
%i[value title type].inject(btn_xpaths.inject(&:union)) do |memo, ef|
|
30
|
+
memo.where(find_by_attr(ef, options[ef]))
|
31
31
|
end
|
32
32
|
end
|
33
33
|
|
34
34
|
node_filter(:disabled, :boolean, default: false, skip_if: :all) { |node, value| !(value ^ node.disabled?) }
|
35
35
|
expression_filter(:disabled) { |xpath, val| val ? xpath : xpath[~XPath.attr(:disabled)] }
|
36
36
|
|
37
|
+
node_filter(:name) { |node, value| !value.is_a?(Regexp) || value.match?(node[:name]) }
|
38
|
+
expression_filter(:name) do |xpath, val|
|
39
|
+
builder(xpath).add_attribute_conditions(name: val)
|
40
|
+
end
|
41
|
+
|
37
42
|
describe_expression_filters do |disabled: nil, **options|
|
38
43
|
desc = +''
|
39
44
|
desc << ' that is not disabled' if disabled == false
|
40
|
-
desc << describe_all_expression_filters(options)
|
45
|
+
desc << describe_all_expression_filters(**options)
|
41
46
|
end
|
42
47
|
|
43
48
|
describe_node_filters do |disabled: nil, **|
|
44
49
|
' that is disabled' if disabled == true
|
45
50
|
end
|
51
|
+
|
52
|
+
def combine_locators(locator, config:)
|
53
|
+
[
|
54
|
+
XPath.attr(:id).equals(locator),
|
55
|
+
XPath.attr(:name).equals(locator),
|
56
|
+
XPath.attr(:value).is(locator),
|
57
|
+
XPath.attr(:title).is(locator),
|
58
|
+
(XPath.attr(:id) == XPath.anywhere(:label)[XPath.string.n.is(locator)].attr(:for)),
|
59
|
+
(XPath.attr(:'aria-label').is(locator) if config.enable_aria_label),
|
60
|
+
(XPath.attr(config.test_id) == locator if config.test_id)
|
61
|
+
].compact.inject(&:|)
|
62
|
+
end
|
46
63
|
end
|
@@ -5,7 +5,7 @@ Capybara.add_selector(:checkbox, locator_type: [String, Symbol]) do
|
|
5
5
|
xpath = XPath.axis(allow_self ? :"descendant-or-self" : :descendant, :input)[
|
6
6
|
XPath.attr(:type) == 'checkbox'
|
7
7
|
]
|
8
|
-
locate_field(xpath, locator, options)
|
8
|
+
locate_field(xpath, locator, **options)
|
9
9
|
end
|
10
10
|
|
11
11
|
filter_set(:_field, %i[checked unchecked disabled name])
|
@@ -20,7 +20,7 @@ Capybara.add_selector(:checkbox, locator_type: [String, Symbol]) do
|
|
20
20
|
describe_node_filters do |option: nil, with: nil, **|
|
21
21
|
desc = +''
|
22
22
|
desc << " with value #{option.inspect}" if option
|
23
|
-
desc << " with value #{with.
|
23
|
+
desc << " with value #{with.inspect}" if with
|
24
24
|
desc
|
25
25
|
end
|
26
26
|
end
|
@@ -2,7 +2,9 @@
|
|
2
2
|
|
3
3
|
Capybara.add_selector(:css, locator_type: [String, Symbol], raw_locator: true) do
|
4
4
|
css do |css|
|
5
|
-
|
5
|
+
if css.is_a? Symbol
|
6
|
+
Capybara::Helpers.warn "DEPRECATED: Passing a symbol (#{css.inspect}) as the CSS locator is deprecated - please pass a string instead : #{Capybara::Helpers.filter_backtrace(caller)}"
|
7
|
+
end
|
6
8
|
css
|
7
9
|
end
|
8
10
|
end
|
@@ -5,7 +5,7 @@ Capybara.add_selector(:datalist_input, locator_type: [String, Symbol]) do
|
|
5
5
|
|
6
6
|
xpath do |locator, **options|
|
7
7
|
xpath = XPath.descendant(:input)[XPath.attr(:list)]
|
8
|
-
locate_field(xpath, locator, options)
|
8
|
+
locate_field(xpath, locator, **options)
|
9
9
|
end
|
10
10
|
|
11
11
|
filter_set(:_field, %i[disabled name placeholder])
|
@@ -19,7 +19,7 @@ Capybara.add_selector(:datalist_input, locator_type: [String, Symbol]) do
|
|
19
19
|
|
20
20
|
expression_filter(:with_options) do |expr, options|
|
21
21
|
options.inject(expr) do |xpath, option|
|
22
|
-
xpath
|
22
|
+
xpath.where(XPath.attr(:list) == XPath.anywhere(:datalist)[expression_for(:datalist_option, option)].attr(:id))
|
23
23
|
end
|
24
24
|
end
|
25
25
|
|
@@ -16,7 +16,7 @@ Capybara.add_selector(:datalist_option, locator_type: [String, Symbol]) do
|
|
16
16
|
describe_expression_filters do |disabled: nil, **options|
|
17
17
|
desc = +''
|
18
18
|
desc << ' that is not disabled' if disabled == false
|
19
|
-
desc << describe_all_expression_filters(options)
|
19
|
+
desc << describe_all_expression_filters(**options)
|
20
20
|
end
|
21
21
|
|
22
22
|
describe_node_filters do |**options|
|
@@ -18,8 +18,9 @@ Capybara.add_selector(:element, locator_type: [String, Symbol]) do
|
|
18
18
|
end
|
19
19
|
|
20
20
|
describe_expression_filters do |**options|
|
21
|
-
|
22
|
-
|
21
|
+
boolean_values = [true, false]
|
22
|
+
booleans, values = options.partition { |_k, v| boolean_values.include? v }.map(&:to_h)
|
23
|
+
desc = describe_all_expression_filters(**values)
|
23
24
|
desc + booleans.map do |k, v|
|
24
25
|
v ? " with #{k} attribute" : "without #{k} attribute"
|
25
26
|
end.join
|
@@ -7,7 +7,7 @@ Capybara.add_selector(:field, locator_type: [String, Symbol]) do
|
|
7
7
|
invalid_types = %w[submit image]
|
8
8
|
invalid_types << 'hidden' unless options[:type].to_s == 'hidden'
|
9
9
|
xpath = XPath.descendant(:input, :textarea, :select)[!XPath.attr(:type).one_of(*invalid_types)]
|
10
|
-
locate_field(xpath, locator, options)
|
10
|
+
locate_field(xpath, locator, **options)
|
11
11
|
end
|
12
12
|
|
13
13
|
expression_filter(:type) do |expr, type|
|
@@ -6,7 +6,7 @@ Capybara.add_selector(:file_field, locator_type: [String, Symbol]) do
|
|
6
6
|
xpath = XPath.axis(allow_self ? :"descendant-or-self" : :descendant, :input)[
|
7
7
|
XPath.attr(:type) == 'file'
|
8
8
|
]
|
9
|
-
locate_field(xpath, locator, options)
|
9
|
+
locate_field(xpath, locator, **options)
|
10
10
|
end
|
11
11
|
|
12
12
|
filter_set(:_field, %i[disabled multiple name])
|
@@ -6,7 +6,7 @@ Capybara.add_selector(:fillable_field, locator_type: [String, Symbol]) do
|
|
6
6
|
xpath = XPath.axis(allow_self ? :"descendant-or-self" : :descendant, :input, :textarea)[
|
7
7
|
!XPath.attr(:type).one_of('submit', 'image', 'radio', 'checkbox', 'hidden', 'file')
|
8
8
|
]
|
9
|
-
locate_field(xpath, locator, options)
|
9
|
+
locate_field(xpath, locator, **options)
|
10
10
|
end
|
11
11
|
|
12
12
|
expression_filter(:type) do |expr, type|
|
@@ -18,7 +18,7 @@ Capybara.add_selector(:fillable_field, locator_type: [String, Symbol]) do
|
|
18
18
|
end
|
19
19
|
end
|
20
20
|
|
21
|
-
filter_set(:_field, %i[disabled multiple name placeholder])
|
21
|
+
filter_set(:_field, %i[disabled multiple name placeholder valid validation_message])
|
22
22
|
|
23
23
|
node_filter(:with) do |node, with|
|
24
24
|
val = node.value
|
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
Capybara.add_selector(:label, locator_type: [String, Symbol]) do
|
4
4
|
label 'label'
|
5
|
-
xpath(:for) do |locator, options|
|
5
|
+
xpath(:for) do |locator, **options|
|
6
6
|
xpath = XPath.descendant(:label)
|
7
7
|
unless locator.nil?
|
8
8
|
locator_matchers = XPath.string.n.is(locator.to_s) | (XPath.attr(:id) == locator.to_s)
|
@@ -10,7 +10,9 @@ Capybara.add_selector(:label, locator_type: [String, Symbol]) do
|
|
10
10
|
xpath = xpath[locator_matchers]
|
11
11
|
end
|
12
12
|
if options.key?(:for)
|
13
|
-
|
13
|
+
for_option = options[:for]
|
14
|
+
for_option = for_option[:id] if for_option.is_a?(Capybara::Node::Element)
|
15
|
+
if for_option && (for_option != '')
|
14
16
|
with_attr = builder(XPath.self).add_attribute_conditions(for: for_option)
|
15
17
|
wrapped = !XPath.attr(:for) &
|
16
18
|
builder(XPath.self.descendant(*labelable_elements)).add_attribute_conditions(id: for_option)
|
@@ -51,7 +53,7 @@ Capybara.add_selector(:label, locator_type: [String, Symbol]) do
|
|
51
53
|
end
|
52
54
|
end
|
53
55
|
describe_node_filters do |**options|
|
54
|
-
" for element #{options[:for]}" if options[:for]
|
56
|
+
" for element #{options[:for]}" if options[:for].is_a?(Capybara::Node::Element)
|
55
57
|
end
|
56
58
|
|
57
59
|
def labelable_elements
|
@@ -5,6 +5,13 @@ Capybara.add_selector(:link, locator_type: [String, Symbol]) do
|
|
5
5
|
xpath = XPath.descendant(:a)
|
6
6
|
xpath = builder(xpath).add_attribute_conditions(href: href) unless href == false
|
7
7
|
|
8
|
+
if enable_aria_role
|
9
|
+
role_path = XPath.descendant[XPath.attr(:role).equals('link')]
|
10
|
+
role_path = builder(role_path).add_attribute_conditions(href: href) unless [true, false].include? href
|
11
|
+
|
12
|
+
xpath += role_path
|
13
|
+
end
|
14
|
+
|
8
15
|
unless locator.nil?
|
9
16
|
locator = locator.to_s
|
10
17
|
matchers = [XPath.attr(:id) == locator,
|
@@ -18,6 +25,7 @@ Capybara.add_selector(:link, locator_type: [String, Symbol]) do
|
|
18
25
|
|
19
26
|
xpath = xpath[find_by_attr(:title, title)]
|
20
27
|
xpath = xpath[XPath.descendant(:img)[XPath.attr(:alt) == alt]] if alt
|
28
|
+
|
21
29
|
xpath
|
22
30
|
end
|
23
31
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
Capybara.add_selector(:option, locator_type: [String, Symbol]) do
|
3
|
+
Capybara.add_selector(:option, locator_type: [String, Symbol, Integer]) do
|
4
4
|
xpath do |locator|
|
5
5
|
xpath = XPath.descendant(:option)
|
6
6
|
xpath = xpath[XPath.string.n.is(locator.to_s)] unless locator.nil?
|
@@ -6,7 +6,7 @@ Capybara.add_selector(:radio_button, locator_type: [String, Symbol]) do
|
|
6
6
|
xpath = XPath.axis(allow_self ? :"descendant-or-self" : :descendant, :input)[
|
7
7
|
XPath.attr(:type) == 'radio'
|
8
8
|
]
|
9
|
-
locate_field(xpath, locator, options)
|
9
|
+
locate_field(xpath, locator, **options)
|
10
10
|
end
|
11
11
|
|
12
12
|
filter_set(:_field, %i[checked unchecked disabled name])
|
@@ -21,7 +21,7 @@ Capybara.add_selector(:radio_button, locator_type: [String, Symbol]) do
|
|
21
21
|
describe_node_filters do |option: nil, with: nil, **|
|
22
22
|
desc = +''
|
23
23
|
desc << " with value #{option.inspect}" if option
|
24
|
-
desc << " with value #{with.
|
24
|
+
desc << " with value #{with.inspect}" if with
|
25
25
|
desc
|
26
26
|
end
|
27
27
|
end
|
@@ -5,41 +5,47 @@ Capybara.add_selector(:select, locator_type: [String, Symbol]) do
|
|
5
5
|
|
6
6
|
xpath do |locator, **options|
|
7
7
|
xpath = XPath.descendant(:select)
|
8
|
-
locate_field(xpath, locator, options)
|
8
|
+
locate_field(xpath, locator, **options)
|
9
9
|
end
|
10
10
|
|
11
11
|
filter_set(:_field, %i[disabled multiple name placeholder])
|
12
12
|
|
13
13
|
node_filter(:options) do |node, options|
|
14
|
-
actual =
|
15
|
-
node.all(:xpath, './/option', wait: false).map(&:text)
|
16
|
-
else
|
17
|
-
node.all(:xpath, './/option', visible: false, wait: false).map { |option| option.text(:all) }
|
18
|
-
end
|
14
|
+
actual = options_text(node)
|
19
15
|
(options.sort == actual.sort).tap do |res|
|
20
16
|
add_error("Expected options #{options.inspect} found #{actual.inspect}") unless res
|
21
17
|
end
|
22
18
|
end
|
23
19
|
|
20
|
+
node_filter(:enabled_options) do |node, options|
|
21
|
+
actual = options_text(node) { |o| !o.disabled? }
|
22
|
+
(options.sort == actual.sort).tap do |res|
|
23
|
+
add_error("Expected enabled options #{options.inspect} found #{actual.inspect}") unless res
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
27
|
+
node_filter(:disabled_options) do |node, options|
|
28
|
+
actual = options_text(node, &:disabled?)
|
29
|
+
(options.sort == actual.sort).tap do |res|
|
30
|
+
add_error("Expected disabled options #{options.inspect} found #{actual.inspect}") unless res
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
24
34
|
expression_filter(:with_options) do |expr, options|
|
25
35
|
options.inject(expr) do |xpath, option|
|
26
|
-
xpath
|
36
|
+
xpath.where(expression_for(:option, option))
|
27
37
|
end
|
28
38
|
end
|
29
39
|
|
30
40
|
node_filter(:selected) do |node, selected|
|
31
|
-
actual = node
|
32
|
-
.select(&:selected?)
|
33
|
-
.map { |option| option.text(:all) }
|
41
|
+
actual = options_text(node, visible: false, &:selected?)
|
34
42
|
(Array(selected).sort == actual.sort).tap do |res|
|
35
43
|
add_error("Expected #{selected.inspect} to be selected found #{actual.inspect}") unless res
|
36
44
|
end
|
37
45
|
end
|
38
46
|
|
39
47
|
node_filter(:with_selected) do |node, selected|
|
40
|
-
actual = node
|
41
|
-
.select(&:selected?)
|
42
|
-
.map { |option| option.text(:all) }
|
48
|
+
actual = options_text(node, visible: false, &:selected?)
|
43
49
|
(Array(selected) - actual).empty?.tap do |res|
|
44
50
|
add_error("Expected at least #{selected.inspect} to be selected found #{actual.inspect}") unless res
|
45
51
|
end
|
@@ -51,12 +57,25 @@ Capybara.add_selector(:select, locator_type: [String, Symbol]) do
|
|
51
57
|
desc
|
52
58
|
end
|
53
59
|
|
54
|
-
describe_node_filters do |
|
60
|
+
describe_node_filters do |
|
61
|
+
options: nil, disabled_options: nil, enabled_options: nil,
|
62
|
+
selected: nil, with_selected: nil,
|
63
|
+
disabled: nil, **|
|
55
64
|
desc = +''
|
56
65
|
desc << " with options #{options.inspect}" if options
|
66
|
+
desc << " with disabled options #{disabled_options.inspect}}" if disabled_options
|
67
|
+
desc << " with enabled options #{enabled_options.inspect}" if enabled_options
|
57
68
|
desc << " with #{selected.inspect} selected" if selected
|
58
69
|
desc << " with at least #{with_selected.inspect} selected" if with_selected
|
59
70
|
desc << ' which is disabled' if disabled
|
60
71
|
desc
|
61
72
|
end
|
73
|
+
|
74
|
+
def options_text(node, **opts, &filter_block)
|
75
|
+
opts[:wait] = false
|
76
|
+
opts[:visible] = false unless node.visible?
|
77
|
+
node.all(:xpath, './/option', **opts, &filter_block).map do |o|
|
78
|
+
o.text((:all if opts[:visible] == false))
|
79
|
+
end
|
80
|
+
end
|
62
81
|
end
|
@@ -19,7 +19,10 @@ Capybara.add_selector(:table, locator_type: [String, Symbol]) do
|
|
19
19
|
header = XPath.descendant(:th)[XPath.string.n.is(header)]
|
20
20
|
td = XPath.descendant(:tr)[header].descendant(:td)
|
21
21
|
cell_condition = XPath.string.n.is(cell_str)
|
22
|
-
|
22
|
+
if xp
|
23
|
+
prev_cell = XPath.ancestor(:table)[1].join(xp)
|
24
|
+
cell_condition &= (prev_cell & prev_col_position?(prev_cell))
|
25
|
+
end
|
23
26
|
td[cell_condition]
|
24
27
|
end
|
25
28
|
else
|
@@ -28,7 +31,7 @@ Capybara.add_selector(:table, locator_type: [String, Symbol]) do
|
|
28
31
|
|
29
32
|
if prev_cell
|
30
33
|
prev_cell = XPath.ancestor(:tr)[1].preceding_sibling(:tr).join(prev_cell)
|
31
|
-
cell_condition &= prev_col_position?(prev_cell)
|
34
|
+
cell_condition &= (prev_cell & prev_col_position?(prev_cell))
|
32
35
|
end
|
33
36
|
|
34
37
|
XPath.descendant(:td)[cell_condition]
|
@@ -40,7 +43,7 @@ Capybara.add_selector(:table, locator_type: [String, Symbol]) do
|
|
40
43
|
end
|
41
44
|
|
42
45
|
expression_filter(:cols, valid_values: [Array]) do |xpath, cols|
|
43
|
-
raise ArgumentError, ':cols must be an Array of Arrays' unless cols.all?
|
46
|
+
raise ArgumentError, ':cols must be an Array of Arrays' unless cols.all?(Array)
|
44
47
|
|
45
48
|
rows = cols.transpose
|
46
49
|
col_conditions = rows.map { |row| match_row(row, match_size: true) }.reduce(:&)
|
@@ -9,12 +9,12 @@ Capybara.add_selector(:table_row, locator_type: [Array, Hash]) do
|
|
9
9
|
cell_xp = XPath.descendant(:td)[
|
10
10
|
XPath.string.n.is(cell) & XPath.position.equals(header_xp.preceding_sibling.count.plus(1))
|
11
11
|
]
|
12
|
-
xp
|
12
|
+
xp.where(cell_xp)
|
13
13
|
end
|
14
14
|
else
|
15
15
|
initial_td = XPath.descendant(:td)[XPath.string.n.is(locator.shift)]
|
16
16
|
tds = locator.reverse.map { |cell| XPath.following_sibling(:td)[XPath.string.n.is(cell)] }
|
17
|
-
.reduce { |xp, cell| xp
|
17
|
+
.reduce { |xp, cell| xp.where(cell) }
|
18
18
|
xpath[initial_td[tds]]
|
19
19
|
end
|
20
20
|
end
|
@@ -12,18 +12,18 @@ module Capybara
|
|
12
12
|
@node_filters = {}
|
13
13
|
@expression_filters = {}
|
14
14
|
@descriptions = Hash.new { |hsh, key| hsh[key] = [] }
|
15
|
-
instance_eval(&block)
|
15
|
+
instance_eval(&block) if block
|
16
16
|
end
|
17
17
|
|
18
|
-
def node_filter(names, *
|
18
|
+
def node_filter(names, *types, **options, &block)
|
19
19
|
Array(names).each do |name|
|
20
|
-
add_filter(name, Filters::NodeFilter, *
|
20
|
+
add_filter(name, Filters::NodeFilter, *types, **options, &block)
|
21
21
|
end
|
22
22
|
end
|
23
23
|
alias_method :filter, :node_filter
|
24
24
|
|
25
|
-
def expression_filter(name, *
|
26
|
-
add_filter(name, Filters::ExpressionFilter, *
|
25
|
+
def expression_filter(name, *types, **options, &block)
|
26
|
+
add_filter(name, Filters::ExpressionFilter, *types, **options, &block)
|
27
27
|
end
|
28
28
|
|
29
29
|
def describe(what = nil, &block)
|
@@ -42,14 +42,14 @@ module Capybara
|
|
42
42
|
def description(node_filters: true, expression_filters: true, **options)
|
43
43
|
opts = options_with_defaults(options)
|
44
44
|
description = +''
|
45
|
-
description << undeclared_descriptions.map { |desc| desc.call(opts).to_s }.join
|
46
|
-
description << expression_filter_descriptions.map { |desc| desc.call(opts).to_s }.join if expression_filters
|
47
|
-
description << node_filter_descriptions.map { |desc| desc.call(opts).to_s }.join if node_filters
|
45
|
+
description << undeclared_descriptions.map { |desc| desc.call(**opts).to_s }.join
|
46
|
+
description << expression_filter_descriptions.map { |desc| desc.call(**opts).to_s }.join if expression_filters
|
47
|
+
description << node_filter_descriptions.map { |desc| desc.call(**opts).to_s }.join if node_filters
|
48
48
|
description
|
49
49
|
end
|
50
50
|
|
51
51
|
def descriptions
|
52
|
-
warn 'DEPRECATED: FilterSet#descriptions is deprecated without replacement'
|
52
|
+
Capybara::Helpers.warn 'DEPRECATED: FilterSet#descriptions is deprecated without replacement'
|
53
53
|
[undeclared_descriptions, node_filter_descriptions, expression_filter_descriptions].flatten
|
54
54
|
end
|
55
55
|
|
@@ -112,9 +112,11 @@ module Capybara
|
|
112
112
|
|
113
113
|
def add_filter(name, filter_class, *types, matcher: nil, **options, &block)
|
114
114
|
types.each { |type| options[type] = true }
|
115
|
-
|
115
|
+
if matcher && options[:default]
|
116
|
+
raise 'ArgumentError', ':default option is not supported for filters with a :matcher option'
|
117
|
+
end
|
116
118
|
|
117
|
-
filter = filter_class.new(name, matcher, block, options)
|
119
|
+
filter = filter_class.new(name, matcher, block, **options)
|
118
120
|
(filter_class <= Filters::ExpressionFilter ? @expression_filters : @node_filters)[name] = filter
|
119
121
|
end
|
120
122
|
end
|