Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 2 deletions

diff --git a/spec/uploaders/gitlab_uploader_spec.rb b/spec/uploaders/gitlab_uploader_spec.rb
index 4329171f0be..80efdb88585 100644
--- a/spec/uploaders/gitlab_uploader_spec.rb
+++ b/spec/uploaders/gitlab_uploader_spec.rb
@@ -59,7 +59,7 @@ describe GitlabUploader do
   describe '#cache!' do
     it 'moves the file from the working directory to the cache directory' do
       # One to get the work dir, the other to remove it
-      expect(subject).to receive(:workfile_path).exactly(2).times.and_call_original
+      expect(subject).to receive(:workfile_path).twice.and_call_original
       # Test https://github.com/carrierwavesubject/carrierwave/blob/v1.0.0/lib/carrierwave/sanitized_file.rb#L200
       expect(FileUtils).to receive(:mv).with(anything, /^#{subject.work_dir}/).and_call_original
       expect(FileUtils).to receive(:mv).with(/^#{subject.work_dir}/, /#{subject.cache_dir}/).and_call_original
diff --git a/spec/uploaders/namespace_file_uploader_spec.rb b/spec/uploaders/namespace_file_uploader_spec.rb
index aa98b3e2828..bc8d6a33e85 100644
--- a/spec/uploaders/namespace_file_uploader_spec.rb
+++ b/spec/uploaders/namespace_file_uploader_spec.rb
@@ -37,7 +37,7 @@ describe NamespaceFileUploader do
     end
   end
 
-  context '.base_dir' do
+  describe '.base_dir' do
     it 'returns local storage base_dir without store param' do
       expect(described_class.base_dir(group)).to eq("uploads/-/system/namespace/#{group.id}")
     end