Commit eacae005 authored by Douwe Maan's avatar Douwe Maan

Enable Style/MultilineHashBraceLayout

parent 99a34a52
......@@ -277,7 +277,7 @@ Style/MultilineBlockLayout:
# Checks that the closing brace in a hash literal is either on the same line as
# the last hash element, or a new line.
Style/MultilineHashBraceLayout:
Enabled: false
Enabled: true
EnforcedStyle: symmetrical
# Do not use then for multi-line if/unless.
......
......@@ -39,7 +39,8 @@ def render_missing_personal_token
message: "HTTP Basic: Access denied\n" \
"You have 2FA enabled, please use a personal access token for Git over HTTP.\n" \
"You can generate one at #{profile_personal_access_tokens_url}" }
] }, status: 401
]
}, status: 401
end
def render_unauthorized
......@@ -47,7 +48,8 @@ def render_unauthorized
errors: [
{ code: 'UNAUTHORIZED',
message: 'HTTP Basic: Access denied' }
] }, status: 401
]
}, status: 401
end
def auth_params
......
......@@ -28,7 +28,8 @@ def index
@snippets = SnippetsFinder.new.execute(current_user, {
filter: :by_user,
user: @user,
scope: params[:scope] })
scope: params[:scope]
})
.page(params[:page])
render 'index'
......
......@@ -51,7 +51,8 @@ def description_message
title: issue_title,
title_link: issue_url,
text: format(description),
color: "#C95823" }]
color: "#C95823"
}]
end
def project_link
......
......@@ -33,7 +33,8 @@ def execute(data)
end
def settings
{ server_host: server_host.present? ? server_host : 'localhost',
{
server_host: server_host.present? ? server_host : 'localhost',
server_port: server_port.present? ? server_port : 6659
}
end
......
......@@ -62,23 +62,19 @@ def fields
{ type: 'text',
name: 'namespace',
title: 'Kubernetes namespace',
placeholder: 'Kubernetes namespace',
},
placeholder: 'Kubernetes namespace' },
{ type: 'text',
name: 'api_url',
title: 'API URL',
placeholder: 'Kubernetes API URL, like https://kube.example.com/',
},
placeholder: 'Kubernetes API URL, like https://kube.example.com/' },
{ type: 'text',
name: 'token',
title: 'Service token',
placeholder: 'Service token',
},
placeholder: 'Service token' },
{ type: 'textarea',
name: 'ca_pem',
title: 'Custom CA bundle',
placeholder: 'Certificate Authority bundle (PEM format)',
},
placeholder: 'Certificate Authority bundle (PEM format)' },
]
end
......
......@@ -29,8 +29,7 @@ def fields
['Normal Priority', 0],
['High Priority', 1]
],
default_choice: 0
},
default_choice: 0 },
{ type: 'select', name: 'sound', choices:
[
['Device default sound', nil],
......@@ -56,8 +55,7 @@ def fields
['Pushover Echo (long)', 'echo'],
['Up Down (long)', 'updown'],
['None (silent)', 'none']
]
},
]},
]
end
......
......@@ -21,12 +21,14 @@ class Environment < Node
validates :name,
type: {
with: String,
message: Gitlab::Regex.environment_name_regex_message }
message: Gitlab::Regex.environment_name_regex_message
}
validates :name,
format: {
with: Gitlab::Regex.environment_name_regex,
message: Gitlab::Regex.environment_name_regex_message }
message: Gitlab::Regex.environment_name_regex_message
}
with_options if: :hash? do
validates :config, allowed_keys: ALLOWED_KEYS
......
......@@ -54,7 +54,8 @@ def submit_new_merge_request(format: :html)
project_id: fork_project.to_param,
merge_request: {
source_branch: 'remove-submodule',
target_branch: 'master' },
target_branch: 'master'
},
format: format
end
end
......
......@@ -7,58 +7,49 @@
tests = [
{ value: 'key',
result: 'key',
variables: []
},
variables: [] },
{ value: 'key$variable',
result: 'key',
variables: []
},
variables: [] },
{ value: 'key$variable',
result: 'keyvalue',
variables: [
{ key: 'variable', value: 'value' }
]
},
]},
{ value: 'key${variable}',
result: 'keyvalue',
variables: [
{ key: 'variable', value: 'value' }
]
},
]},
{ value: 'key$variable$variable2',
result: 'keyvalueresult',
variables: [
{ key: 'variable', value: 'value' },
{ key: 'variable2', value: 'result' },
]
},
]},
{ value: 'key${variable}${variable2}',
result: 'keyvalueresult',
variables: [
{ key: 'variable', value: 'value' },
{ key: 'variable2', value: 'result' }
]
},
]},
{ value: 'key$variable2$variable',
result: 'keyresultvalue',
variables: [
{ key: 'variable', value: 'value' },
{ key: 'variable2', value: 'result' },
]
},
]},
{ value: 'key${variable2}${variable}',
result: 'keyresultvalue',
variables: [
{ key: 'variable', value: 'value' },
{ key: 'variable2', value: 'result' }
]
},
]},
{ value: 'review/$CI_BUILD_REF_NAME',
result: 'review/feature/add-review-apps',
variables: [
{ key: 'CI_BUILD_REF_NAME', value: 'feature/add-review-apps' }
]
},
]},
]
tests.each do |test|
......
......@@ -11,7 +11,8 @@
create_template: {
user: user,
access: Gitlab::Access::MASTER,
path: 'issue_templates' })
path: 'issue_templates'
})
end
describe '.all' do
......
......@@ -11,7 +11,8 @@
create_template: {
user: user,
access: Gitlab::Access::MASTER,
path: 'merge_request_templates' })
path: 'merge_request_templates'
})
end
describe '.all' do
......
......@@ -13,8 +13,7 @@
describe '#create' do
let(:params) do
{ team_id: 'abc',
trigger: 'gitlab'
}
trigger: 'gitlab' }
end
subject { described_class.new(nil).create(params) }
......@@ -24,7 +23,8 @@
stub_request(:post, 'http://mattermost.example.com/api/v3/teams/abc/commands/create')
.with(body: {
team_id: 'abc',
trigger: 'gitlab' }.to_json)
trigger: 'gitlab'
}.to_json)
.to_return(
status: 200,
headers: { 'Content-Type' => 'application/json' },
......
......@@ -14,18 +14,19 @@
context 'for valid request' do
let(:response) do
[{
"id" => "xiyro8huptfhdndadpz8r3wnbo",
"create_at" => 1482174222155,
"update_at" => 1482174222155,
"delete_at" => 0,
"display_name" => "chatops",
"name" => "chatops",
"email" => "admin@example.com",
"type" => "O",
"company_name" => "",
"allowed_domains" => "",
"invite_id" => "o4utakb9jtb7imctdfzbf9r5ro",
"allow_open_invite" => false }]
"id" => "xiyro8huptfhdndadpz8r3wnbo",
"create_at" => 1482174222155,
"update_at" => 1482174222155,
"delete_at" => 0,
"display_name" => "chatops",
"name" => "chatops",
"email" => "admin@example.com",
"type" => "O",
"company_name" => "",
"allowed_domains" => "",
"invite_id" => "o4utakb9jtb7imctdfzbf9r5ro",
"allow_open_invite" => false
}]
end
before do
......
......@@ -76,7 +76,8 @@
end
describe '#update_merge_request_metrics?' do
{ 'production' => true,
{
'production' => true,
'production/eu' => true,
'production/www.gitlab.com' => true,
'productioneu' => false,
......
......@@ -95,12 +95,12 @@ def stub_request(status: 200, body: nil)
is_expected.to eq(:error)
end
{ "killed" => :canceled,
{
"killed" => :canceled,
"failure" => :failed,
"error" => :failed,
"success" => "success",
"success" => "success"
}.each do |drone_status, our_status|
it "sets commit status to #{our_status.inspect} when returned status is #{drone_status.inspect}" do
stub_request(body: %({"status":"#{drone_status}"}))
......
......@@ -36,7 +36,8 @@
description: "Perform common operations on: #{project.name_with_namespace}",
display_name: "GitLab / #{project.name_with_namespace}",
method: 'P',
username: 'GitLab' }.to_json)
username: 'GitLab'
}.to_json)
.to_return(
status: 200,
headers: { 'Content-Type' => 'application/json' },
......
......@@ -25,11 +25,9 @@
{
'objects' => [
{ 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
'size' => 1575078
},
'size' => 1575078 },
{ 'oid' => sample_oid,
'size' => sample_size
}
'size' => sample_size }
],
'operation' => 'upload'
}
......@@ -53,11 +51,9 @@
{
'objects' => [
{ 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
'size' => 1575078
},
'size' => 1575078 },
{ 'oid' => sample_oid,
'size' => sample_size
}
'size' => sample_size }
],
'operation' => 'upload'
}
......@@ -378,8 +374,7 @@
'operation' => 'download',
'objects' => [
{ 'oid' => sample_oid,
'size' => sample_size
}
'size' => sample_size }
]
}
end
......@@ -397,7 +392,8 @@
it 'with href to download' do
expect(json_response).to eq({
'objects' => [
{ 'oid' => sample_oid,
{
'oid' => sample_oid,
'size' => sample_size,
'actions' => {
'download' => {
......@@ -424,7 +420,8 @@
it 'with href to download' do
expect(json_response).to eq({
'objects' => [
{ 'oid' => sample_oid,
{
'oid' => sample_oid,
'size' => sample_size,
'error' => {
'code' => 404,
......@@ -442,8 +439,7 @@
'operation' => 'download',
'objects' => [
{ 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
'size' => 1575078
}
'size' => 1575078 }
]
}
end
......@@ -455,7 +451,8 @@
it 'with an 404 for specific object' do
expect(json_response).to eq({
'objects' => [
{ 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
{
'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
'size' => 1575078,
'error' => {
'code' => 404,
......@@ -469,14 +466,13 @@
context 'when downloading one new and one existing lfs object' do
let(:body) do
{ 'operation' => 'download',
{
'operation' => 'download',
'objects' => [
{ 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
'size' => 1575078
},
'size' => 1575078 },
{ 'oid' => sample_oid,
'size' => sample_size
}
'size' => sample_size }
]
}
end
......@@ -617,7 +613,8 @@
it 'responds with status 200 and href to download' do
expect(json_response).to eq({
'objects' => [
{ 'oid' => sample_oid,
{
'oid' => sample_oid,
'size' => sample_size,
'authenticated' => true,
'actions' => {
......@@ -651,8 +648,7 @@
'operation' => 'upload',
'objects' => [
{ 'oid' => sample_oid,
'size' => sample_size
}
'size' => sample_size }
]
}
end
......@@ -692,8 +688,7 @@
'operation' => 'upload',
'objects' => [
{ 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
'size' => 1575078
}
'size' => 1575078 }
]
}
end
......@@ -713,14 +708,13 @@
context 'when pushing one new and one existing lfs object' do
let(:body) do
{ 'operation' => 'upload',
{
'operation' => 'upload',
'objects' => [
{ 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
'size' => 1575078
},
'size' => 1575078 },
{ 'oid' => sample_oid,
'size' => sample_size
}
'size' => sample_size }
]
}
end
......@@ -818,8 +812,7 @@
'operation' => 'other',
'objects' => [
{ 'oid' => sample_oid,
'size' => sample_size
}
'size' => sample_size }
]
}
end
......
......@@ -9,7 +9,8 @@
describe '#execute' do
let(:options) { nil }
let(:params) do
{ environment: 'production',
{
environment: 'production',
ref: 'master',
tag: false,
sha: '97de212e80737a608d939f648d959671fb0a0142',
......@@ -83,10 +84,11 @@
context 'for environment with invalid name' do
let(:params) do
{ environment: 'name,with,commas',
{
environment: 'name,with,commas',
ref: 'master',
tag: false,
sha: '97de212e80737a608d939f648d959671fb0a0142',
sha: '97de212e80737a608d939f648d959671fb0a0142'
}
end
......@@ -101,7 +103,8 @@
context 'when variables are used' do
let(:params) do
{ environment: 'review-apps/$CI_BUILD_REF_NAME',
{
environment: 'review-apps/$CI_BUILD_REF_NAME',
ref: 'master',
tag: false,
sha: '97de212e80737a608d939f648d959671fb0a0142',
......
......@@ -2,23 +2,24 @@ module KubernetesHelpers
include Gitlab::Kubernetes
def kube_discovery_body
{ "kind" => "APIResourceList",
{
"kind" => "APIResourceList",
"resources" => [
{ "name" => "pods", "namespaced" => true, "kind" => "Pod" },
],
]
}
end
def kube_pods_body(*pods)
{ "kind" => "PodList",
"items" => [kube_pod],
}
"items" => [kube_pod] }
end
# This is a partial response, it will have many more elements in reality but
# these are the ones we care about at the moment
def kube_pod(app: "valid-pod-label")
{ "metadata" => {
{
"metadata" => {
"name" => "kube-pod",
"creationTimestamp" => "2016-11-25T19:55:19Z",
"labels" => { "app" => app },
......@@ -29,7 +30,7 @@ def kube_pod(app: "valid-pod-label")
{ "name" => "container-1" },
],
},
"status" => { "phase" => "Running" },
"status" => { "phase" => "Running" }
}
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment