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/services | |
| 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/services')
| -rw-r--r-- | spec/services/system_note_service_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index e2ee421921c..57d081cffb3 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -3,6 +3,7 @@ require 'spec_helper' describe SystemNoteService do include Gitlab::Routing include RepoHelpers + include AssetsHelpers set(:group) { create(:group) } set(:project) { create(:project, :repository, group: group) } @@ -769,7 +770,7 @@ describe SystemNoteService do end describe "new reference" do - let(:favicon_path) { "http://localhost/assets/#{Rails.application.assets.find_asset('favicon.png').digest_path}" } + let(:favicon_path) { "http://localhost/assets/#{find_asset('favicon.png').digest_path}" } before do allow(JIRA::Resource::Remotelink).to receive(:all).and_return([]) |