diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-20 21:09:17 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-20 21:09:17 +0000 |
commit | 68f1860e6f1f9e8441c434f4e62238c359ce8c7c (patch) | |
tree | d12eab92b88fdcd0bdcea4586ec5352898b16e6c /qa/qa/specs/features | |
parent | 1af0d38d9c5a88d7123283c714857dc4da991371 (diff) | |
download | gitlab-ce-68f1860e6f1f9e8441c434f4e62238c359ce8c7c.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/qa/specs/features')
4 files changed, 16 insertions, 9 deletions
diff --git a/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb index 6f75940e1f0..9eab03323a8 100644 --- a/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb +++ b/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb @@ -47,8 +47,8 @@ module QA Page::Project::Settings::Main.perform(&:click_project) Page::Project::Show.perform do |project| - expect(project).to have_text(target_group.path) - expect(project).to have_text(edited_readme_content) + expect(project).to have_breadcrumb(target_group.path) + expect(project).to have_readme_content(edited_readme_content) end end end diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb index e845c3ca8ea..ec00091b3ce 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb @@ -60,12 +60,15 @@ module QA end end - project.visit! project.wait_for_push_new_branch + project.visit! - expect(page).to have_content(file_name) - expect(page).to have_content(file_content) expect(git_protocol_reported).to eq(git_protocol) + + Page::Project::Show.perform do |show| + expect(show).to have_file(file_name) + expect(show).to have_readme_content(file_content) + end end end end diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb index c713f11af7d..d8aaffc3713 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb @@ -24,8 +24,10 @@ module QA Page::Project::Show.perform(&:wait_for_viewers_to_load) - expect(page).to have_content('README.md') - expect(page).to have_content('This is a test project') + Page::Project::Show.perform do |project| + expect(project).to have_file('README.md') + expect(project).to have_readme_content('This is a test project') + end end end end diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb index 9db5fe5292f..c2da5104930 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb @@ -12,8 +12,10 @@ module QA push.commit_message = 'Add README.md' end.project.visit! - expect(page).to have_content('README.md') - expect(page).to have_content('This is a test project') + Page::Project::Show.perform do |project| + expect(project).to have_file('README.md') + expect(project).to have_readme_content('This is a test project') + end end end end |