diff options
| author | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2018-05-22 18:37:35 +0200 |
|---|---|---|
| committer | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2018-06-06 11:28:13 +0200 |
| commit | 29598f6e6d8ebbe9c1b64018fcb925655ccceb67 (patch) | |
| tree | 8b5dbd23ad73bceff2dde81ee7125799b54690ac /spec/models | |
| parent | d2256300e559e836884fea57210266dae764f13e (diff) | |
| download | gitlab-ce-29598f6e6d8ebbe9c1b64018fcb925655ccceb67.tar.gz | |
find assets in test for CI and local test
Due to the change in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14583/diffs we
can't use the same method to access assets in a CI and the local test
environment anymore.
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/project_services/jira_service_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb index 50bdb80ff92..c3b4eb17a5c 100644 --- a/spec/models/project_services/jira_service_spec.rb +++ b/spec/models/project_services/jira_service_spec.rb @@ -2,6 +2,7 @@ require 'spec_helper' describe JiraService do include Gitlab::Routing + include AssetsHelpers describe '#options' do let(:service) do @@ -164,7 +165,7 @@ describe JiraService do it "creates Remote Link reference in JIRA for comment" do @jira_service.close_issue(merge_request, ExternalIssue.new("JIRA-123", project)) - favicon_path = "http://localhost/assets/#{Rails.application.assets.find_asset('favicon.png').digest_path}" + favicon_path = "http://localhost/assets/#{find_asset('favicon.png').digest_path}" # Creates comment expect(WebMock).to have_requested(:post, @comment_url) |