Commit a31bff2b authored by Mark Lapierre's avatar Mark Lapierre

Update tests to use page object predicate methods

This change invoke predicate methods on page objects when
tests execute certain matchers instead of using Capybara matchers.
The result is that the matchers wait for requests and perform
logging and other functionality that the page object predicate
methods provide.
parent b53287bf
......@@ -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)
......
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment