Skip to content

Commit 983903e

Browse files
committed
rename request/configs to request/preview
1 parent ab10c15 commit 983903e

File tree

7 files changed

+19
-13
lines changed

7 files changed

+19
-13
lines changed

lib/travis/api/v3/queries/request.rb

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def schedule(repository, user)
4040
configs: request_configs,
4141
# BC, remove once everyone is on yml/configs, coordinate with Gatekeeper
4242
merge_mode: merge_mode,
43-
config: config,
43+
config: to_str(config),
4444
}
4545

4646
::Travis::API::Sidekiq.gatekeeper(
@@ -54,8 +54,14 @@ def schedule(repository, user)
5454
private
5555

5656
def request_configs
57-
return configs if configs
58-
[{ config: config, merge_mode: merge_mode }] if config
57+
configs = self.configs
58+
configs.each { |config| config['config'] = to_str(config['config']) } if configs
59+
configs ||= [{ config: to_str(config), merge_mode: merge_mode }] if config
60+
configs
61+
end
62+
63+
def to_str(config)
64+
config.is_a?(Hash) ? JSON.dump(config) : config
5965
end
6066

6167
def create_request(repository)

lib/travis/api/v3/queries/request_configs.rb renamed to lib/travis/api/v3/queries/request_preview.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'faraday'
33

44
module Travis::API::V3
5-
class Queries::RequestConfigs < Query
5+
class Queries::RequestPreview < Query
66
attr_reader :user, :repo
77

88
def expand(user, repo)

lib/travis/api/v3/renderer/request_configs.rb renamed to lib/travis/api/v3/renderer/request_preview.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Travis::API::V3
2-
class Renderer::RequestConfigs < ModelRenderer
2+
class Renderer::RequestPreview < ModelRenderer
33
representation(:minimal, :raw_configs, :request_config, :job_configs, :messages, :full_messages)
44
representation(:standard, *representations[:minimal])
55
end

lib/travis/api/v3/routes.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ module Routes
174174
resource :request do
175175
route '/request/{request.id}'
176176
get :find
177-
post :configs
177+
post :preview
178178

179179
resource :messages do
180180
route '/messages'

lib/travis/api/v3/services/request/configs.rb renamed to lib/travis/api/v3/services/request/preview.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module Travis::API::V3
2-
class Services::Request::Configs < Service
3-
result_type :request_configs
2+
class Services::Request::Preview < Service
3+
result_type :request_preview
44
params :ref, :configs, :data
55
params :config, :mode # BC
66

77
def run
88
repository = check_login_and_find(:repository)
99
access_control.permissions(repository).create_request!
1010
user = access_control.user
11-
result query(:request_configs).expand(user, repo)
11+
result query(:request_preview).expand(user, repo)
1212
end
1313

1414
private

spec/v3/services/request/configs_spec.rb renamed to spec/v3/services/request/preview_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
describe Travis::API::V3::Services::Request::Configs, set_app: true do
1+
describe Travis::API::V3::Services::Request::Preview, set_app: true do
22
let(:repo) { FactoryBot.create(:repository_without_last_build, owner_name: 'svenfuchs', name: 'minimal') }
33
let(:request) { Travis::API::V3::Models::Request.last }
44
let(:env_var) { { id: nil, name: 'ONE', value: Travis::Settings::EncryptedValue.new('one'), public: true, branch: 'foo', repository_id: repo.id } }
@@ -24,7 +24,7 @@ def parse(str)
2424
end
2525

2626
describe 'not authenticated' do
27-
before { post("/v3/repo/#{repo.id}/request/configs") }
27+
before { post("/v3/repo/#{repo.id}/request/preview") }
2828
it { expect(status).to eq 403 }
2929
it do
3030
expect(body).to eq(
@@ -47,7 +47,7 @@ def parse(str)
4747

4848
it do
4949
expect(body).to eq(
50-
'@type': 'request_configs',
50+
'@type': 'request_preview',
5151
'@representation': 'standard',
5252
raw_configs: [
5353
'@type': 'request_raw_configuration',

spec/v3/services/requests/create_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207

208208
describe 'overriding config' do
209209
let(:params) { { config: { script: 'true' } } }
210-
it { expect(sidekiq_payload).to eq payload.merge(config: params[:config], configs: [config: params[:config], merge_mode: nil]) }
210+
it { expect(sidekiq_payload).to eq payload.merge(config: '{"script":"true"}', configs: [config: '{"script":"true"}', merge_mode: nil]) }
211211
end
212212

213213
describe 'overriding message' do

0 commit comments

Comments
 (0)