From 4ae3f5e1716093f85aef45f53a28f850ea5f0cae Mon Sep 17 00:00:00 2001 From: Konstantin Haase Date: Tue, 24 Mar 2015 12:34:37 +0100 Subject: [PATCH] v3: add owner_name and name to sidekiq payload when creating a new request --- lib/travis/api/v3/queries/request.rb | 4 ++-- spec/v3/services/requests/create_spec.rb | 28 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/travis/api/v3/queries/request.rb b/lib/travis/api/v3/queries/request.rb index a8248506..54b8f024 100644 --- a/lib/travis/api/v3/queries/request.rb +++ b/lib/travis/api/v3/queries/request.rb @@ -7,8 +7,8 @@ module Travis::API::V3 raise WrongParams, 'missing user'.freeze unless user and user.id payload = { - repository: { id: repository.github_id }, - user: { id: user.id }, + repository: { id: repository.github_id, owner_name: repository.owner_name, name: repository.name }, + user: { id: user.id }, message: message, branch: branch || repository.default_branch_name, config: config || {} diff --git a/spec/v3/services/requests/create_spec.rb b/spec/v3/services/requests/create_spec.rb index 4ef0bc10..62b32089 100644 --- a/spec/v3/services/requests/create_spec.rb +++ b/spec/v3/services/requests/create_spec.rb @@ -88,7 +88,7 @@ describe Travis::API::V3::Services::Requests::Create do "remaining_requests" => 10, "repository" => {"@type"=>"repository", "@href"=>"/repo/#{repo.id}", "id"=>repo.id, "slug"=>"svenfuchs/minimal"}, "request" => { - "repository" => {"id"=>repo.id}, + "repository" => {"id"=>repo.id, "owner_name"=>"svenfuchs", "name"=>"minimal"}, "user" => {"id"=>repo.owner.id}, "message" => nil, "branch" => "master", @@ -97,7 +97,7 @@ describe Travis::API::V3::Services::Requests::Create do }} example { expect(sidekiq_payload).to be == { - repository: { id: repo.id }, + repository: { id: repo.id, owner_name: 'svenfuchs', name: 'minimal' }, user: { id: repo.owner.id }, message: nil, branch: 'master', @@ -110,7 +110,7 @@ describe Travis::API::V3::Services::Requests::Create do describe "setting id has no effect" do let(:params) {{ id: 42 }} example { expect(sidekiq_payload).to be == { - repository: { id: repo.id }, + repository: { id: repo.id, owner_name: 'svenfuchs', name: 'minimal' }, user: { id: repo.owner.id }, message: nil, branch: 'master', @@ -121,7 +121,7 @@ describe Travis::API::V3::Services::Requests::Create do describe "setting repository has no effect" do let(:params) {{ repository: { id: 42 } }} example { expect(sidekiq_payload).to be == { - repository: { id: repo.id }, + repository: { id: repo.id, owner_name: 'svenfuchs', name: 'minimal' }, user: { id: repo.owner.id }, message: nil, branch: 'master', @@ -132,7 +132,7 @@ describe Travis::API::V3::Services::Requests::Create do describe "setting user has no effect" do let(:params) {{ user: { id: 42 } }} example { expect(sidekiq_payload).to be == { - repository: { id: repo.id }, + repository: { id: repo.id, owner_name: 'svenfuchs', name: 'minimal' }, user: { id: repo.owner.id }, message: nil, branch: 'master', @@ -143,7 +143,7 @@ describe Travis::API::V3::Services::Requests::Create do describe "overriding config" do let(:params) {{ config: { script: 'true' } }} example { expect(sidekiq_payload).to be == { - repository: { id: repo.id }, + repository: { id: repo.id, owner_name: 'svenfuchs', name: 'minimal' }, user: { id: repo.owner.id }, message: nil, branch: 'master', @@ -154,7 +154,7 @@ describe Travis::API::V3::Services::Requests::Create do describe "overriding message" do let(:params) {{ message: 'example' }} example { expect(sidekiq_payload).to be == { - repository: { id: repo.id }, + repository: { id: repo.id, owner_name: 'svenfuchs', name: 'minimal' }, user: { id: repo.owner.id }, message: 'example', branch: 'master', @@ -165,7 +165,7 @@ describe Travis::API::V3::Services::Requests::Create do describe "overriding branch" do let(:params) {{ branch: 'example' }} example { expect(sidekiq_payload).to be == { - repository: { id: repo.id }, + repository: { id: repo.id, owner_name: 'svenfuchs', name: 'minimal' }, user: { id: repo.owner.id }, message: nil, branch: 'example', @@ -176,7 +176,7 @@ describe Travis::API::V3::Services::Requests::Create do describe "overriding branch (in request)" do let(:params) {{ request: { branch: 'example' } }} example { expect(sidekiq_payload).to be == { - repository: { id: repo.id }, + repository: { id: repo.id, owner_name: 'svenfuchs', name: 'minimal' }, user: { id: repo.owner.id }, message: nil, branch: 'example', @@ -187,7 +187,7 @@ describe Travis::API::V3::Services::Requests::Create do describe "overriding branch (with request prefix)" do let(:params) {{ "request.branch" => 'example' }} example { expect(sidekiq_payload).to be == { - repository: { id: repo.id }, + repository: { id: repo.id, owner_name: 'svenfuchs', name: 'minimal' }, user: { id: repo.owner.id }, message: nil, branch: 'example', @@ -198,7 +198,7 @@ describe Travis::API::V3::Services::Requests::Create do describe "overriding branch (with request type)" do let(:params) {{ "@type" => "request", "branch" => 'example' }} example { expect(sidekiq_payload).to be == { - repository: { id: repo.id }, + repository: { id: repo.id, owner_name: 'svenfuchs', name: 'minimal' }, user: { id: repo.owner.id }, message: nil, branch: 'example', @@ -209,7 +209,7 @@ describe Travis::API::V3::Services::Requests::Create do describe "overriding branch (with wrong type)" do let(:params) {{ "@type" => "repository", "branch" => 'example' }} example { expect(sidekiq_payload).to be == { - repository: { id: repo.id }, + repository: { id: repo.id, owner_name: 'svenfuchs', name: 'minimal' }, user: { id: repo.owner.id }, message: nil, branch: 'master', @@ -255,7 +255,7 @@ describe Travis::API::V3::Services::Requests::Create do let(:params) {{ user: { id: repo.owner.id } }} example { expect(last_response.status).to be == 202 } example { expect(sidekiq_payload).to be == { - repository: { id: repo.id }, + repository: { id: repo.id, owner_name: 'svenfuchs', name: 'minimal' }, user: { id: repo.owner.id }, message: nil, branch: 'master', @@ -267,7 +267,7 @@ describe Travis::API::V3::Services::Requests::Create do let(:params) {{ user: { id: repo.owner.id }, branch: 'example' }} example { expect(last_response.status).to be == 202 } example { expect(sidekiq_payload).to be == { - repository: { id: repo.id }, + repository: { id: repo.id, owner_name: 'svenfuchs', name: 'minimal' }, user: { id: repo.owner.id }, message: nil, branch: 'example',