Make default trigger factory generate an owner
And specify owners more clearly
This commit is contained in:
parent
c1f12ff58e
commit
2d4744c34c
|
@ -1,5 +1,7 @@
|
|||
FactoryGirl.define do
|
||||
factory :ci_trigger_without_token, class: Ci::Trigger do
|
||||
owner
|
||||
|
||||
factory :ci_trigger do
|
||||
sequence(:token) { |n| "token#{n}" }
|
||||
end
|
||||
|
|
|
@ -8,8 +8,8 @@ describe API::Triggers do
|
|||
let!(:project) { create(:project, :repository, creator: user) }
|
||||
let!(:master) { create(:project_member, :master, user: user, project: project) }
|
||||
let!(:developer) { create(:project_member, :developer, user: user2, project: project) }
|
||||
let!(:trigger) { create(:ci_trigger, project: project, token: trigger_token) }
|
||||
let!(:trigger2) { create(:ci_trigger, project: project, token: trigger_token_2) }
|
||||
let!(:trigger) { create(:ci_trigger, project: project, token: trigger_token, owner: user) }
|
||||
let!(:trigger2) { create(:ci_trigger, project: project, token: trigger_token_2, owner: user2) }
|
||||
let!(:trigger_request) { create(:ci_trigger_request, trigger: trigger, created_at: '2015-01-01 12:13:14') }
|
||||
|
||||
describe 'POST /projects/:project_id/trigger/pipeline' do
|
||||
|
@ -254,8 +254,6 @@ describe API::Triggers do
|
|||
describe 'POST /projects/:id/triggers/:trigger_id/take_ownership' do
|
||||
context 'authenticated user with valid permissions' do
|
||||
it 'updates owner' do
|
||||
expect(trigger.owner).to be_nil
|
||||
|
||||
post api("/projects/#{project.id}/triggers/#{trigger.id}/take_ownership", user)
|
||||
|
||||
expect(response).to have_http_status(200)
|
||||
|
|
|
@ -7,7 +7,10 @@ describe API::V3::Triggers do
|
|||
let!(:project) { create(:project, :repository, creator: user) }
|
||||
let!(:master) { create(:project_member, :master, user: user, project: project) }
|
||||
let!(:developer) { create(:project_member, :developer, user: user2, project: project) }
|
||||
let!(:trigger) { create(:ci_trigger, project: project, token: trigger_token) }
|
||||
|
||||
let!(:trigger) do
|
||||
create(:ci_trigger, project: project, token: trigger_token, owner: user)
|
||||
end
|
||||
|
||||
describe 'POST /projects/:project_id/trigger' do
|
||||
let!(:project2) { create(:project) }
|
||||
|
|
|
@ -470,7 +470,8 @@ describe Ci::CreatePipelineService do
|
|||
context 'when ref is not protected' do
|
||||
context 'when trigger belongs to no one' do
|
||||
let(:user) {}
|
||||
let(:trigger_request) { create(:ci_trigger_request) }
|
||||
let(:trigger) { create(:ci_trigger, owner: nil) }
|
||||
let(:trigger_request) { create(:ci_trigger_request, trigger: trigger) }
|
||||
|
||||
it 'creates a pipeline' do
|
||||
expect(execute_service(trigger_request: trigger_request))
|
||||
|
|
Loading…
Reference in New Issue