diff options
Diffstat (limited to 'spec/requests/api/v3/issues_spec.rb')
| -rw-r--r-- | spec/requests/api/v3/issues_spec.rb | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/spec/requests/api/v3/issues_spec.rb b/spec/requests/api/v3/issues_spec.rb index a1124aebcec..49191b2eb4e 100644 --- a/spec/requests/api/v3/issues_spec.rb +++ b/spec/requests/api/v3/issues_spec.rb @@ -737,22 +737,14 @@ describe API::V3::Issues do describe "POST /projects/:id/issues" do it 'creates a new project issue' do post v3_api("/projects/#{project.id}/issues", user), -<<<<<<< HEAD - title: 'new issue', labels: 'label, label2' -======= - title: 'new issue', labels: 'label, label2', weight: 3, assignee_id: assignee.id ->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master + title: 'new issue', labels: 'label, label2', assignee_id: assignee.id expect(response).to have_http_status(201) expect(json_response['title']).to eq('new issue') expect(json_response['description']).to be_nil expect(json_response['labels']).to eq(%w(label label2)) expect(json_response['confidential']).to be_falsy -<<<<<<< HEAD -======= - expect(json_response['weight']).to eq(3) expect(json_response['assignee']['name']).to eq(assignee.name) ->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master end it 'creates a new confidential project issue' do @@ -1149,8 +1141,6 @@ describe API::V3::Issues do end end -<<<<<<< HEAD -======= describe 'PUT /projects/:id/issues/:issue_id to update assignee' do it 'updates an issue with no assignee' do put v3_api("/projects/#{project.id}/issues/#{issue.id}", user), assignee_id: 0 @@ -1199,7 +1189,6 @@ describe API::V3::Issues do end end ->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master describe "DELETE /projects/:id/issues/:issue_id" do it "rejects a non member from deleting an issue" do delete v3_api("/projects/#{project.id}/issues/#{issue.id}", non_member) |