diff options
Diffstat (limited to 'qa/qa/page/component')
| -rw-r--r-- | qa/qa/page/component/design_management.rb | 4 | ||||
| -rw-r--r-- | qa/qa/page/component/issuable/sidebar.rb | 2 | ||||
| -rw-r--r-- | qa/qa/page/component/legacy_clone_panel.rb | 4 | ||||
| -rw-r--r-- | qa/qa/page/component/note.rb | 8 |
4 files changed, 14 insertions, 4 deletions
diff --git a/qa/qa/page/component/design_management.rb b/qa/qa/page/component/design_management.rb index cccf1cf1a58..1f5620e30c7 100644 --- a/qa/qa/page/component/design_management.rb +++ b/qa/qa/page/component/design_management.rb @@ -108,6 +108,10 @@ module QA has_element?(:design_file_name, text: filename) end + def has_no_design?(filename) + has_no_element?(:design_file_name, text: filename) + end + def has_created_icon? has_element?(:design_status_icon, status: 'file-addition-solid') end diff --git a/qa/qa/page/component/issuable/sidebar.rb b/qa/qa/page/component/issuable/sidebar.rb index cc39260ce38..03c0811645f 100644 --- a/qa/qa/page/component/issuable/sidebar.rb +++ b/qa/qa/page/component/issuable/sidebar.rb @@ -69,7 +69,7 @@ module QA end end - def has_no_assignee_named?(username) + def has_no_assignee?(username) within_element(:assignee_block) do has_no_text?(username, wait: 120) end diff --git a/qa/qa/page/component/legacy_clone_panel.rb b/qa/qa/page/component/legacy_clone_panel.rb index ebab9fd708c..f15d159a712 100644 --- a/qa/qa/page/component/legacy_clone_panel.rb +++ b/qa/qa/page/component/legacy_clone_panel.rb @@ -12,7 +12,7 @@ module QA base.view 'app/views/shared/_clone_panel.html.haml' do element :clone_dropdown element :clone_options_dropdown, '.clone-options-dropdown' # rubocop:disable QA/ElementWithPattern - element :project_repository_location, 'text_field_tag :project_clone' # rubocop:disable QA/ElementWithPattern + element :clone_url, 'text_field_tag :clone_url' # rubocop:disable QA/ElementWithPattern end end @@ -28,7 +28,7 @@ module QA end def repository_location - Git::Location.new(find('#project_clone').value) + Git::Location.new(find('#clone_url').value) end private diff --git a/qa/qa/page/component/note.rb b/qa/qa/page/component/note.rb index 5ac72d73c78..0454042289b 100644 --- a/qa/qa/page/component/note.rb +++ b/qa/qa/page/component/note.rb @@ -122,13 +122,17 @@ module QA def select_all_activities_filter select_filter_with_text('Show all activity') + + wait_until do + has_no_element?(:discussion_filter_container) && has_element?(:comment_field) + end end def select_comments_only_filter select_filter_with_text('Show comments only') wait_until do - has_no_element?(:system_note_content) + has_no_element?(:discussion_filter_container) && has_no_element?(:system_note_content) end end @@ -145,6 +149,8 @@ module QA click_element :note_dropdown click_element :discussion_menu_item click_element :comment_button + + has_comment?(text) end def toggle_comments(position) |