diff options
| author | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-03-07 00:42:39 +0900 |
|---|---|---|
| committer | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-03-23 17:11:49 +0900 |
| commit | f8d6e81b92e85663bead6036e80407d7ab55a643 (patch) | |
| tree | 2d75864afbe8bde0263590cf97dcf2857c84b60b | |
| parent | 617292046cf69ff4a41da875fe67f0ce7f612ea3 (diff) | |
| download | gitlab-ce-f8d6e81b92e85663bead6036e80407d7ab55a643.tar.gz | |
Fix rubocop anger
| -rw-r--r-- | app/serializers/build_serializer.rb | 2 | ||||
| -rw-r--r-- | app/serializers/pipeline_serializer.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/projects/builds_controller_spec.rb | 6 | ||||
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 12 | ||||
| -rw-r--r-- | spec/controllers/projects/pipelines_controller_spec.rb | 6 |
5 files changed, 14 insertions, 14 deletions
diff --git a/app/serializers/build_serializer.rb b/app/serializers/build_serializer.rb index 39460bbd092..b1739caaf5f 100644 --- a/app/serializers/build_serializer.rb +++ b/app/serializers/build_serializer.rb @@ -2,7 +2,7 @@ class BuildSerializer < BaseSerializer entity BuildEntity def with_status - tap { @status_only = {only: [{details: [:status]}]} } + tap { @status_only = { only: [{ details: [:status] }] } } end def represent(resource, opts = {}) diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb index 4de9e620f64..6b6e4a8f0f0 100644 --- a/app/serializers/pipeline_serializer.rb +++ b/app/serializers/pipeline_serializer.rb @@ -12,7 +12,7 @@ class PipelineSerializer < BaseSerializer end def with_status - tap { @status_only = {only: [{details: [:status]}]} } + tap { @status_only = { only: [{ details: [:status] }] } } end def represent(resource, opts = {}) diff --git a/spec/controllers/projects/builds_controller_spec.rb b/spec/controllers/projects/builds_controller_spec.rb index 3abf3fa1aeb..53a307aa362 100644 --- a/spec/controllers/projects/builds_controller_spec.rb +++ b/spec/controllers/projects/builds_controller_spec.rb @@ -16,9 +16,9 @@ describe Projects::BuildsController do pipeline = create(:ci_pipeline, project: project) build = create(:ci_build, pipeline: pipeline, status: 'success') get :status, namespace_id: project.namespace, - project_id: project, - id: build.id, - format: :json + project_id: project, + id: build.id, + format: :json end it 'returns pipeline status via BuildSerializer' do diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 433dbdb37bf..2cbb46d8274 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -1183,13 +1183,13 @@ describe Projects::MergeRequestsController do context 'when accessing status' do before do create(:ci_pipeline, project: merge_request.source_project, - ref: merge_request.source_branch, - sha: merge_request.diff_head_sha, - status: 'success') + ref: merge_request.source_branch, + sha: merge_request.diff_head_sha, + status: 'success') get :status, namespace_id: project.namespace, - project_id: project, - id: merge_request.iid, - format: :json + project_id: project, + id: merge_request.iid, + format: :json end it 'returns pipeline status via PipelineSerializer' do diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb index b8ab9933f33..5a9e02331f7 100644 --- a/spec/controllers/projects/pipelines_controller_spec.rb +++ b/spec/controllers/projects/pipelines_controller_spec.rb @@ -75,9 +75,9 @@ describe Projects::PipelinesController do before do pipeline = create(:ci_pipeline, project: project, status: 'success') get :status, namespace_id: project.namespace, - project_id: project, - id: pipeline.id, - format: :json + project_id: project, + id: pipeline.id, + format: :json end it 'returns pipeline status via PipelineSerializer' do |