diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 09:09:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 09:09:21 +0300 |
commit | c8df22c555ab707a705e57c4257fd3ed1ce7c3b0 (patch) | |
tree | 009fb7c1ff12a6192921212cae404b790fd7d66b /spec/requests | |
parent | 9345f69894862e02f3491ea3136c3ed2b23fd5b8 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/api/internal/base_spec.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/spec/requests/api/internal/base_spec.rb b/spec/requests/api/internal/base_spec.rb index c3e52975d6d..426e15faaa6 100644 --- a/spec/requests/api/internal/base_spec.rb +++ b/spec/requests/api/internal/base_spec.rb @@ -12,6 +12,7 @@ describe API::Internal::Base do let_it_be(:personal_snippet) { create(:personal_snippet, :repository, author: user) } let_it_be(:project_snippet) { create(:project_snippet, :repository, author: user, project: project) } + let(:snippet_changes) { "#{TestEnv::BRANCH_SHA['snippet/single-file']} #{TestEnv::BRANCH_SHA['snippet/edit-file']} refs/heads/snippet/edit-file" } describe "GET /internal/check" do it do @@ -336,7 +337,7 @@ describe API::Internal::Base do end context 'git push with personal snippet' do - subject { push(key, personal_snippet, env: env.to_json) } + subject { push(key, personal_snippet, env: env.to_json, changes: snippet_changes) } it 'responds with success' do subject @@ -371,7 +372,7 @@ describe API::Internal::Base do end context 'git push with project snippet' do - subject { push(key, project_snippet, env: env.to_json) } + subject { push(key, project_snippet, env: env.to_json, changes: snippet_changes) } it 'responds with success' do subject @@ -1104,9 +1105,11 @@ describe API::Internal::Base do ) end - def push(key, container, protocol = 'ssh', env: nil) + def push(key, container, protocol = 'ssh', env: nil, changes: nil) + changes ||= 'd14d6c0abdd253381df51a723d58691b2ee1ab08 570e7b2abdd848b95f2f578043fc23bd6f6fd24d refs/heads/master' + params = { - changes: 'd14d6c0abdd253381df51a723d58691b2ee1ab08 570e7b2abdd848b95f2f578043fc23bd6f6fd24d refs/heads/master', + changes: changes, key_id: key.id, project: full_path_for(container), gl_repository: gl_repository_for(container), |