diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb index 8ac7285d70c64ffbb363960a1bcf99b594ea1463..5781bf8a7f0f15cd9a545dbc8e1c94d9de77dead 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb @@ -37,8 +37,10 @@ module QA project.wait_for_push_new_branch # Check that the push worked - expect(page).to have_content(file_name) - expect(page).to have_content(file_content) + Page::Project::Show.perform do |project_page| + expect(project_page).to have_file(file_name) + expect(project_page).to have_readme_content(file_content) + end # And check that the correct Git protocol was used expect(git_protocol_reported).to eq(git_protocol) diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_lfs_over_http_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_lfs_over_http_spec.rb index 83945a0958704b4d9a014c4cc4e111afbb3ba145..2d86cfdbaf827b50efae03bb145383115ed84bf1 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_lfs_over_http_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_lfs_over_http_spec.rb @@ -37,8 +37,10 @@ module QA # Check that the target project has the commit from the source target_project.visit! - expect(page).to have_content('README.md') - expect(page).to have_content('The rendered file could not be displayed because it is stored in LFS') + Page::Project::Show.perform do |project_page| + expect(project_page).to have_file('README.md') + expect(project_page).to have_readme_content('The rendered file could not be displayed because it is stored in LFS') + 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 8b6973e6ceaeb419560cc94f06c4c17891aa866e..cf14017b7f1929d5e9e83a70013976f09a6474c0 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 @@ -36,8 +36,10 @@ module QA project.visit! - expect(page).to have_content('README.md') - expect(page).to have_content("This is a test project named #{project.name}") + Page::Project::Show.perform do |project_page| + expect(project_page).to have_file('README.md') + expect(project_page).to have_readme_content("This is a test project named #{project.name}") + end end end end diff --git a/qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_http_spec.rb b/qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_http_spec.rb index 366b0e861f5716fe69646561705d74d9b59cb44f..e0da940cc0abe77ef76b2271ce71dd7be56cba04 100644 --- a/qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_http_spec.rb +++ b/qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_http_spec.rb @@ -35,9 +35,12 @@ module QA # Check that the target project has the commit from the source target_project.visit! - expect(page).to have_content("README.md") - expect(page).to have_content("This is a pull mirroring test project") - expect(page).to have_content("Mirrored from #{masked_url(source_project_uri)}") + + Page::Project::Show.perform do |project| + expect(project).to have_file('README.md') + expect(project).to have_readme_content('This is a pull mirroring test project') + expect(project).to have_text("Mirrored from #{masked_url(source_project_uri)}") + end end def masked_url(url) diff --git a/qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_ssh_with_key_spec.rb b/qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_ssh_with_key_spec.rb index b89cc7e63effcd61fd12c949b3bceed86bfddf6c..9261eaad6b156c4bb4535d6c4e325686f59257ac 100644 --- a/qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_ssh_with_key_spec.rb +++ b/qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_ssh_with_key_spec.rb @@ -58,9 +58,11 @@ module QA # Check that the target project has the commit from the source target_project.visit! - expect(page).to have_content('README.md') - expect(page).to have_content('This is a pull mirroring test project') - expect(page).to have_content("Mirrored from #{masked_url(source_project_uri)}") + Page::Project::Show.perform do |project| + expect(project).to have_file('README.md') + expect(project).to have_readme_content('This is a pull mirroring test project') + expect(project).to have_text("Mirrored from #{masked_url(source_project_uri)}") + end end def masked_url(url)