summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Davison <ddavison@gitlab.com>2019-03-29 22:22:17 +0000
committerDan Davison <ddavison@gitlab.com>2019-03-29 22:22:17 +0000
commit9a439fa56c06ade46ad582ba2c261ee5beaf7410 (patch)
tree0b22669242e286b1f53bd9dc8c2746c4fbdf4be1
parent65f2ed1de20abbb31b18524004164f1de3de4194 (diff)
parent903a9792cc664743351778de1222e08e88c3f37b (diff)
downloadgitlab-ce-9a439fa56c06ade46ad582ba2c261ee5beaf7410.tar.gz
Merge branch 'qa-ml-fix-push-file-size-test' into 'master'button-arrangement
[QA] Fix 2 of 3 problems with the push file size tests See merge request gitlab-org/gitlab-ce!26741
-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