Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480

* master: (119 commits)
  [ci skip] Fix example commands to refer to the correct versions
  Use axios instead of jquery ajax for setCiStatusFavicon
  refactor groups controller to match EE
  Fix broken test
  Introduce a new QA::Gitlab::Page::Component::Dropzone class
  Gitaly Server info for admin panel
  Add note about being in the `qa` directory for `bin/qa` to work
  Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints
  Fix not all events being shown in group dashboard
  Add support for PreReceiveError in UserMergeBranch RPC
  Migrate Git::Repository#delete_refs to Gitaly
  Replace $.get in render math with axios
  Move mr widget related links into a vue file
  Make those files as close as EE to reduce conflicts
  Don't assume postgresql in two initializers
  Move Repository#can_be_merged? to Gitlab::Git::Repository
  Remove brakeman from .codeclimate.yml since it's now covered by the sast CI job
  Update Nokogiri to 1.8.2
  Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck
  Remove Rugged exception in cache rescue
  ...

1 files changed, 23 insertions, 0 deletions

diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb
index c9b3c6cf602..1eaaadf56c5 100644
--- a/spec/models/project_services/jira_service_spec.rb
+++ b/spec/models/project_services/jira_service_spec.rb
@@ -3,6 +3,29 @@ require 'spec_helper'
 describe JiraService do
   include Gitlab::Routing
 
+  describe '#options' do
+    let(:service) do
+      described_class.new(
+        project: build_stubbed(:project),
+        active: true,
+        username: 'username',
+        password: 'test',
+        jira_issue_transition_id: 24,
+        url: 'http://jira.test.com/path/'
+      )
+    end
+
+    it 'sets the URL properly' do
+      # jira-ruby gem parses the URI and handles trailing slashes
+      # fine: https://github.com/sumoheavy/jira-ruby/blob/v1.4.1/lib/jira/http_client.rb#L59
+      expect(service.options[:site]).to eq('http://jira.test.com/')
+    end
+
+    it 'leaves out trailing slashes in context' do
+      expect(service.options[:context_path]).to eq('/path')
+    end
+  end
+
   describe "Associations" do
     it { is_expected.to belong_to :project }
     it { is_expected.to have_one :service_hook }