summaryrefslogtreecommitdiff
path: root/spec/models/uploads
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-19 00:08:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-19 00:08:01 +0000
commit1caa60060b2f9e3417ab335e2f1dea1064163434 (patch)
tree01c0d5825bd345ee625bb70b7433c6e10307fcce /spec/models/uploads
parent7f8330873c1a5860b8a9a52d111083a65d210249 (diff)
downloadgitlab-ce-1caa60060b2f9e3417ab335e2f1dea1064163434.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/uploads')
-rw-r--r--spec/models/uploads/fog_spec.rb2
-rw-r--r--spec/models/uploads/local_spec.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/spec/models/uploads/fog_spec.rb b/spec/models/uploads/fog_spec.rb
index b93d9449da9..72a169280af 100644
--- a/spec/models/uploads/fog_spec.rb
+++ b/spec/models/uploads/fog_spec.rb
@@ -31,6 +31,7 @@ describe Uploads::Fog do
describe '#keys' do
let!(:uploads) { create_list(:upload, 2, :object_storage, uploader: FileUploader, model: project) }
+
subject { data_store.keys(relation) }
it 'returns keys' do
@@ -41,6 +42,7 @@ describe Uploads::Fog do
describe '#delete_keys' do
let(:keys) { data_store.keys(relation) }
let!(:uploads) { create_list(:upload, 2, :with_file, :issuable_upload, model: project) }
+
subject { data_store.delete_keys(keys) }
before do
diff --git a/spec/models/uploads/local_spec.rb b/spec/models/uploads/local_spec.rb
index 3468399f370..374c3019edc 100644
--- a/spec/models/uploads/local_spec.rb
+++ b/spec/models/uploads/local_spec.rb
@@ -15,6 +15,7 @@ describe Uploads::Local do
describe '#keys' do
let!(:uploads) { create_list(:upload, 2, uploader: FileUploader, model: project) }
+
subject { data_store.keys(relation) }
it 'returns keys' do
@@ -25,6 +26,7 @@ describe Uploads::Local do
describe '#delete_keys' do
let(:keys) { data_store.keys(relation) }
let!(:uploads) { create_list(:upload, 2, :with_file, :issuable_upload, model: project) }
+
subject { data_store.delete_keys(keys) }
it 'deletes multiple data' do