Fix CI again

Author: choonkeat

.rspec

@@ -1,2 +1,4 @@
 --color
 --require spec_helper
+--format documentation
+

spec/lib/attache/download_spec.rb

@@ -8,12 +8,11 @@
   let(:reldirname) { "path#{rand}" }
   let(:geometry) { CGI.escape('2x2#') }
   let(:file) { StringIO.new(IO.binread("spec/fixtures/transparent.gif"), 'rb') }
+  let(:remote_url) { "http://example.com/image.jpg" }
 
   before do
     allow(Attache).to receive(:logger).and_return(Logger.new('/dev/null'))
     allow(Attache).to receive(:localdir).and_return(Dir.tmpdir) # forced, for safety
-    allow_any_instance_of(Attache::VHost).to receive(:storage_get).and_return(nil)
-    allow_any_instance_of(Attache::VHost).to receive(:backup).and_return(nil)
   end
 
   after do
@@ -29,7 +28,16 @@
     subject { proc { middleware.call Rack::MockRequest.env_for("http://example.com/view/#{reldirname}/#{geometry}/#{filename}", "HTTP_HOST" => "example.com") } }
 
     context 'not in local cache' do
+      before do
+        Attache.cache.delete("example.com/#{reldirname}/#{filename}")
+      end
+
       context 'no cloud storage configured' do
+        before do
+          allow_any_instance_of(Attache::VHost).to receive(:storage).and_return(nil)
+          allow_any_instance_of(Attache::VHost).to receive(:bucket).and_return(nil)
+        end
+
         it 'should respond not found' do
           code, headers, body = subject.call
           expect(code).to eq(404)
@@ -64,6 +72,7 @@
         context 'available remotely' do
           before do
             allow_any_instance_of(Attache::VHost).to receive(:storage_get).and_return(file)
+            allow_any_instance_of(Attache::VHost).to receive(:storage_url).and_return(remote_url)
           end
 
           it 'should proceed normally' do
@@ -72,12 +81,8 @@
           end
 
           context 'geometry is "remote"' do
-            let(:remote_url) { "http://example.com/image.jpg" }
-            let(:geometry) { CGI.escape('remote') }
 
-            before do
-              allow_any_instance_of(Attache::VHost).to receive(:storage_url).and_return(remote_url)
-            end
+            let(:geometry) { CGI.escape('remote') }
 
             it 'should send remote file' do
               expect(Attache.cache).not_to receive(:fetch)
@@ -113,55 +118,26 @@
         end
       end
 
-      context 'geometry is "remote"' do
-        let(:remote_url) { "http://example.com/image.jpg" }
-        let(:geometry) { CGI.escape('remote') }
+      context 'rendering' do
+        context 'non image' do
+          let(:file) { StringIO.new(IO.binread("spec/fixtures/sample.txt"), 'rb') }
+          let(:filename) { "hello#{rand}.txt" }
 
-        before do
-          allow_any_instance_of(Attache::VHost).to receive(:storage_url).and_return(remote_url)
-        end
-
-        it 'should send remote file' do
-          expect(Attache.cache).not_to receive(:fetch)
-          expect_any_instance_of(Attache::VHost).to receive(:storage_url)
-          code, headers, body = subject.call
-          response_content = ''
-          body.each {|p| response_content += p }
-          expect(response_content).to eq('')
-          expect(code).to eq(302)
-          expect(headers['Location']).to eq(remote_url)
-          expect(headers['Cache-Control']).to eq("private, no-cache")
-        end
-      end
-    end
-
-    context 'rendering' do
-      context 'non image' do
-        let(:file) { StringIO.new(IO.binread("spec/fixtures/sample.txt"), 'rb') }
-        let(:filename) { "hello#{rand}.txt" }
-
-        before do
-          Attache.cache.write("example.com/#{reldirname}/#{filename}", file)
-        end
-
-        it 'should output as png' do
-          expect_any_instance_of(Attache::ResizeJob).to receive(:make_nonimage_preview).exactly(1).times.and_call_original
-          code, headers, body = subject.call
-          expect(code).to eq(200)
-          expect(headers['Content-Type']).to eq("image/png")
-        end
-      end
-
-      context 'image' do
-        before do
-          Attache.cache.write("example.com/#{reldirname}/#{filename}", file)
+          it 'should output as png' do
+            expect_any_instance_of(Attache::ResizeJob).to receive(:make_nonimage_preview).exactly(1).times.and_call_original
+            code, headers, body = subject.call
+            expect(code).to eq(200)
+            expect(headers['Content-Type']).to eq("image/png")
+          end
         end
 
-        it 'should output as gif' do
-          expect_any_instance_of(Attache::ResizeJob).not_to receive(:make_nonimage_preview)
-          code, headers, body = subject.call
-          expect(code).to eq(200)
-          expect(headers['Content-Type']).to eq("image/gif")
+        context 'image' do
+          it 'should output as gif' do
+            expect_any_instance_of(Attache::ResizeJob).not_to receive(:make_nonimage_preview)
+            code, headers, body = subject.call
+            expect(code).to eq(200)
+            expect(headers['Content-Type']).to eq("image/gif")
+          end
         end
       end
     end