diff options
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/page/base.rb | 4 | ||||
| -rw-r--r-- | qa/qa/page/component/note.rb | 12 | ||||
| -rw-r--r-- | qa/qa/page/layout/performance_bar.rb | 2 | ||||
| -rw-r--r-- | qa/qa/page/merge_request/show.rb | 2 | ||||
| -rw-r--r-- | qa/qa/page/project/issue/index.rb | 8 | ||||
| -rw-r--r-- | qa/qa/page/project/issue/show.rb | 12 | ||||
| -rw-r--r-- | qa/qa/page/project/settings/ci_variables.rb | 6 | ||||
| -rw-r--r-- | qa/qa/page/project/settings/mirroring_repositories.rb | 2 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb | 2 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb | 2 | ||||
| -rw-r--r-- | qa/spec/page/base_spec.rb | 16 | ||||
| -rw-r--r-- | qa/spec/page/logging_spec.rb | 8 |
12 files changed, 48 insertions, 28 deletions
diff --git a/qa/qa/page/base.rb b/qa/qa/page/base.rb index 13f0e1e1994..3ac714940cd 100644 --- a/qa/qa/page/base.rb +++ b/qa/qa/page/base.rb @@ -89,6 +89,10 @@ module QA end def all_elements(name, **kwargs) + if kwargs.keys.none? { |key| [:minimum, :maximum, :count, :between].include?(key) } + raise ArgumentError, "Please use :minimum, :maximum, :count, or :between so that all is more reliable" + end + wait_for_requests all(element_selector_css(name), **kwargs) diff --git a/qa/qa/page/component/note.rb b/qa/qa/page/component/note.rb index c85fa690d6c..3e8ed9069ce 100644 --- a/qa/qa/page/component/note.rb +++ b/qa/qa/page/component/note.rb @@ -45,17 +45,17 @@ module QA click_element :comment_button end - def toggle_comments - all_elements(:toggle_comments_button).last.click + def toggle_comments(position) + all_elements(:toggle_comments_button, minimum: position)[position - 1].click end - def type_reply_to_discussion(reply_text) - all_elements(:discussion_reply_tab).last.click + def type_reply_to_discussion(position, reply_text) + all_elements(:discussion_reply_tab, minimum: position)[position - 1].click fill_element :reply_input, reply_text end - def reply_to_discussion(reply_text) - type_reply_to_discussion(reply_text) + def reply_to_discussion(position, reply_text) + type_reply_to_discussion(position, reply_text) click_element :reply_comment_button end diff --git a/qa/qa/page/layout/performance_bar.rb b/qa/qa/page/layout/performance_bar.rb index dbfcf908610..b35c37fdc34 100644 --- a/qa/qa/page/layout/performance_bar.rb +++ b/qa/qa/page/layout/performance_bar.rb @@ -23,7 +23,7 @@ module QA def has_detailed_metrics? retry_until(sleep_interval: 1) do - all_elements(:detailed_metric_content).all? do |metric| + all_elements(:detailed_metric_content, count: count).all? do |metric| metric.has_text?(%r{\d+}) end end diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index 2345d811f35..85c859b6bb2 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -76,7 +76,7 @@ module QA wait(interval: 5) do has_text?("No newline at end of file") end - all_elements(:new_diff_line).first.hover + all_elements(:new_diff_line, minimum: 1).first.hover click_element(:diff_comment) fill_element(:reply_input, text) end diff --git a/qa/qa/page/project/issue/index.rb b/qa/qa/page/project/issue/index.rb index a6ccee4353b..ece49ae80c4 100644 --- a/qa/qa/page/project/issue/index.rb +++ b/qa/qa/page/project/issue/index.rb @@ -21,10 +21,6 @@ module QA element :closed_issues_link end - def assignee_link_count - all_elements(:assignee_link).count - end - def avatar_counter find_element(:avatar_counter) end @@ -37,6 +33,10 @@ module QA click_element :closed_issues_link end + def has_assignee_link_count?(count) + all_elements(:assignee_link, count: count) + end + def has_issue?(issue) has_element? :issue, issue_title: issue.to_s end diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb index 1ef711d459e..adfd31e2a7d 100644 --- a/qa/qa/page/project/issue/show.rb +++ b/qa/qa/page/project/issue/show.rb @@ -56,12 +56,6 @@ module QA element :new_note_form, 'attr: :note' # rubocop:disable QA/ElementWithPattern end - def avatar_image_count - wait_assignees_block_finish_loading do - all_elements(:avatar_image).count - end - end - def click_milestone_link click_element(:milestone_link) end @@ -88,6 +82,12 @@ module QA click_element :comment_button end + def has_avatar_image_count?(count) + wait_assignees_block_finish_loading do + all_elements(:avatar_image, count: count) + end + end + def has_comment?(comment_text) wait(reload: false) do has_element?(:noteable_note_item, text: comment_text) diff --git a/qa/qa/page/project/settings/ci_variables.rb b/qa/qa/page/project/settings/ci_variables.rb index 3621e618bf2..ff61e2d2c0c 100644 --- a/qa/qa/page/project/settings/ci_variables.rb +++ b/qa/qa/page/project/settings/ci_variables.rb @@ -20,13 +20,13 @@ module QA end def fill_variable(key, value, masked) - keys = all_elements(:ci_variable_input_key) + keys = all_elements(:ci_variable_input_key, minimum: 1) index = keys.size - 1 # After we fill the key, JS would generate another field so # we need to use the same index to find the corresponding one. keys[index].set(key) - node = all_elements(:ci_variable_input_value)[index] + node = all_elements(:ci_variable_input_value, count: keys.size + 1)[index] # Simply run `node.set(value)` is too slow for long text here, # so we need to run JavaScript directly to set the value. @@ -34,7 +34,7 @@ module QA # https://github.com/teamcapybara/capybara/blob/679548cea10773d45e32808f4d964377cfe5e892/lib/capybara/selenium/node.rb#L217 execute_script("arguments[0].value = #{value.to_json}", node) - masked_node = all_elements(:variable_masked)[index] + masked_node = all_elements(:variable_masked, count: keys.size + 1)[index] toggle_masked(masked_node, masked) end diff --git a/qa/qa/page/project/settings/mirroring_repositories.rb b/qa/qa/page/project/settings/mirroring_repositories.rb index 4afe042d9fb..cae5831f100 100644 --- a/qa/qa/page/project/settings/mirroring_repositories.rb +++ b/qa/qa/page/project/settings/mirroring_repositories.rb @@ -118,7 +118,7 @@ module QA def find_repository_row_index(target_url) wait(max: 5, reload: false) do - all_elements(:mirror_repository_url_cell).index do |url| + all_elements(:mirror_repository_url_cell, minimum: 1).index do |url| # The url might be a sanitized url but the target_url won't be so # we compare just the paths instead of the full url URI.parse(url.text).path == target_url.path diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb index e192b106d4b..8e41417049b 100644 --- a/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb +++ b/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb @@ -17,7 +17,7 @@ module QA Page::Project::Issue::Show.perform do |show| show.select_all_activities_filter show.start_discussion('My first discussion') - show.reply_to_discussion(my_first_reply) + show.reply_to_discussion(1, my_first_reply) end end diff --git a/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb b/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb index b067a44e325..d315bac2ffd 100644 --- a/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb +++ b/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb @@ -25,7 +25,7 @@ module QA Page::Layout::PerformanceBar.perform do |bar_component| expect(bar_component).to have_performance_bar - expect(bar_component).to have_detailed_metrics + expect(bar_component).to have_detailed_metrics(4) expect(bar_component).to have_request_for('realtime_changes') # Always requested on issue pages end end diff --git a/qa/spec/page/base_spec.rb b/qa/spec/page/base_spec.rb index e157eb6ac3e..88d0eac40e6 100644 --- a/qa/spec/page/base_spec.rb +++ b/qa/spec/page/base_spec.rb @@ -91,4 +91,20 @@ describe QA::Page::Base do end end end + + describe '#all_elements' do + before do + allow(subject).to receive(:all) + end + + it 'raises an error if count or minimum are not specified' do + expect { subject.all_elements(:foo) }.to raise_error ArgumentError + end + + it 'does not raise an error if :minimum, :maximum, :count, or :between is specified' do + [:minimum, :maximum, :count, :between].each do |param| + expect { subject.all_elements(:foo, param => 1) }.not_to raise_error + end + end + end end diff --git a/qa/spec/page/logging_spec.rb b/qa/spec/page/logging_spec.rb index 0a394e1c38f..0d68f4bdae9 100644 --- a/qa/spec/page/logging_spec.rb +++ b/qa/spec/page/logging_spec.rb @@ -145,18 +145,18 @@ describe QA::Support::Page::Logging do it 'logs the number of elements found' do allow(page).to receive(:all).and_return([1, 2]) - expect { subject.all_elements(:element) } + expect { subject.all_elements(:element, count: 2) } .to output(/finding all :element/).to_stdout_from_any_process - expect { subject.all_elements(:element) } + expect { subject.all_elements(:element, count: 2) } .to output(/found 2 :element/).to_stdout_from_any_process end it 'logs 0 if no elements are found' do allow(page).to receive(:all).and_return([]) - expect { subject.all_elements(:element) } + expect { subject.all_elements(:element, count: 1) } .to output(/finding all :element/).to_stdout_from_any_process - expect { subject.all_elements(:element) } + expect { subject.all_elements(:element, count: 1) } .not_to output(/found 0 :elements/).to_stdout_from_any_process end end |