Update specs to accomodate issuable assign changes
This commit is contained in:
parent
4adfd501a5
commit
8df63d1513
4 changed files with 33 additions and 23 deletions
|
@ -100,7 +100,7 @@ describe Issues::BulkUpdateService, services: true do
|
|||
describe :update_milestone do
|
||||
|
||||
before do
|
||||
@milestone = create :milestone
|
||||
@milestone = create(:milestone, project: @project)
|
||||
@params = {
|
||||
issues_ids: [issue.id],
|
||||
milestone_id: @milestone.id
|
||||
|
|
|
@ -6,31 +6,31 @@ describe Issues::CreateService, services: true do
|
|||
let(:assignee) { create(:user) }
|
||||
|
||||
describe :execute do
|
||||
let(:issue) { Issues::CreateService.new(project, user, opts).execute }
|
||||
|
||||
context 'valid params' do
|
||||
before do
|
||||
project.team << [user, :master]
|
||||
project.team << [assignee, :master]
|
||||
|
||||
opts = {
|
||||
title: 'Awesome issue',
|
||||
description: 'please fix',
|
||||
assignee: assignee
|
||||
}
|
||||
|
||||
@issue = Issues::CreateService.new(project, user, opts).execute
|
||||
end
|
||||
|
||||
it { expect(@issue).to be_valid }
|
||||
it { expect(@issue.title).to eq('Awesome issue') }
|
||||
it { expect(@issue.assignee).to eq assignee }
|
||||
let(:opts) do
|
||||
{ title: 'Awesome issue',
|
||||
description: 'please fix',
|
||||
assignee: assignee }
|
||||
end
|
||||
|
||||
it { expect(issue).to be_valid }
|
||||
it { expect(issue.title).to eq('Awesome issue') }
|
||||
it { expect(issue.assignee).to eq assignee }
|
||||
|
||||
it 'creates a pending todo for new assignee' do
|
||||
attributes = {
|
||||
project: project,
|
||||
author: user,
|
||||
user: assignee,
|
||||
target_id: @issue.id,
|
||||
target_type: @issue.class.name,
|
||||
target_id: issue.id,
|
||||
target_type: issue.class.name,
|
||||
action: Todo::ASSIGNED,
|
||||
state: :pending
|
||||
}
|
||||
|
@ -39,8 +39,8 @@ describe Issues::CreateService, services: true do
|
|||
end
|
||||
|
||||
context 'label that belongs to different project' do
|
||||
let(:issue) { Issues::CreateService.new(project, user, opts).execute }
|
||||
let(:label) { create(:label) }
|
||||
|
||||
let(:opts) do
|
||||
{ title: 'Title',
|
||||
description: 'Description',
|
||||
|
@ -53,15 +53,15 @@ describe Issues::CreateService, services: true do
|
|||
end
|
||||
|
||||
context 'milestone that belongs to different project' do
|
||||
let(:issue) { Issues::CreateService.new(project, user, opts).execute }
|
||||
let(:milestone) { create(:milestone) }
|
||||
|
||||
let(:opts) do
|
||||
{ title: 'Title',
|
||||
description: 'Description',
|
||||
milestone_id: milestone.id }
|
||||
end
|
||||
|
||||
it 'does not assign label' do
|
||||
it 'does not assign milestone' do
|
||||
expect(issue.milestone).to_not eq milestone
|
||||
end
|
||||
end
|
||||
|
|
|
@ -4,10 +4,15 @@ describe Issues::UpdateService, services: true do
|
|||
let(:user) { create(:user) }
|
||||
let(:user2) { create(:user) }
|
||||
let(:user3) { create(:user) }
|
||||
let(:issue) { create(:issue, title: 'Old title', assignee_id: user3.id) }
|
||||
let(:label) { create(:label) }
|
||||
let(:project) { create(:empty_project) }
|
||||
let(:label) { create(:label, project: project) }
|
||||
let(:label2) { create(:label) }
|
||||
let(:project) { issue.project }
|
||||
|
||||
let(:issue) do
|
||||
create(:issue, title: 'Old title',
|
||||
assignee_id: user3.id,
|
||||
project: project)
|
||||
end
|
||||
|
||||
before do
|
||||
project.team << [user, :master]
|
||||
|
|
|
@ -1,14 +1,19 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe MergeRequests::UpdateService, services: true do
|
||||
let(:project) { create(:project) }
|
||||
let(:user) { create(:user) }
|
||||
let(:user2) { create(:user) }
|
||||
let(:user3) { create(:user) }
|
||||
let(:merge_request) { create(:merge_request, :simple, title: 'Old title', assignee_id: user3.id) }
|
||||
let(:project) { merge_request.project }
|
||||
let(:label) { create(:label) }
|
||||
let(:label) { create(:label, project: project) }
|
||||
let(:label2) { create(:label) }
|
||||
|
||||
let(:merge_request) do
|
||||
create(:merge_request, :simple, title: 'Old title',
|
||||
assignee_id: user3.id,
|
||||
source_project: project)
|
||||
end
|
||||
|
||||
before do
|
||||
project.team << [user, :master]
|
||||
project.team << [user2, :developer]
|
||||
|
|
Loading…
Reference in a new issue