diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-06-22 14:45:04 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-06-22 14:45:04 +0000 |
commit | 70bf08b5d34e71bb67d3a71a9f6aae553f0d9f4a (patch) | |
tree | 9a3e4ba27c2a7197463725b0d473850206cce714 | |
parent | afb1ee87a7ff44ba644db7460334d2b648f6dea0 (diff) | |
parent | a4f9ef7d79f0a9e61e6c3aaf1c4a5670324d837d (diff) | |
download | gitlab-ce-70bf08b5d34e71bb67d3a71a9f6aae553f0d9f4a.tar.gz |
Merge branch 'blackst0ne-rails5-fix-data-store-spec' into 'master'
[Rails5] Fix "'-1' is not a valid data_store"
See merge request gitlab-org/gitlab-ce!19917
-rw-r--r-- | changelogs/unreleased/blackst0ne-rails5-fix-data-store-spec.yml | 5 | ||||
-rw-r--r-- | spec/models/ci/build_trace_chunk_spec.rb | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/changelogs/unreleased/blackst0ne-rails5-fix-data-store-spec.yml b/changelogs/unreleased/blackst0ne-rails5-fix-data-store-spec.yml new file mode 100644 index 00000000000..403c3764321 --- /dev/null +++ b/changelogs/unreleased/blackst0ne-rails5-fix-data-store-spec.yml @@ -0,0 +1,5 @@ +--- +title: '[Rails5] Fix "-1 is not a valid data_store"' +merge_request: 19917 +author: "@blackst0ne" +type: fixed diff --git a/spec/models/ci/build_trace_chunk_spec.rb b/spec/models/ci/build_trace_chunk_spec.rb index b5a6d959ccb..c5d550cba1b 100644 --- a/spec/models/ci/build_trace_chunk_spec.rb +++ b/spec/models/ci/build_trace_chunk_spec.rb @@ -125,14 +125,6 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do end end 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 '#truncate' do |