<%- @T('Client ID') %>
<%- @T('Save') %>
-
\ No newline at end of file
+
diff --git a/app/assets/javascripts/app/views/ticket_zoom/sidebar_git_issue.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/sidebar_git_issue.jst.eco
new file mode 100644
index 000000000..a13e624be
--- /dev/null
+++ b/app/assets/javascripts/app/views/ticket_zoom/sidebar_git_issue.jst.eco
@@ -0,0 +1,36 @@
+<% for issue in @issues: %>
+
+
+
+
+ gitlab-logo
+
+
google-button
diff --git a/public/assets/images/icons/gitlab-logo.svg b/public/assets/images/icons/gitlab-logo.svg
new file mode 100644
index 000000000..d2afbf2e2
--- /dev/null
+++ b/public/assets/images/icons/gitlab-logo.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>gitlab-logo
+
+
+
\ No newline at end of file
diff --git a/spec/integration/gitlab_spec.rb b/spec/integration/gitlab_spec.rb
new file mode 100644
index 000000000..6c598cb78
--- /dev/null
+++ b/spec/integration/gitlab_spec.rb
@@ -0,0 +1,95 @@
+require 'rails_helper'
+RSpec.describe GitLab, type: :integration do # rubocop:disable RSpec/FilePath
+
+ before(:all) do # rubocop:disable RSpec/BeforeAfterAll
+ required_envs = %w[GITLAB_ENDPOINT GITLAB_APITOKEN]
+ required_envs.each do |key|
+ skip("NOTICE: Missing environment variable #{key} for test! (Please fill up: #{required_envs.join(' && ')})") if ENV[key].blank?
+ end
+
+ # request schema only once for performance reasons
+ @cached_schema = described_class.new(ENV['GITLAB_ENDPOINT'], ENV['GITLAB_APITOKEN']).schema
+ end
+
+ let(:instance) { described_class.new(ENV['GITLAB_ENDPOINT'], ENV['GITLAB_APITOKEN'], schema: schema) }
+ let(:schema) { @cached_schema } # rubocop:disable RSpec/InstanceVariable
+ let(:issue_data) do
+ {
+ id: '1',
+ title: 'Example issue',
+ url: ENV['GITLAB_ISSUE_LINK'],
+ icon_state: 'open',
+ milestone: 'important milestone',
+ assignees: ['zammad-robot'],
+ labels: [
+ {
+ color: '#FF0000',
+ text_color: '#FFFFFF',
+ title: 'critical'
+ },
+ {
+ color: '#0033CC',
+ text_color: '#FFFFFF',
+ title: 'label1'
+ },
+ {
+ color: '#D1D100',
+ text_color: '#FFFFFF',
+ title: 'special'
+ }
+ ],
+ }
+ end
+ let(:invalid_issue_url) { 'https://git.example.com/group/project/-/issues/1' }
+
+ describe '#schema' do
+ it 'returns GraphQL schema' do
+ expect(instance.schema).to respond_to(:to_graphql)
+ end
+ end
+
+ describe '#issues_by_urls' do
+ let(:result) { instance.issues_by_urls([ issue_url ]) }
+
+ context 'when issue exists' do
+ let(:issue_url) { ENV['GITLAB_ISSUE_LINK'] }
+
+ it 'returns a result list' do
+ expect(result.size).to eq(1)
+ end
+
+ it 'returns issue data in the result list' do
+ expect(result[0]).to eq(issue_data)
+ end
+ end
+
+ context 'when issue does not exists' do
+ let(:issue_url) { invalid_issue_url }
+
+ it 'returns no result' do
+ expect(result.size).to eq(0)
+ end
+ end
+ end
+
+ describe '#issue_by_url' do
+
+ let(:result) { instance.issue_by_url(issue_url) }
+
+ context 'when issue exists' do
+ let(:issue_url) { ENV['GITLAB_ISSUE_LINK'] }
+
+ it 'returns issue data' do
+ expect(result).to eq(issue_data)
+ end
+ end
+
+ context 'when issue does not exists' do
+ let(:issue_url) { invalid_issue_url }
+
+ it 'returns nil' do
+ expect(result).to be_nil
+ end
+ end
+ end
+end
diff --git a/spec/lib/core_ext/active_record/calculations/pluck_as_hash_spec.rb b/spec/lib/core_ext/active_record/calculations/pluck_as_hash_spec.rb
index d775e68ae..0bb26e3d0 100644
--- a/spec/lib/core_ext/active_record/calculations/pluck_as_hash_spec.rb
+++ b/spec/lib/core_ext/active_record/calculations/pluck_as_hash_spec.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
require 'rails_helper'
RSpec.describe ActiveRecord::Calculations do # rubocop:disable RSpec/FilePath
diff --git a/spec/requests/integration/gitlab_spec.rb b/spec/requests/integration/gitlab_spec.rb
new file mode 100644
index 000000000..914e179a6
--- /dev/null
+++ b/spec/requests/integration/gitlab_spec.rb
@@ -0,0 +1,115 @@
+require 'rails_helper'
+
+# rubocop:disable RSpec/StubbedMock,RSpec/MessageSpies
+
+RSpec.describe 'GitLab', type: :request do
+
+ let(:token) { 't0k3N' }
+ let(:endpoint) { 'https://git.example.com/api/graphql' }
+
+ let!(:admin) do
+ create(:admin, groups: Group.all)
+ end
+
+ let!(:agent) do
+ create(:agent, groups: Group.all)
+ end
+
+ let(:issue_data) do
+ {
+ id: '1',
+ title: 'Example issue',
+ url: ENV['GITLAB_ISSUE_LINK'],
+ icon_state: 'open',
+ milestone: 'important milestone',
+ assignees: ['zammad-robot'],
+ labels: [
+ {
+ color: '#FF0000',
+ text_color: '#FFFFFF',
+ title: 'critical'
+ },
+ {
+ color: '#0033CC',
+ text_color: '#FFFFFF',
+ title: 'label1'
+ },
+ {
+ color: '#D1D100',
+ text_color: '#FFFFFF',
+ title: 'special'
+ }
+ ],
+ }
+ end
+
+ let(:dummy_schema) do
+ {
+ a: :b
+ }
+ end
+
+ describe 'request handling' do
+ it 'does verify integration' do
+ params = {
+ endpoint: endpoint,
+ api_token: token,
+ }
+ authenticated_as(agent)
+ post '/api/v1/integration/gitlab/verify', params: params, as: :json
+ expect(response).to have_http_status(:forbidden)
+ expect(json_response).to be_a_kind_of(Hash)
+ expect(json_response).not_to be_blank
+ expect(json_response['error']).to eq('Not authorized (user)!')
+
+ authenticated_as(admin)
+ instance = instance_double('GitLab')
+ expect(GitLab).to receive(:new).with(endpoint, token).and_return instance
+ expect(instance).to receive(:schema).and_return(dummy_schema)
+
+ post '/api/v1/integration/gitlab/verify', params: params, as: :json
+ expect(response).to have_http_status(:ok)
+ expect(json_response).to be_a_kind_of(Hash)
+ expect(json_response).not_to be_blank
+ expect(json_response['result']).to eq('ok')
+ expect(json_response['response']).to eq(dummy_schema.to_json)
+ end
+
+ it 'does query objects' do
+ params = {
+ links: [ ENV['GITLAB_ISSUE_LINK'] ],
+ }
+ authenticated_as(agent)
+ instance = instance_double('GitLab')
+ expect(GitLab).to receive(:new).and_return instance
+ expect(instance).to receive(:issues_by_urls).and_return([issue_data])
+
+ post '/api/v1/integration/gitlab', params: params, as: :json
+ expect(response).to have_http_status(:ok)
+
+ expect(json_response).to be_a_kind_of(Hash)
+ expect(json_response).not_to be_blank
+ expect(json_response['result']).to eq('ok')
+ expect(json_response['response']).to eq([issue_data.deep_stringify_keys])
+ end
+
+ it 'does save ticket issues' do
+ ticket = create(:ticket, group: Group.first)
+
+ params = {
+ ticket_id: ticket.id,
+ issue_links: [ ENV['GITLAB_ISSUE_LINK'] ],
+ }
+ authenticated_as(agent)
+ post '/api/v1/integration/gitlab_ticket_update', params: params, as: :json
+ expect(response).to have_http_status(:ok)
+ expect(json_response).to be_a_kind_of(Hash)
+ expect(json_response).not_to be_blank
+ expect(json_response['result']).to eq('ok')
+
+ expect(ticket.reload.preferences[:gitlab][:issue_links]).to eq(params[:issue_links])
+ end
+ end
+end
+
+# rubocop:enable RSpec/StubbedMock,RSpec/MessageSpies
diff --git a/spec/support/vcr.rb b/spec/support/vcr.rb
index f71d62542..88b75201f 100644
--- a/spec/support/vcr.rb
+++ b/spec/support/vcr.rb
@@ -1,4 +1,4 @@
-VCR_IGNORE_MATCHING_HOSTS = %w[zammad.com google.com elasticsearch selenium login.microsoftonline.com zammad.org].freeze
+VCR_IGNORE_MATCHING_HOSTS = %w[elasticsearch selenium zammad.org zammad.com znuny.com google.com login.microsoftonline.com].freeze
VCR_IGNORE_MATCHING_REGEXPS = [/^192\.168\.\d+\.\d+$/].freeze
VCR.configure do |config|
diff --git a/spec/system/ticket/create_spec.rb b/spec/system/ticket/create_spec.rb
index b6bb0857a..31a7787d9 100644
--- a/spec/system/ticket/create_spec.rb
+++ b/spec/system/ticket/create_spec.rb
@@ -341,4 +341,62 @@ RSpec.describe 'Ticket Create', type: :system do
end
end
end
+
+ describe 'GitLab Integration', :integration, authenticated_as: :authenticate do
+ let(:customer) { create(:customer) }
+ let(:agent) { create(:agent, groups: [Group.find_by(name: 'Users')]) }
+ let!(:template) { create(:template, :dummy_data, group: Group.find_by(name: 'Users'), owner: agent, customer: customer) }
+
+ before(:all) do # rubocop:disable RSpec/BeforeAfterAll
+ required_envs = %w[GITLAB_ENDPOINT GITLAB_APITOKEN]
+ required_envs.each do |key|
+ skip("NOTICE: Missing environment variable #{key} for test! (Please fill up: #{required_envs.join(' && ')})") if ENV[key].blank?
+ end
+
+ # request schema only once for performance reasons
+ @cached_schema = GitLab.new(ENV['GITLAB_ENDPOINT'], ENV['GITLAB_APITOKEN']).schema.to_json
+ end
+
+ def authenticate
+ Setting.set('gitlab_integration', true)
+ Setting.set('gitlab_config', {
+ api_token: ENV['GITLAB_APITOKEN'],
+ endpoint: ENV['GITLAB_ENDPOINT'],
+ schema: @cached_schema, # rubocop:disable RSpec/InstanceVariable
+ })
+ true
+ end
+
+ it 'creates a ticket with links' do
+ visit 'ticket/create'
+ within(:active_content) do
+ use_template(template)
+
+ # switch to gitlab sidebar
+ click('.tabsSidebar-tab[data-tab=gitlab]')
+ click('.sidebar-header-headline.js-headline')
+
+ # add issue
+ click_on 'Link issue'
+ fill_in 'link', with: ENV['GITLAB_ISSUE_LINK']
+ click_on 'Submit'
+ await_empty_ajax_queue
+
+ # verify issue
+ content = find('.sidebar-git-issue-content')
+ expect(content).to have_text('#1 Example issue')
+ expect(content).to have_text('critical')
+ expect(content).to have_text('special')
+ expect(content).to have_text('important milestone')
+ expect(content).to have_text('zammad-robot')
+
+ # create Ticket
+ click '.js-submit'
+ await_empty_ajax_queue
+
+ # check stored data
+ expect(Ticket.last.preferences[:gitlab][:issue_links][0]).to eq(ENV['GITLAB_ISSUE_LINK'])
+ end
+ end
+ end
end
diff --git a/spec/system/ticket/zoom_spec.rb b/spec/system/ticket/zoom_spec.rb
index ca23f3ec7..4c801477a 100644
--- a/spec/system/ticket/zoom_spec.rb
+++ b/spec/system/ticket/zoom_spec.rb
@@ -1474,4 +1474,68 @@ RSpec.describe 'Ticket zoom', type: :system do
end
end
end
+
+ describe 'GitLab Integration', :integration, authenticated_as: :authenticate do
+ let!(:ticket) { create(:ticket, group: Group.find_by(name: 'Users')) }
+
+ before(:all) do # rubocop:disable RSpec/BeforeAfterAll
+ required_envs = %w[GITLAB_ENDPOINT GITLAB_APITOKEN]
+ required_envs.each do |key|
+ skip("NOTICE: Missing environment variable #{key} for test! (Please fill up: #{required_envs.join(' && ')})") if ENV[key].blank?
+ end
+
+ # request schema only once for performance reasons
+ @cached_schema = GitLab.new(ENV['GITLAB_ENDPOINT'], ENV['GITLAB_APITOKEN']).schema.to_json
+ end
+
+ def authenticate
+ Setting.set('gitlab_integration', true)
+ Setting.set('gitlab_config', {
+ api_token: ENV['GITLAB_APITOKEN'],
+ endpoint: ENV['GITLAB_ENDPOINT'],
+ schema: @cached_schema, # rubocop:disable RSpec/InstanceVariable
+ })
+ true
+ end
+
+ it 'creates links and removes them' do
+ visit "#ticket/zoom/#{ticket.id}"
+ within(:active_content) do
+
+ # switch to GitLab sidebar
+ click('.tabsSidebar-tab[data-tab=gitlab]')
+ click('.sidebar-header-headline.js-headline')
+
+ # add issue
+ click_on 'Link issue'
+ fill_in 'link', with: ENV['GITLAB_ISSUE_LINK']
+ click_on 'Submit'
+ await_empty_ajax_queue
+
+ # verify issue
+ content = find('.sidebar-git-issue-content')
+ expect(content).to have_text('#1 Example issue')
+ expect(content).to have_text('critical')
+ expect(content).to have_text('special')
+ expect(content).to have_text('important milestone')
+ expect(content).to have_text('zammad-robot')
+
+ expect(ticket.reload.preferences[:gitlab][:issue_links][0]).to eq(ENV['GITLAB_ISSUE_LINK'])
+
+ # check sidebar counter increased to 1
+ expect(find('.tabsSidebar-tab[data-tab=gitlab] .js-tabCounter')).to have_text('1')
+
+ # delete issue
+ click(".sidebar-git-issue-delete span[data-issue-id='#{ENV['GITLAB_ISSUE_LINK']}']")
+ await_empty_ajax_queue
+
+ content = find('.sidebar[data-tab=gitlab] .sidebar-content')
+ expect(content).to have_text('No linked issues')
+ expect(ticket.reload.preferences[:gitlab][:issue_links][0]).to be nil
+
+ # check that counter got removed
+ expect(page).to have_no_selector('.tabsSidebar-tab[data-tab=gitlab] .js-tabCounter')
+ end
+ end
+ end
end