Revert "Merge pull request zendesk#272 from zendesk/grosser/cache"

This reverts commit 519561c, reversing
changes made to 3557017.

app/models/stage.rb

@@ -60,18 +60,15 @@ def self.where_reference_being_deployed(reference)
   end
 
   def current_deploy
-    return @current_deploy if defined?(@current_deploy)
-    @current_deploy = deploys.active.first
+    @current_deploy ||= deploys.active.first
   end
 
   def last_deploy
-    return @last_deploy if defined?(@last_deploy)
-    @last_deploy = deploys.first
+    @last_deploy ||= deploys.first
   end
 
   def last_successful_deploy
-    return @last_successful_deploy if defined?(@last_successful_deploy)
-    @last_successful_deploy = deploys.successful.first
+    @last_successful_deploy ||= deploys.successful.first
   end
 
   def locked?

test/models/stage_test.rb

@@ -2,7 +2,6 @@
 
 describe Stage do
   subject { stages(:test_staging) }
-  let(:stage) { subject }
 
   describe ".where_reference_being_deployed" do
     it "returns stages where the reference is currently being deployed" do
@@ -61,12 +60,12 @@
     let(:project) { projects(:test) }
     let(:stage) { stages(:test_staging) }
 
-    it 'caches nil' do
-      stage
-      ActiveRecord::Relation.any_instance.expects(:first).returns nil
-      stage.last_deploy.must_equal nil
-      ActiveRecord::Relation.any_instance.expects(:first).never
-      stage.last_deploy.must_equal nil
+    it 'returns the last successful deploy for the stage' do
+      successful_job = project.jobs.create!(command: 'cat foo', user: users(:deployer), status: 'succeeded')
+      stage.deploys.create!(reference: 'master', job: successful_job)
+      job = project.jobs.create!(command: 'cat foo', user: users(:deployer), status: 'failed')
+      deploy = stage.deploys.create!(reference: 'master', job: successful_job)
+      assert_equal deploy, stage.last_successful_deploy
     end
 
     it 'returns the last deploy for the stage' do
@@ -78,26 +77,6 @@
     end
   end
 
-  describe '#last_successful_deploy' do
-    let(:project) { projects(:test) }
-
-    it 'caches nil' do
-      subject
-      ActiveRecord::Relation.any_instance.expects(:first).returns nil
-      stage.last_successful_deploy.must_equal nil
-      ActiveRecord::Relation.any_instance.expects(:first).never
-      stage.last_successful_deploy.must_equal nil
-    end
-
-    it 'returns the last successful deploy for the stage' do
-      successful_job = project.jobs.create!(command: 'cat foo', user: users(:deployer), status: 'succeeded')
-      stage.deploys.create!(reference: 'master', job: successful_job)
-      job = project.jobs.create!(command: 'cat foo', user: users(:deployer), status: 'failed')
-      deploy = stage.deploys.create!(reference: 'master', job: successful_job)
-      assert_equal deploy, stage.last_successful_deploy
-    end
-  end
-
   describe "#current_release?" do
     let(:project) { projects(:test) }
     let(:stage) { stages(:test_staging) }
@@ -151,14 +130,6 @@
       subject.current_deploy.must_equal nil
     end
 
-    it 'caches nil' do
-      subject
-      ActiveRecord::Relation.any_instance.expects(:first).returns nil
-      subject.current_deploy.must_equal nil
-      ActiveRecord::Relation.any_instance.expects(:first).never
-      subject.current_deploy.must_equal nil
-    end
-
     it "is there when deploying" do
       subject.deploys.first.job.update_column(:status, 'running')
       subject.current_deploy.must_equal subject.deploys.first