diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-06 00:31:01 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-06 00:31:01 +0300 |
| commit | 6fdc09c7a766b1608a5d5b228af3c1d4f7a03b1a (patch) | |
| tree | edf772a157b6c130fd86dbe750dd633cc36eee30 /spec/models/project_services | |
| parent | fd09e66194432ede8bf6568c13e6ce2d65f400e1 (diff) | |
| parent | 36a0f6aaa3d3999d743fc11a39a9f8dd2f127d70 (diff) | |
Merge branch 'issue_31081' into 'master'
Use host URL to build JIRA remote link icon
Closes #31081
See merge request gitlab-org/gitlab-ce!17541
Diffstat (limited to 'spec/models/project_services')
| -rw-r--r-- | spec/models/project_services/jira_service_spec.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb index 748c366efca..54ef0be67ff 100644 --- a/spec/models/project_services/jira_service_spec.rb +++ b/spec/models/project_services/jira_service_spec.rb @@ -166,7 +166,6 @@ describe JiraService do # Creates comment expect(WebMock).to have_requested(:post, @comment_url) - # Creates Remote Link in JIRA issue fields expect(WebMock).to have_requested(:post, @remote_link_url).with( body: hash_including( @@ -174,7 +173,7 @@ describe JiraService do object: { url: "#{Gitlab.config.gitlab.url}/#{project.full_path}/commit/#{merge_request.diff_head_sha}", title: "GitLab: Solved by commit #{merge_request.diff_head_sha}.", - icon: { title: "GitLab", url16x16: "https://gitlab.com/favicon.ico" }, + icon: { title: "GitLab", url16x16: "http://localhost/favicon.ico" }, status: { resolved: true } } ) |