diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /spec/requests/api/project_snippets_spec.rb | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) | |
download | gitlab-ce-6e4e1050d9dba2b7b2523fdd1768823ab85feef4.tar.gz |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'spec/requests/api/project_snippets_spec.rb')
-rw-r--r-- | spec/requests/api/project_snippets_spec.rb | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/spec/requests/api/project_snippets_spec.rb b/spec/requests/api/project_snippets_spec.rb index fbb0e3e109f..9b876edae24 100644 --- a/spec/requests/api/project_snippets_spec.rb +++ b/spec/requests/api/project_snippets_spec.rb @@ -123,16 +123,19 @@ RSpec.describe API::ProjectSnippets do end describe 'POST /projects/:project_id/snippets/' do - let(:params) do + let(:base_params) do { title: 'Test Title', - file_name: 'test.rb', description: 'test description', - content: 'puts "hello world"', visibility: 'public' } end + let(:file_path) { 'file_1.rb' } + let(:file_content) { 'puts "hello world"' } + let(:params) { base_params.merge(file_params) } + let(:file_params) { { files: [{ file_path: file_path, content: file_content }] } } + shared_examples 'project snippet repository actions' do let(:snippet) { ProjectSnippet.find(json_response['id']) } @@ -145,9 +148,9 @@ RSpec.describe API::ProjectSnippets do it 'commit the files to the repository' do subject - blob = snippet.repository.blob_at('master', params[:file_name]) + blob = snippet.repository.blob_at('master', file_path) - expect(blob.data).to eq params[:content] + expect(blob.data).to eq file_content end end @@ -184,63 +187,60 @@ RSpec.describe API::ProjectSnippets do params['visibility'] = 'internal' end + subject { post api("/projects/#{project.id}/snippets/", user), params: params } + it 'creates a new snippet' do - post api("/projects/#{project.id}/snippets/", user), params: params + subject expect(response).to have_gitlab_http_status(:created) snippet = ProjectSnippet.find(json_response['id']) - expect(snippet.content).to eq(params[:content]) + expect(snippet.content).to eq(file_content) expect(snippet.description).to eq(params[:description]) expect(snippet.title).to eq(params[:title]) - expect(snippet.file_name).to eq(params[:file_name]) + expect(snippet.file_name).to eq(file_path) expect(snippet.visibility_level).to eq(Snippet::INTERNAL) end - it_behaves_like 'project snippet repository actions' do - subject { post api("/projects/#{project.id}/snippets/", user), params: params } - end + it_behaves_like 'project snippet repository actions' end - it 'creates a new snippet' do - post api("/projects/#{project.id}/snippets/", admin), params: params + context 'with an admin' do + subject { post api("/projects/#{project.id}/snippets/", admin), params: params } - expect(response).to have_gitlab_http_status(:created) - snippet = ProjectSnippet.find(json_response['id']) - expect(snippet.content).to eq(params[:content]) - expect(snippet.description).to eq(params[:description]) - expect(snippet.title).to eq(params[:title]) - expect(snippet.file_name).to eq(params[:file_name]) - expect(snippet.visibility_level).to eq(Snippet::PUBLIC) - end + it 'creates a new snippet' do + subject - it_behaves_like 'project snippet repository actions' do - subject { post api("/projects/#{project.id}/snippets/", admin), params: params } - end + expect(response).to have_gitlab_http_status(:created) + snippet = ProjectSnippet.find(json_response['id']) + expect(snippet.content).to eq(file_content) + expect(snippet.description).to eq(params[:description]) + expect(snippet.title).to eq(params[:title]) + expect(snippet.file_name).to eq(file_path) + expect(snippet.visibility_level).to eq(Snippet::PUBLIC) + end - it 'returns 400 for missing parameters' do - params.delete(:title) + it_behaves_like 'project snippet repository actions' - post api("/projects/#{project.id}/snippets/", admin), params: params + it 'returns 400 for missing parameters' do + params.delete(:title) - expect(response).to have_gitlab_http_status(:bad_request) - end + subject - it 'returns 400 if content is blank' do - params[:content] = '' + expect(response).to have_gitlab_http_status(:bad_request) + end - post api("/projects/#{project.id}/snippets/", admin), params: params + it_behaves_like 'snippet creation with files parameter' - expect(response).to have_gitlab_http_status(:bad_request) - expect(json_response['error']).to eq 'content is empty' - end + it_behaves_like 'snippet creation without files parameter' - it 'returns 400 if title is blank' do - params[:title] = '' + it 'returns 400 if title is blank' do + params[:title] = '' - post api("/projects/#{project.id}/snippets/", admin), params: params + subject - expect(response).to have_gitlab_http_status(:bad_request) - expect(json_response['error']).to eq 'title is empty' + expect(response).to have_gitlab_http_status(:bad_request) + expect(json_response['error']).to eq 'title is empty' + end end context 'when save fails because the repository could not be created' do |