diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-11 15:01:45 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-11 15:01:45 +0000 |
| commit | 75797ac3d2b534a1deda48c8450027055a7c721b (patch) | |
| tree | 8f136aca605132cceae85c3b3095904c76db81b9 /spec/models | |
| parent | 3bd5e10e58aa90577afbd4da0e6a288671efc79e (diff) | |
| parent | 0f90c1fd730663fea30bd4d6368adbfbe752e001 (diff) | |
| download | gitlab-ce-75797ac3d2b534a1deda48c8450027055a7c721b.tar.gz | |
Merge branch '47684-uploads-specs-are-failing-on-master' into 'master'
Resolve "Uploads specs are failing on master"
Closes #47684
See merge request gitlab-org/gitlab-ce!19638
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/project_services/jira_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb index c3b4eb17a5c..b9f1c7dd5df 100644 --- a/spec/models/project_services/jira_service_spec.rb +++ b/spec/models/project_services/jira_service_spec.rb @@ -475,7 +475,7 @@ describe JiraService do end it 'includes returns the custom favicon' do - create :appearance, favicon: fixture_file_upload(Rails.root.join('spec/fixtures/dk.png')) + create :appearance, favicon: fixture_file_upload('spec/fixtures/dk.png') props = described_class.new.send(:build_remote_link_props, url: 'http://example.com', title: 'title') expect(props[:object][:icon][:url16x16]).to match %r{^http://localhost/uploads/-/system/appearance/favicon/\d+/favicon_main_dk.png$} |