From caadfcdee31237bbfbcfb304346fc4a5994295dd Mon Sep 17 00:00:00 2001 From: Mario de la Ossa Date: Mon, 21 May 2018 20:24:37 -0600 Subject: [PATCH 1/3] Backport changes in app/services/test_hooks/project_service.rb --- app/services/test_hooks/project_service.rb | 4 +++- spec/services/test_hooks/project_service_spec.rb | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/services/test_hooks/project_service.rb b/app/services/test_hooks/project_service.rb index 01d5d774cd5..65183e84cce 100644 --- a/app/services/test_hooks/project_service.rb +++ b/app/services/test_hooks/project_service.rb @@ -1,11 +1,13 @@ module TestHooks class ProjectService < TestHooks::BaseService - private + attr_writer :project def project @project ||= hook.project end + private + def push_events_data throw(:validation_error, 'Ensure the project has at least one commit.') if project.empty_repo? diff --git a/spec/services/test_hooks/project_service_spec.rb b/spec/services/test_hooks/project_service_spec.rb index 962b9f40c4f..19e1c5ff3b2 100644 --- a/spec/services/test_hooks/project_service_spec.rb +++ b/spec/services/test_hooks/project_service_spec.rb @@ -6,13 +6,19 @@ describe TestHooks::ProjectService do describe '#execute' do let(:project) { create(:project, :repository) } let(:hook) { create(:project_hook, project: project) } + let(:trigger) { 'not_implemented_events' } let(:service) { described_class.new(hook, current_user, trigger) } let(:sample_data) { { data: 'sample' } } let(:success_result) { { status: :success, http_status: 200, message: 'ok' } } - context 'hook with not implemented test' do - let(:trigger) { 'not_implemented_events' } + it 'allows to set a custom project' do + project = double + service.project = project + expect(service.project).to eq(project) + end + + context 'hook with not implemented test' do it 'returns error message' do expect(hook).not_to receive(:execute) expect(service.execute).to include({ status: :error, message: 'Testing not available for this hook' }) From 0c994215af61f8b15f90a5d996f5ba35e94be860 Mon Sep 17 00:00:00 2001 From: Mario de la Ossa Date: Sat, 2 Jun 2018 17:16:36 -0600 Subject: [PATCH 2/3] Backport changes in app/services/applications/create_service/rb --- app/services/applications/create_service.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/services/applications/create_service.rb b/app/services/applications/create_service.rb index 35d45f25a71..e67af929954 100644 --- a/app/services/applications/create_service.rb +++ b/app/services/applications/create_service.rb @@ -2,8 +2,7 @@ module Applications class CreateService def initialize(current_user, params) @current_user = current_user - @params = params - @ip_address = @params.delete(:ip_address) + @params = params.except(:ip_address) end def execute(request = nil) From c75baaa4ba91e4b23b2f21419af052ac7222bdbe Mon Sep 17 00:00:00 2001 From: Mario de la Ossa Date: Mon, 4 Jun 2018 13:37:43 -0600 Subject: [PATCH 3/3] Backport changes in app/services/application_settings/update_service.rb --- app/services/application_settings/update_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/application_settings/update_service.rb b/app/services/application_settings/update_service.rb index e70445cfb67..7bcb8f49d0d 100644 --- a/app/services/application_settings/update_service.rb +++ b/app/services/application_settings/update_service.rb @@ -1,5 +1,7 @@ module ApplicationSettings class UpdateService < ApplicationSettings::BaseService + attr_reader :params, :application_setting + def execute update_terms(@params.delete(:terms))