Skip to content
代码片段 群组 项目
未验证 提交 9def06cc 编辑于 作者: Sanad Liaquat's avatar Sanad Liaquat 提交者: GitLab
浏览文件

Merge branch 'jmc-not-block-file-lock-specs' into 'master'

E2E test: do not block on file lock e2e tests

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149623



Merged-by: default avatarSanad Liaquat <sliaquat@gitlab.com>
Approved-by: default avatarSanad Liaquat <sliaquat@gitlab.com>
Co-authored-by: default avatarJay McCure <jmccure@gitlab.com>
无相关合并请求
......@@ -19,7 +19,7 @@ module QA
Resource::Repository::ProjectPush.fabricate! do |push|
push.project = project
push.file_name = 'file'
push.file_content = SecureRandom.hex(100000)
push.file_content = SecureRandom.hex(100)
push.new_branch = false
end
......@@ -131,7 +131,7 @@ def push(as_user:, branch: project.default_branch, file: 'file')
push.project = project
push.new_branch = false unless branch != project.default_branch
push.file_name = file
push.file_content = SecureRandom.hex(100000)
push.file_content = SecureRandom.hex(100)
push.user = as_user
push.branch_name = branch
end
......
......@@ -29,11 +29,11 @@ module QA
end
end
it 'allows an unrestricted push', :blocking, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347790' do
it 'allows an unrestricted push', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347790' do
expect_no_error_on_push(file: standard_file)
end
it 'restricts files by name and size', :blocking, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347784' do
it 'restricts files by name and size', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347784' do
# Note: The file size limits in this test should be lower than the limits in
# browser_ui/3_create/repository/push_over_http_file_size_spec to prevent
# the limit set in that test from triggering in this test (which can happen
......@@ -86,7 +86,7 @@ module QA
error: Regexp.escape("Commit message contains the forbidden pattern '#{@deny_message_phrase_limitation}'"))
end
it 'restricts committing files with secrets', :blocking, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347779' do
it 'restricts committing files with secrets', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347779' do
secret_file = [{
name: 'id_rsa',
content: SecureRandom.hex(100)
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册