diff options
author | Jarka Kadlecova <jarka@gitlab.com> | 2017-05-26 12:50:52 +0200 |
---|---|---|
committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-06-01 07:47:15 +0200 |
commit | b71025c014babf9663e0451ad21eabde91570259 (patch) | |
tree | 743041e1fe0480c44671c95a0f470c62c9ed9d60 /app | |
parent | 44f2504a811b107a35403d9c0a8b8fce66f502c8 (diff) | |
download | gitlab-ce-b71025c014babf9663e0451ad21eabde91570259.tar.gz |
Add feature tests for improved JIRA settings
Diffstat (limited to 'app')
4 files changed, 13 insertions, 16 deletions
diff --git a/app/assets/javascripts/integrations/integration_settings_form.js b/app/assets/javascripts/integrations/integration_settings_form.js index 5d555a3776e..5ecab0b11a2 100644 --- a/app/assets/javascripts/integrations/integration_settings_form.js +++ b/app/assets/javascripts/integrations/integration_settings_form.js @@ -93,7 +93,7 @@ export default class IntegrationSettingsForm { }) .done((res) => { if (res.error) { - new Flash(`${res.message}.`, null, null, { + new Flash(`${res.message}`, null, null, { title: 'Save anyway', clickHandler: (e) => { e.preventDefault(); diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb index 89c4e81a36f..264665942f8 100644 --- a/app/controllers/projects/services_controller.rb +++ b/app/controllers/projects/services_controller.rb @@ -22,17 +22,22 @@ class Projects::ServicesController < Projects::ApplicationController end def test - return render json: {}, status: :not_found unless @service.can_test? + message = {} - data = @service.test_data(project, current_user) - outcome = @service.test(data) + if @service.can_test? + data = @service.test_data(project, current_user) + outcome = @service.test(data) - message = {} - unless outcome[:success] - message = { error: true, message: 'Test failed', service_response: outcome[:result].to_s } + unless outcome[:success] + message = { error: true, message: 'Test failed.', service_response: outcome[:result].to_s } + end + + status = :ok + else + status = :not_found end - render json: message, status: :ok + render json: message, status: status end private diff --git a/app/models/project_services/chat_notification_service.rb b/app/models/project_services/chat_notification_service.rb index da7a4067d8e..6d1a321f651 100644 --- a/app/models/project_services/chat_notification_service.rb +++ b/app/models/project_services/chat_notification_service.rb @@ -21,10 +21,6 @@ class ChatNotificationService < Service end end - def can_test? - valid? - end - def self.supported_events %w[push issue confidential_issue merge_request note tag_push pipeline wiki_page] diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index 5384d75994a..489208a3fd6 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -175,10 +175,6 @@ class JiraService < IssueTrackerService { success: result.present?, result: result } end - def can_test? - username.present? && password.present? - end - # JIRA does not need test data. # We are requesting the project that belongs to the project key. def test_data(user = nil, project = nil) |