diff options
author | Shinya Maeda <shinya@gitlab.com> | 2018-06-18 17:29:48 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2018-06-18 17:29:48 +0900 |
commit | 71e30c011957229dfa4029b9b04e5308ceed4fcd (patch) | |
tree | 2bfbff9907fa37a5bfba3c744439e09c7381c06f /spec/models | |
parent | 1aeedf41f8681bbc638dde8b8a263a7d7cd13a1e (diff) | |
parent | 39208ed6750e31d10e4bad5a33693a83eb599f1f (diff) | |
download | gitlab-ce-71e30c011957229dfa4029b9b04e5308ceed4fcd.tar.gz |
Merge branch 'master' into build-chunks-on-object-storage
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/ci/build_trace_chunk_spec.rb | 8 | ||||
-rw-r--r-- | spec/models/project_services/jira_service_spec.rb | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/spec/models/ci/build_trace_chunk_spec.rb b/spec/models/ci/build_trace_chunk_spec.rb index 3f89898ed06..f0c36067c87 100644 --- a/spec/models/ci/build_trace_chunk_spec.rb +++ b/spec/models/ci/build_trace_chunk_spec.rb @@ -54,14 +54,6 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do it { is_expected.to eq('Sample data in db') } end - - context 'when data_store is others' do - before do - build_trace_chunk.send(:write_attribute, :data_store, -1) - end - - it { expect { subject }.to raise_error('Unsupported data store') } - end end describe '#set_data' do diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb index b9f1c7dd5df..6c637533c6b 100644 --- a/spec/models/project_services/jira_service_spec.rb +++ b/spec/models/project_services/jira_service_spec.rb @@ -478,7 +478,7 @@ describe JiraService do 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$} + expect(props[:object][:icon][:url16x16]).to match %r{^http://localhost/uploads/-/system/appearance/favicon/\d+/dk.png$} end end end |