summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Lapierre <mlapierre@gitlab.com>2019-03-28 15:56:45 -0400
committerMark Lapierre <mlapierre@gitlab.com>2019-03-28 16:19:52 -0400
commit903a9792cc664743351778de1222e08e88c3f37b (patch)
treec67a11ed85ff4f2cec866ace37d867dcd01a9f0b
parent95cda2cfb367cc0cdd770e74a8f8ddde51d344dd (diff)
downloadgitlab-ce-qa-ml-fix-push-file-size-test.tar.gz
Fix push file size testqa-ml-fix-push-file-size-test
Don't try to re-create master as a new branch. Expect a Git error raised when the file it too large.
-rw-r--r--qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb
index b121e3bf689..a544efb35ee 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb
@@ -40,8 +40,8 @@ module QA
set_file_size_limit(1)
expect(page).to have_content("Application settings saved successfully")
- push = push_new_file('oversize_file_2.bin', wait_for_push: false)
- expect(push.output).to have_content 'remote: fatal: pack exceeds maximum allowed size'
+ expect { push_new_file('oversize_file_2.bin', wait_for_push: false) }
+ .to raise_error(QA::Git::Repository::RepositoryCommandError, /remote: fatal: pack exceeds maximum allowed size/)
end
def set_file_size_limit(limit)
@@ -65,6 +65,7 @@ module QA
p.file_content = SecureRandom.random_bytes(2000000)
p.commit_message = 'Adding a new file'
p.wait_for_push = wait_for_push
+ p.new_branch = false
end
end
end