From 86cda964cf7f289c8b0cd1efa80b3bd4bacfec4e Mon Sep 17 00:00:00 2001
From: Tim Zallmann <tzallmann@gitlab.com>
Date: Mon, 21 Jan 2019 23:58:54 +0100
Subject: Fixed static analysis error and 2 caching specs

---
 spec/controllers/uploads_controller_spec.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'spec/controllers')

diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb
index 482f9af7211..f731ac2971b 100644
--- a/spec/controllers/uploads_controller_spec.rb
+++ b/spec/controllers/uploads_controller_spec.rb
@@ -12,7 +12,7 @@ shared_examples 'content not cached without revalidation and no-store' do
   end
 end
 
-shared_examples 'content publicy cached' do
+shared_examples 'content publicly cached' do
   it 'ensures content is publicly cached' do
     # Fixed in newer versions of ActivePack, it will only output a single `private`.
     expect(subject['Cache-Control']).to eq('max-age=300, public')
@@ -191,7 +191,7 @@ describe UploadsController do
             expect(response).to have_gitlab_http_status(200)
           end
 
-          it_behaves_like 'content publicy cached' do
+          it_behaves_like 'content publicly cached' do
             subject do
               get :show, params: { model: 'user', mounted_as: 'avatar', id: user.id, filename: 'dk.png' }
 
@@ -208,7 +208,7 @@ describe UploadsController do
           expect(response).to have_gitlab_http_status(200)
         end
 
-        it_behaves_like 'content not cached without revalidation' do
+        it_behaves_like 'content publicly cached' do
           subject do
             get :show, params: { model: 'user', mounted_as: 'avatar', id: user.id, filename: 'dk.png' }
 
@@ -544,7 +544,7 @@ describe UploadsController do
             expect(response).to have_gitlab_http_status(200)
           end
 
-          it_behaves_like 'content not cached without revalidation' do
+          it_behaves_like 'content publicly cached' do
             subject do
               get :show, params: { model: 'appearance', mounted_as: 'header_logo', id: appearance.id, filename: 'dk.png' }
 
@@ -564,7 +564,7 @@ describe UploadsController do
             expect(response).to have_gitlab_http_status(200)
           end
 
-          it_behaves_like 'content not cached without revalidation' do
+          it_behaves_like 'content publicly cached' do
             subject do
               get :show, params: { model: 'appearance', mounted_as: 'logo', id: appearance.id, filename: 'dk.png' }
 
-- 
cgit v1.2.1