Merge branch 'spec-cleanup'

Fix and improve some Test::* specs.

spec/producer/core/tests/has_env_spec.rb

@@ -4,36 +4,37 @@ module Producer::Core
   module Tests
     describe HasEnv do
       let(:env)           { Env.new }
-      let(:variable_name) { :some_variable_name }
+      let(:variable_name) { 'SOME_VAR' }
+      let(:remote_env)    { { 'SOME_VAR' => 'SOME_VALUE' } }
       subject(:has_env)   { HasEnv.new(env, variable_name) }
 
       it_behaves_like 'test'
 
+      before do
+        allow(env.remote).to receive(:environment) { remote_env }
+      end
+
       describe '#verify' do
-        let(:environment) { double 'environment' }
+        context 'remote environment var is defined' do
+          it 'returns true' do
+            expect(has_env.verify).to be true
+          end
 
-        before do
+          context 'when var name is given as a lowercase symbol' do
-          allow(env.remote).to receive(:environment) { environment }
+            let(:variable_name) { :some_var }
+
+            it 'returns true' do
+              expect(has_env.verify).to be true
+            end
+          end
         end
 
-        it 'stringifies the queried variable name' do
+        context 'remote environment var is not defined' do
-          expect(environment).to receive(:key?).with(kind_of(String))
+          let(:variable_name) { 'SOME_NON_EXISTENT_VAR' }
-          has_env.verify
-        end
 
-        it 'upcases the queried variable name' do
+          it 'returns false' do
-          expect(environment).to receive(:key?).with('SOME_VARIABLE_NAME')
+            expect(has_env.verify).to be false
-          has_env.verify
+          end
-        end
-
-        it 'returns true when remote environment var is defined' do
-          allow(environment).to receive(:key?) { true }
-          expect(has_env.verify).to be true
-        end
-
-        it 'returns false when remote environment var is not defined' do
-          allow(environment).to receive(:key?) { false }
-          expect(has_env.verify).to be false
         end
       end
     end

spec/producer/core/tests/has_executable_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Producer::Core
   module Tests
     describe HasExecutable, :env do
-      subject(:has_env) { HasExecutable.new(env, executable) }
+      subject(:test) { HasExecutable.new(env, executable) }
 
       it_behaves_like 'test'
 
@@ -12,7 +12,7 @@ module Producer::Core
           let(:executable) { 'true' }
 
           it 'returns true' do
-            expect(has_env.verify).to be true
+            expect(test.verify).to be true
           end
         end
 
@@ -20,7 +20,7 @@ module Producer::Core
           let(:executable) { 'some_non_existent_executable' }
 
           it 'returns false' do
-            expect(has_env.verify).to be false
+            expect(test.verify).to be false
           end
         end
       end