Remove unnecessary Fog mocks

Author: BanzaiMan

spec/auth/v2.1/jobs_spec.rb

@@ -26,29 +26,13 @@
   let(:log_url) { "#{Travis.config[:logs_api][:url]}/logs/1?by=id&source=api" }
 
   before do
-    Fog.mock!
-    storage = Fog::Storage.new({
-      aws_access_key_id: 'key',
-      aws_secret_access_key: 'secret',
-      provider: 'AWS'
-    })
-    bucket = storage.directories.create(key: 'archive.travis-ci.org')
-    file = bucket.files.create(
-      key: "jobs/#{job.id}/log.txt",
-      body: archived_content
-    )
     remote = double('remote')
     allow(Travis::RemoteLog::Remote).to receive(:new).and_return(remote)
     allow(remote).to receive(:find_by_job_id).and_return(Travis::RemoteLog.new(log_from_api))
     allow(remote).to receive(:find_by_id).and_return(Travis::RemoteLog.new(log_from_api))
     allow(remote).to receive(:fetch_archived_url).and_return('https://s3.amazonaws.com/STUFFS')
   end
 
-  after do
-    Fog.unmock!
-    Fog::Mock.reset
-  end
-
   before { Job.update_all(state: :started) }
 
   # TODO

spec/auth/v2.1/logs_spec.rb

@@ -27,29 +27,13 @@
   let(:log_url) { "#{Travis.config[:logs_api][:url]}/logs/1?by=id&source=api" }
 
   before do
-    Fog.mock!
-    storage = Fog::Storage.new({
-      aws_access_key_id: 'key',
-      aws_secret_access_key: 'secret',
-      provider: 'AWS'
-    })
-    bucket = storage.directories.create(key: 'archive.travis-ci.org')
-    file = bucket.files.create(
-      key: "jobs/#{job.id}/log.txt",
-      body: archived_content
-    )
     remote = double('remote')
     allow(Travis::RemoteLog::Remote).to receive(:new).and_return(remote)
     allow(remote).to receive(:find_by_job_id).and_return(Travis::RemoteLog.new(log_from_api))
     allow(remote).to receive(:find_by_id).and_return(Travis::RemoteLog.new(log_from_api))
     allow(remote).to receive(:fetch_archived_url).and_return('https://s3.amazonaws.com/STUFFS')
   end
 
-  after do
-    Fog.unmock!
-    Fog::Mock.reset
-  end
-
   describe 'in public mode, with a private repo', mode: :public, repo: :private do
     describe 'GET /logs/%{log.id}' do
       it(:with_permission)    { should auth status: [200, 307], type: :json, empty: false }

spec/auth/v2/jobs_spec.rb

@@ -28,29 +28,13 @@
   let(:log_url) { "#{Travis.config[:logs_api][:url]}/logs/1?by=id&source=api" }
 
   before do
-    Fog.mock!
-    storage = Fog::Storage.new({
-      aws_access_key_id: 'key',
-      aws_secret_access_key: 'secret',
-      provider: 'AWS'
-    })
-    bucket = storage.directories.create(key: 'archive.travis-ci.org')
-    file = bucket.files.create(
-      key: "jobs/#{job.id}/log.txt",
-      body: archived_content
-    )
     remote = double('remote')
     allow(Travis::RemoteLog::Remote).to receive(:new).and_return(remote)
     allow(remote).to receive(:find_by_job_id).and_return(Travis::RemoteLog.new(log_from_api))
     allow(remote).to receive(:find_by_id).and_return(Travis::RemoteLog.new(log_from_api))
     allow(remote).to receive(:fetch_archived_url).and_return('https://s3.amazonaws.com/STUFFS')
   end
 
-  after do
-    Fog.unmock!
-    Fog::Mock.reset
-  end
-
   before { Job.update_all(state: :started) }
 
   # TODO

spec/auth/v2/logs_spec.rb

@@ -27,29 +27,13 @@
   let(:log_url) { "#{Travis.config[:logs_api][:url]}/logs/1?by=id&source=api" }
 
   before do
-    Fog.mock!
-    storage = Fog::Storage.new({
-      aws_access_key_id: 'key',
-      aws_secret_access_key: 'secret',
-      provider: 'AWS'
-    })
-    bucket = storage.directories.create(key: 'archive.travis-ci.org')
-    file = bucket.files.create(
-      key: "jobs/#{job.id}/log.txt",
-      body: archived_content
-    )
     remote = double('remote')
     allow(Travis::RemoteLog::Remote).to receive(:new).and_return(remote)
     allow(remote).to receive(:find_by_job_id).and_return(Travis::RemoteLog.new(log_from_api))
     allow(remote).to receive(:find_by_id).and_return(Travis::RemoteLog.new(log_from_api))
     allow(remote).to receive(:fetch_archived_url).and_return('https://s3.amazonaws.com/STUFFS')
   end
 
-  after do
-    Fog.unmock!
-    Fog::Mock.reset
-  end
-
   describe 'in public mode, with a private repo', mode: :public, repo: :private do
     describe 'GET /logs/%{log.id}' do
       it(:with_permission)    { should auth status: [200, 307], type: :json, empty: false }

spec/integration/v2/jobs_spec.rb

@@ -29,17 +29,6 @@
   let(:log_url) { "#{Travis.config[:logs_api][:url]}/logs/1?by=id&source=api" }
 
   before do
-    Fog.mock!
-    storage = Fog::Storage.new({
-      aws_access_key_id: 'key',
-      aws_secret_access_key: 'secret',
-      provider: 'AWS'
-    })
-    bucket = storage.directories.create(key: 'archive.travis-ci.org')
-    file = bucket.files.create(
-      key: "jobs/#{job.id}/log.txt",
-      body: archived_content
-    )
     remote = double('remote')
     allow(Travis::RemoteLog::Remote).to receive(:new).and_return(remote)
     allow(remote).to receive(:find_by_job_id).and_return(Travis::RemoteLog.new(log_from_api))
@@ -50,11 +39,6 @@
     allow(remote).to receive(:send).and_return(remote) # ignore attribute updates
   end
 
-  after do
-    Fog.unmock!
-    Fog::Mock.reset
-  end
-
   it '/jobs?queue=builds.common' do
     skip('querying with a queue does not appear to be used anymore')
     response = get '/jobs', { queue: 'builds.common' }, headers