Commit f9da5d78 authored by Mark Lapierre's avatar Mark Lapierre

Merge branch '10378-remove-redundant-project-visit-calls' into 'master'

QA: Reduce flakiness of git-lfs related tests

See merge request gitlab-org/gitlab-ee!10026
parents 4fa88a90 ddd38e29
...@@ -27,7 +27,6 @@ module QA ...@@ -27,7 +27,6 @@ module QA
push.file_content = "# #{file_content}" push.file_content = "# #{file_content}"
push.commit_message = 'Add README.md' push.commit_message = 'Add README.md'
end end
project.visit!
# Validate git push worked and file exists with content # Validate git push worked and file exists with content
Page::Project::Show.perform do |show| Page::Project::Show.perform do |show|
...@@ -87,10 +86,8 @@ module QA ...@@ -87,10 +86,8 @@ module QA
push.file_content = "# #{file_content}" push.file_content = "# #{file_content}"
push.commit_message = 'Add README.md' push.commit_message = 'Add README.md'
end end
project.visit!
expect(push.output).to match(/Locking support detected on remote/) expect(push.output).to match(/Locking support detected on remote/)
expect(push.output).to match(%r{Uploading LFS objects: 100% \(1/1\)})
# Validate git push worked and file exists with content # Validate git push worked and file exists with content
Page::Project::Show.perform do |show| Page::Project::Show.perform do |show|
......
...@@ -151,7 +151,6 @@ module QA ...@@ -151,7 +151,6 @@ module QA
# internally. # internally.
expect(push.output).to match(/warning: redirecting to #{primary_uri.to_s}/) expect(push.output).to match(/warning: redirecting to #{primary_uri.to_s}/)
expect(push.output).to match(/Locking support detected on remote "#{location.uri.to_s}"/) expect(push.output).to match(/Locking support detected on remote "#{location.uri.to_s}"/)
expect(push.output).to match(%r{Uploading LFS objects: 100% \(2/2\)})
# Validate git push worked and new content is visible # Validate git push worked and new content is visible
Page::Project::Show.perform do |show| Page::Project::Show.perform do |show|
......
...@@ -33,7 +33,6 @@ module QA ...@@ -33,7 +33,6 @@ module QA
push.file_content = "# #{file_content}" push.file_content = "# #{file_content}"
push.commit_message = 'Add README.md' push.commit_message = 'Add README.md'
end end
project.visit!
# Validate git push worked and file exists with content # Validate git push worked and file exists with content
Page::Project::Show.perform do |show| Page::Project::Show.perform do |show|
...@@ -106,10 +105,8 @@ module QA ...@@ -106,10 +105,8 @@ module QA
push.file_content = "# #{file_content}" push.file_content = "# #{file_content}"
push.commit_message = 'Add README.md' push.commit_message = 'Add README.md'
end end
project.visit!
expect(push.output).to match(/Locking support detected on remote/) expect(push.output).to match(/Locking support detected on remote/)
expect(push.output).to match(%r{Uploading LFS objects: 100% \(1/1\)})
# Validate git push worked and file exists with content # Validate git push worked and file exists with content
Page::Project::Show.perform do |show| Page::Project::Show.perform do |show|
......
...@@ -177,7 +177,6 @@ module QA ...@@ -177,7 +177,6 @@ module QA
ssh_uri = project.repository_ssh_location.git_uri.to_s.gsub(%r{ssh://}, '') ssh_uri = project.repository_ssh_location.git_uri.to_s.gsub(%r{ssh://}, '')
expect(push.output).to match(%r{GitLab: We'll help you by proxying this request to the primary: (?:ssh://)?#{ssh_uri}}) expect(push.output).to match(%r{GitLab: We'll help you by proxying this request to the primary: (?:ssh://)?#{ssh_uri}})
expect(push.output).to match(/Locking support detected on remote "#{location.uri.to_s}"/) expect(push.output).to match(/Locking support detected on remote "#{location.uri.to_s}"/)
expect(push.output).to match(%r{Uploading LFS objects: 100% \(2/2\)})
# Validate git push worked and new content is visible # Validate git push worked and new content is visible
Page::Project::Show.perform do |show| Page::Project::Show.perform do |show|
......
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