kontena-cli 1.1.6 → 1.2.0.dev1

data/spec/kontena/cli/services/secrets/link_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../../spec_helper"
 require "kontena/cli/grid_options"
 require "kontena/cli/services/secrets/link_command"
 
@@ -7,16 +6,6 @@ describe Kontena::Cli::Services::Secrets::LinkCommand do
   include ClientHelpers
 
   describe '#execute' do
-    it 'requires api url' do
-      expect(subject).to receive(:require_api_url).once
-      subject.run(['service', 'secret:name:env'])
-    end
-
-    it 'requires token' do
-      expect(subject).to receive(:require_token).and_return(token)
-      subject.run(['service', 'secret:name:env'])
-    end
-
     it 'requires service as param' do
       expect {
         subject.run([])

data/spec/kontena/cli/services/secrets/unlink_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../../spec_helper"
 require "kontena/cli/grid_options"
 require "kontena/cli/services/secrets/unlink_command"
 
@@ -7,16 +6,6 @@ describe Kontena::Cli::Services::Secrets::UnlinkCommand do
   include ClientHelpers
 
   describe '#execute' do
-    it 'requires api url' do
-      expect(subject).to receive(:require_api_url).once
-      subject.run(['service', 'secret:name:env'])
-    end
-
-    it 'requires token' do
-      expect(subject).to receive(:require_token).and_return(token)
-      subject.run(['service', 'secret:name:env'])
-    end
-
     it 'requires service as param' do
       expect {
         subject.run([])
@@ -41,7 +30,7 @@ describe Kontena::Cli::Services::Secrets::UnlinkCommand do
           {'secret' => 'BAR', 'name' => 'BAZ', 'type' => 'env'}
         ]
       }
-      allow(client).to receive(:get).with("services/test-grid/null/mymy").and_return(original)
+      expect(client).to receive(:get).with("services/test-grid/null/mymy").and_return(original)
       expect(client).to receive(:put).with("services/test-grid/null/mymy", data)
       subject.run(['mymy', 'FOO:BAR:env'])
     end

data/spec/kontena/cli/services/services_helper_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/services/services_helper"
 
 module Kontena::Cli::Services

data/spec/kontena/cli/services/unlink_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/services/unlink_command"
 
 describe Kontena::Cli::Services::UnlinkCommand do
@@ -6,34 +5,21 @@ describe Kontena::Cli::Services::UnlinkCommand do
   include ClientHelpers
 
   describe '#execute' do
-    before(:each) do
-      allow(client).to receive(:get).and_return({
-        'links' => [
-          {'alias' => 'service-b', 'id' => "test-grid/null/service-b", 'name' => 'service-b'}
-        ]
-      })
-    end
-
-    it 'requires api url' do
-      expect(subject).to receive(:require_api_url).once
-      subject.run(['service-a', 'service-b'])
-    end
-
-    it 'requires token' do
-      expect(subject).to receive(:require_token).and_return(token)
-      subject.run(['service-a', 'service-b'])
-    end
-
     it 'aborts if service is not linked' do
-      allow(client).to receive(:get).and_return({
+      expect(client).to receive(:get).with('services/test-grid/null/service-a').and_return({
         'links' => []
       })
       expect {
         subject.run(['service-a', 'service-b'])
-      }.to raise_error(SystemExit)
+      }.to exit_with_error
     end
 
     it 'sends link to master' do
+      expect(client).to receive(:get).with('services/test-grid/null/service-a').and_return({
+        'links' => [
+          {'alias' => 'service-b', 'id' => "test-grid/null/service-b", 'name' => 'service-b'}
+        ]
+      })
       expect(client).to receive(:put).with(
         'services/test-grid/null/service-a', {links: []}
       )

data/spec/kontena/cli/services/update_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/grid_options"
 require "kontena/cli/services/update_command"
 
@@ -8,20 +7,6 @@ describe Kontena::Cli::Services::UpdateCommand do
 
   describe '#execute' do
 
-    before(:each) do
-      allow(subject).to receive(:update_service).and_return({})
-    end
-
-    it 'requires api url' do
-      expect(subject).to receive(:require_api_url).once
-      subject.run(['service'])
-    end
-
-    it 'requires token' do
-      expect(subject).to receive(:require_token).once
-      subject.run(['service'])
-    end
-
     it 'sends update command' do
       expect(subject).to receive(:update_service).with(duck_type(:access_token), 'service', {privileged: false})
       subject.run(['service'])

data/spec/kontena/cli/stacks/build_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/stacks/build_command"
 
 describe Kontena::Cli::Stacks::BuildCommand do

data/spec/kontena/cli/stacks/deploy_command_spec.rb

@@ -1,29 +1,26 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/stacks/deploy_command"
 
 describe Kontena::Cli::Stacks::DeployCommand do
 
   include ClientHelpers
+  include RequirementsHelper
 
-  describe '#execute' do
-    before(:each) do
-      allow(subject).to receive(:wait_for_deploy_to_finish).and_return(spy)
-    end
+  expect_to_require_current_master
+  expect_to_require_current_master_token
 
-    it 'requires api url' do
-      expect(described_class.requires_current_master?).to be_truthy
-      subject.run(['test-stack'])
-    end
+  mock_current_master
 
-    it 'requires token' do
-      expect(described_class.requires_current_master_token?).to be_truthy
-      subject.run(['test-stack'])
+  describe '#execute' do
+    before(:each) do
+      allow(subject).to receive(:wait_for_deploy_to_finish).and_return(true)
+      allow(subject).to receive(:wait_for_deployment_to_start).and_return(true)
+      allow(subject).to receive(:wait_for_service_deploy).and_return(true)
     end
 
     it 'sends deploy command to master' do
       expect(client).to receive(:post).with(
         'stacks/test-grid/test-stack/deploy', {}
-      )
+      ).and_return({})
       subject.run(['test-stack'])
     end
   end

data/spec/kontena/cli/stacks/install_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/stacks/install_command"
 
 describe Kontena::Cli::Stacks::InstallCommand do
@@ -26,20 +25,6 @@ describe Kontena::Cli::Stacks::InstallCommand do
       allow(subject).to receive(:yaml_content).and_return("YAML content")
     end
 
-    it 'requires api url' do
-      allow(File).to receive(:exist?).with('kontena.yml').and_return(true)
-      allow(subject).to receive(:stack_from_yaml).with('kontena.yml', hash_including(name: nil, values: nil)).and_return(stack)
-      expect(described_class.requires_current_master?).to be_truthy
-      subject.run([])
-    end
-
-    it 'requires token' do
-      allow(File).to receive(:exist?).with('kontena.yml').and_return(true)
-      allow(subject).to receive(:stack_from_yaml).with('kontena.yml', hash_including(name: nil, values: nil)).and_return(stack)
-      expect(described_class.requires_current_master_token?).to be_truthy
-      subject.run([])
-    end
-
     it 'sends stack to master' do
       allow(File).to receive(:exist?).with('kontena.yml').and_return(true)
       allow(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)

data/spec/kontena/cli/stacks/list_command_spec.rb

@@ -1,19 +1,13 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/stacks/list_command"
 
 describe Kontena::Cli::Stacks::ListCommand do
-
   include ClientHelpers
+  include RequirementsHelper
 
-  describe '#execute' do
-    it 'requires api url' do
-      expect(subject.class.requires_current_master).to be_truthy
-    end
-
-    it 'requires token' do
-      expect(subject.class.requires_current_master_token).to be_truthy
-    end
+  expect_to_require_current_master
+  expect_to_require_current_master_token
 
+  describe '#execute' do
     it 'fetches stacks from master' do
       stacks = {
         'stacks' => []

data/spec/kontena/cli/stacks/remove_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/stacks/remove_command"
 
 describe Kontena::Cli::Stacks::RemoveCommand do
@@ -6,20 +5,6 @@ describe Kontena::Cli::Stacks::RemoveCommand do
   include ClientHelpers
 
   describe '#execute' do
-    it 'requires api url' do
-      allow(subject).to receive(:forced?).and_return(true)
-      allow(subject).to receive(:wait_stack_removal)
-      expect(described_class.requires_current_master?).to be_truthy
-      subject.run(['test-stack'])
-    end
-
-    it 'requires token' do
-      allow(subject).to receive(:forced?).and_return(true)
-      allow(subject).to receive(:wait_stack_removal)
-      expect(described_class.requires_current_master_token?).to be_truthy
-      subject.run(['test-stack'])
-    end
-
     it 'sends remove command to master' do
       allow(subject).to receive(:wait_stack_removal)
       expect(client).to receive(:delete).with('stacks/test-grid/test-stack')
@@ -39,7 +24,7 @@ describe Kontena::Cli::Stacks::RemoveCommand do
         .and_raise(Kontena::Errors::StandardError.new(500, 'internal error'))
       expect{
         subject.run(['--force', 'test-stack'])
-      }.to raise_error(Kontena::Errors::StandardError)
+      }.to exit_with_error
     end
   end
 end

data/spec/kontena/cli/stacks/service_generator_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/stacks/service_generator"
 
 describe Kontena::Cli::Stacks::ServiceGenerator do

data/spec/kontena/cli/stacks/service_generator_v2_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/stacks/service_generator_v2"
 require 'ruby_dig'
 

data/spec/kontena/cli/stacks/show_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/stacks/show_command"
 
 describe Kontena::Cli::Stacks::ShowCommand do
@@ -6,20 +5,8 @@ describe Kontena::Cli::Stacks::ShowCommand do
   include ClientHelpers
 
   describe '#execute' do
-    it 'requires api url' do
-      allow(subject).to receive(:forced?).and_return(true)
-      expect(described_class.requires_current_master?).to be_truthy
-      subject.run(['test-stack'])
-    end
-
-    it 'requires token' do
-      allow(subject).to receive(:forced?).and_return(true)
-      expect(described_class.requires_current_master_token?).to be_truthy
-      subject.run(['test-stack'])
-    end
-
     it 'fetches stack info from master' do
-      expect(client).to receive(:get).with('stacks/test-grid/test-stack')
+      expect(client).to receive(:get).with('stacks/test-grid/test-stack').and_return(spy())
       subject.run(['test-stack'])
     end
   end

data/spec/kontena/cli/stacks/upgrade_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/stacks/upgrade_command"
 
 describe Kontena::Cli::Stacks::UpgradeCommand do
@@ -13,6 +12,15 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
     let(:stack) do
       {
         'name' => 'stack-a',
+        'stack' => 'foo/stack-a',
+        'services' => []
+      }
+    end
+
+    let(:stack_with_different_stack_name) do
+      {
+        'name' => 'stack-a',
+        'stack' => 'foo/stack-z',
         'services' => []
       }
     end
@@ -24,6 +32,7 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
     let(:stack_response) do
       {
         'name' => 'stack-a',
+        'stack' => 'foo/stack-a',
         'services' => [],
         'variables' => defaults
       }
@@ -39,6 +48,7 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
     it 'uses kontena.yml as default stack file' do
       expect(client).to receive(:get).with('stacks/test-grid/stack-name').and_return(stack_response)
       expect(subject).to receive(:stack_from_yaml).with('kontena.yml', name: 'stack-name', values: nil, defaults: defaults).and_return(stack)
+      expect(client).to receive(:put).with('stacks/test-grid/stack-name', stack)
       subject.run(['stack-name'])
     end
 
@@ -64,6 +74,14 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
       subject.run(['stack-b',  './path/to/kontena.yml'])
     end
 
+    it 'requires confirmation when master stack is different than input stack' do
+      expect(client).to receive(:get).with('stacks/test-grid/stack-b').and_return(stack_response)
+      allow(subject).to receive(:require_config_file).with('./path/to/kontena.yml').and_return(true)
+      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-b', values: nil, defaults: defaults).and_return(stack_with_different_stack_name)
+      expect(subject).to receive(:confirm).and_call_original
+      expect{subject.run(['stack-b',  './path/to/kontena.yml'])}.to exit_with_error
+    end
+
     it 'triggers deploy by default' do
       expect(client).to receive(:get).with('stacks/test-grid/stack-a').and_return(stack_response)
       allow(subject).to receive(:require_config_file).with('./path/to/kontena.yml').and_return(true)

data/spec/kontena/cli/stacks/yaml/reader_spec.rb

@@ -1,18 +1,9 @@
-require_relative '../../../../spec_helper'
 require 'kontena/cli/stacks/yaml/reader'
 require 'liquid'
 
 describe Kontena::Cli::Stacks::YAML::Reader do
   include FixturesHelpers
 
-  def absolute_yaml_path(file = 'kontena_v3.yml')
-    "#{Dir.pwd}/#{file}"
-  end
-
-  let(:subject) do
-    described_class.new('kontena_v3.yml')
-  end
-
   let(:service_extender) do
     spy
   end
@@ -49,30 +40,30 @@ describe Kontena::Cli::Stacks::YAML::Reader do
   end
 
   before(:each) do
-    allow(File).to receive(:read)
-      .with(absolute_yaml_path('docker-compose_v2.yml'))
-      .and_return(fixture('docker-compose_v2.yml'))
-    allow(File).to receive(:read)
-      .with(absolute_yaml_path('kontena_v3.yml'))
-      .and_return(fixture('kontena_v3.yml'))
     allow_any_instance_of(described_class).to receive(:env)
       .and_return( { 'STACK' => 'test', 'GRID' => 'test-grid' } )
   end
 
   describe '#initialize' do
+    subject do
+      described_class.new(fixture_path('kontena_v3.yml'))
+    end
+
     it 'reads given file' do
       expect(File).to receive(:read)
-        .with(absolute_yaml_path)
+        .with(fixture_path('kontena_v3.yml'))
         .and_return(fixture('kontena_v3.yml'))
+
       subject
     end
   end
 
   context 'when yaml file is malformed' do
+    subject do
+      described_class.new(fixture_path('kontena-malformed-yaml.yml'))
+    end
+
     it 'exits the execution' do
-      allow(File).to receive(:read)
-        .with(absolute_yaml_path)
-        .and_return(fixture('kontena-malformed-yaml.yml'))
       expect {
         subject.execute
       }.to raise_error(StandardError)
@@ -80,17 +71,21 @@ describe Kontena::Cli::Stacks::YAML::Reader do
   end
 
   context 'when service config is not hash' do
-    it 'returns error' do
-      allow(File).to receive(:read)
-        .with(absolute_yaml_path)
-        .and_return(fixture('kontena-not-hash-service-config.yml'))
+    subject do
+      described_class.new(fixture_path('kontena-not-hash-service-config.yml'))
+    end
 
+    it 'returns error' do
       outcome = subject.execute
       expect(outcome[:errors].size).to eq(1)
     end
   end
 
   describe '#execute' do
+    subject do
+      described_class.new(fixture_path('kontena_v3.yml'))
+    end
+
     context 'when extending services' do
       it 'extends services from external file' do
         docker_compose_yml = YAML.load(fixture('docker-compose_v2.yml'))
@@ -127,9 +122,8 @@ describe Kontena::Cli::Stacks::YAML::Reader do
       end
 
       it 'extends services from the same file' do
-        expect(File).to receive(:read)
-          .with(absolute_yaml_path('kontena_v3.yml'))
-          .and_return(fixture('stack-internal-extend.yml'))
+        subject = described_class.new(fixture_path('stack-internal-extend.yml'))
+
         kontena_yml = YAML.load(fixture('stack-internal-extend.yml'))
 
         expect(Kontena::Cli::Stacks::YAML::ServiceExtender).to receive(:new)
@@ -142,7 +136,10 @@ describe Kontena::Cli::Stacks::YAML::Reader do
 
       it 'merges validation errors' do
         allow(File).to receive(:read)
-          .with(absolute_yaml_path('docker-compose_v2.yml'))
+          .with(fixture_path('kontena_v3.yml'))
+          .and_return(fixture('kontena_v3.yml'))
+        allow(File).to receive(:read)
+          .with(fixture_path('docker-compose_v2.yml'))
           .and_return(fixture('docker-compose-invalid.yml'))
         outcome = subject.execute
         expect(outcome[:errors]).to eq([{
@@ -159,7 +156,18 @@ describe Kontena::Cli::Stacks::YAML::Reader do
     end
 
     context 'variable interpolation' do
+      subject do
+        described_class.new(fixture_path('stack-with-variables.yml'))
+      end
+
       before(:each) do
+        allow(File).to receive(:read)
+          .with(fixture_path('docker-compose_v2.yml'))
+          .and_return(fixture('docker-compose_v2.yml'))
+        allow(File).to receive(:read)
+          .with(fixture_path('stack-with-variables.yml'))
+          .and_return(fixture('stack-with-variables.yml'))
+
         allow_any_instance_of(described_class).to receive(:env).and_return(
           {
             'STACK' => 'test',
@@ -167,32 +175,24 @@ describe Kontena::Cli::Stacks::YAML::Reader do
             'TAG' => '4.1'
           }
         )
+        allow(ENV).to receive(:[]).with('TAG').and_return('4.1')
         allow(ENV).to receive(:[]).with('TEST_ENV_VAR').and_return('foo')
         allow(ENV).to receive(:[]).with('MYSQL_IMAGE').and_return('mariadb:latest')
       end
 
       it 'interpolates $VAR variables' do
-        allow(File).to receive(:read)
-          .with(absolute_yaml_path)
-          .and_return(fixture('stack-with-variables.yml'))
         result = subject.execute
         services = result[:services]
         expect(services['wordpress']['image']).to eq('wordpress:4.1')
       end
 
       it 'interpolates ${VAR} variables' do
-        allow(File).to receive(:read)
-          .with(absolute_yaml_path)
-          .and_return(fixture('stack-with-variables.yml'))
         result = subject.execute
         services = result[:services]
         expect(services['mysql']['image']).to eq('mariadb:latest')
       end
 
       it 'warns about empty variables' do
-        allow(File).to receive(:read)
-          .with(absolute_yaml_path)
-          .and_return(fixture('stack-with-variables.yml'))
         allow(ENV).to receive(:[])
           .with('MYSQL_IMAGE')
           .and_return('')
@@ -204,52 +204,48 @@ describe Kontena::Cli::Stacks::YAML::Reader do
           subject.execute
         }.to output("Value for MYSQL_IMAGE is not set. Substituting with an empty string.\n").to_stdout
       end
-    end
 
-    it 'replaces $$VAR variables to $VAR format' do
-      allow_any_instance_of(described_class).to receive(:env).and_return(
-        {
-          'STACK' => 'test',
-          'GRID' => 'test-grid'
-        }
-      )
-      allow(ENV).to receive(:[]).with('TAG').and_return('4.1')
-      allow(ENV).to receive(:[]).with('TEST_ENV_VAR').and_return('foo')
-      allow(ENV).to receive(:[]).with('MYSQL_IMAGE').and_return('foo')
-      allow(File).to receive(:read)
-        .with(absolute_yaml_path)
-        .and_return(fixture('stack-with-variables.yml'))
-      allow(File).to receive(:read)
-        .with(absolute_yaml_path('docker-compose_v2.yml'))
-        .and_return(fixture('docker-compose_v2.yml'))
-      services = subject.execute[:services]
-      expect(services['mysql']['environment'].first).to eq('INTERNAL_VAR=$INTERNAL_VAR')
+      it 'replaces $$VAR variables to $VAR format' do
+        allow_any_instance_of(described_class).to receive(:env).and_return(
+          {
+            'STACK' => 'test',
+            'GRID' => 'test-grid'
+          }
+        )
+        allow(ENV).to receive(:[]).with('TAG').and_return('4.1')
+        allow(ENV).to receive(:[]).with('TEST_ENV_VAR').and_return('foo')
+        allow(ENV).to receive(:[]).with('MYSQL_IMAGE').and_return('foo')
+        services = subject.execute[:services]
+        expect(services['mysql']['environment'].first).to eq('INTERNAL_VAR=$INTERNAL_VAR')
+      end
     end
 
     context 'environment variables' do
-      it 'converts env hash to array' do
-        result = subject.execute[:services]
-        expect(result['wordpress']['environment']).to eq(['WORDPRESS_DB_PASSWORD=test_secret'])
+      subject do
+        described_class.new(fixture_path('stack-with-env-file.yml'))
       end
 
-      it 'does nothing to env array' do
-        result = subject.execute[:services]
-        expect(result['mysql']['environment']).to eq(['MYSQL_ROOT_PASSWORD=test_secret'])
+      context "with an empty env file" do
+        before(:each) do
+          allow(File).to receive(:readlines).with('.env').and_return([])
+        end
+
+        it 'converts env hash to array' do
+          result = subject.execute[:services]
+          expect(result['wordpress']['environment']).to eq(['WORDPRESS_DB_PASSWORD=test_secret'])
+        end
+
+        it 'does nothing to env array' do
+          result = subject.execute[:services]
+          expect(result['mysql']['environment']).to eq(['MYSQL_ROOT_PASSWORD=test_secret'])
+        end
       end
 
       context 'when introduced env_file' do
         before(:each) do
-          allow(File).to receive(:read)
-            .with(absolute_yaml_path('kontena_v3.yml'))
-            .and_return(fixture('stack-with-env-file.yml'))
           allow(File).to receive(:readlines).with('.env').and_return(env_file)
         end
 
-        it 'reads given file' do
-          expect(File).to receive(:readlines).with('.env').and_return(env_file)
-          subject.send(:read_env_file, '.env')
-        end
-
         it 'discards comment lines' do
           result = env_file
           result << "#COMMENTLINE"
@@ -294,42 +290,47 @@ describe Kontena::Cli::Stacks::YAML::Reader do
       expect(outcome[:services]).to eq(valid_v3_result['services'])
     end
 
-    it 'returns validation errors' do
-      allow(File).to receive(:read)
-        .with(absolute_yaml_path('kontena_v3.yml'))
-        .and_return(fixture('stack-invalid.yml'))
-      outcome = subject.execute
-      expect(outcome[:errors].size).to eq(1)
+    context "For an invalid stack file" do
+      subject do
+        described_class.new(fixture_path('stack-invalid.yml'))
+      end
+
+      it 'returns validation errors' do
+        outcome = subject.execute
+        expect(outcome[:errors].size).to eq(1)
+      end
     end
   end
 
   context 'when build option is string' do
+    subject do
+      described_class.new(fixture_path('kontena_build_v3.yml'))
+    end
+
     it 'expands build option to absolute path' do
-      allow(File).to receive(:read)
-        .with(absolute_yaml_path)
-        .and_return(fixture('kontena_build_v3.yml'))
       outcome = subject.execute
-      expect(outcome[:services]['webapp']['build']['context']).to eq(File.expand_path('.'))
+      expect(outcome[:services]['webapp']['build']['context']).to eq(fixture_path(''))
     end
   end
 
   context 'when build option is Hash' do
+    subject do
+      described_class.new(fixture_path('kontena_build_v3.yml'))
+    end
+
     it 'expands build context to absolute path' do
-      allow(File).to receive(:read)
-        .with(absolute_yaml_path)
-        .and_return(fixture('kontena_build_v3.yml'))
       outcome = subject.execute
-      expect(outcome[:services]['webapp']['build']['context']).to eq(File.expand_path('.'))
+      expect(outcome[:services]['webapp']['build']['context']).to eq(fixture_path(''))
     end
   end
 
   context 'normalize_build_args' do
+    subject do
+      described_class.new(fixture_path('kontena_build_v3.yml'))
+    end
+
     context 'when build option is string' do
       it 'skips normalizing' do
-        allow(File).to receive(:read)
-          .with(absolute_yaml_path)
-          .and_return(fixture('kontena_build_v3.yml'))
-
         options = {
           'build' => '.'
         }
@@ -341,10 +342,6 @@ describe Kontena::Cli::Stacks::YAML::Reader do
 
     context 'when build arguments option is Hash' do
       it 'does not do anything' do
-        allow(File).to receive(:read)
-          .with(absolute_yaml_path)
-          .and_return(fixture('kontena_build_v3.yml'))
-
         options = {
           'build' => {
             'context' => '.',
@@ -363,10 +360,6 @@ describe Kontena::Cli::Stacks::YAML::Reader do
 
     context 'when build arguments option is Array' do
       it 'converts it to array' do
-        allow(File).to receive(:read)
-          .with(absolute_yaml_path)
-          .and_return(fixture('kontena_build_v3.yml'))
-
         options = {
           'build' => {
             'context' => '.',
@@ -383,25 +376,39 @@ describe Kontena::Cli::Stacks::YAML::Reader do
   end
 
   describe '#stack_name' do
+    subject do
+      described_class.new(fixture_path('kontena_v3.yml'))
+    end
+
     it 'returns name for v3' do
-      allow(File).to receive(:read)
-        .with(absolute_yaml_path)
-        .and_return(fixture('kontena_v3.yml'))
       name = subject.stack_name
       expect(name).to eq('stackname')
     end
   end
 
   context 'origins' do
+    before do
+      allow(File).to receive(:read)
+        .with(fixture_path('kontena_v3.yml'))
+        .and_return(fixture('kontena_v3.yml'))
+    end
+
     it 'can read from a file' do
-      expect(File).to receive(:read)
-        .with(absolute_yaml_path('kontena_v3.yml'))
-        .and_return(fixture('stack-with-liquid.yml'))
+      allow(File).to receive(:read)
+        .with(fixture_path('docker-compose_v2.yml'))
+        .and_return(fixture('docker-compose-invalid.yml'))
+
+      subject = described_class.new(fixture_path('kontena_v3.yml'))
+
       expect(subject.from_file?).to be_truthy
       expect(subject.execute[:registry]).to eq 'file://'
     end
 
     it 'can read from the registry' do
+      allow(File).to receive(:read)
+        .with(File.expand_path('docker-compose_v2.yml'))
+        .and_return(fixture('docker-compose-invalid.yml'))
+
       stack_double = double
       allow_any_instance_of(Kontena::StacksCache::RegistryClientFactory).to receive(:cloud_auth?).and_return(true)
       expect(Kontena::StacksCache).to receive(:cache).with('foo/foo', nil).and_return(stack_double)
@@ -412,6 +419,10 @@ describe Kontena::Cli::Stacks::YAML::Reader do
     end
 
     it 'can read from an url' do
+      allow(File).to receive(:read)
+        .with(File.expand_path('docker-compose_v2.yml'))
+        .and_return(fixture('docker-compose-invalid.yml'))
+
       stub_request(:get, "http://foo.example.com/foo").to_return(:status => 200, :body => fixture('stack-with-liquid.yml'), :headers => {})
       allow_any_instance_of(described_class).to receive(:load_from_url).and_return(fixture('stack-with-liquid.yml'))
       instance = described_class.new('http://foo.example.com/foo')
@@ -420,21 +431,10 @@ describe Kontena::Cli::Stacks::YAML::Reader do
     end
   end
 
-  context 'liquid' do
-    context 'valid' do
-      before(:each) do
-        allow(File).to receive(:read)
-          .with(absolute_yaml_path('kontena_v3.yml'))
-          .and_return(fixture('stack-with-liquid.yml'))
-        allow_any_instance_of(described_class).to receive(:env).and_return(
-          {
-            'STACK' => 'test',
-            'GRID' => 'test-grid',
-            'TAG' => '4.1',
-            'MYSQL_IMAGE' => 'mariadb:latest'
-          }
-        )
-        allow(ENV).to receive(:[]).with('TEST_ENV_VAR').and_return('foo')
+  context "using Liquid templates" do
+    context "for a valid stack file" do
+      subject do
+        described_class.new(fixture_path('stack-with-liquid.yml'))
       end
 
       it 'does not interpolate liquid into variables' do
@@ -446,20 +446,9 @@ describe Kontena::Cli::Stacks::YAML::Reader do
       end
     end
 
-    context 'invalid' do
-      before(:each) do
-        allow(File).to receive(:read)
-          .with(absolute_yaml_path('kontena_v3.yml'))
-          .and_return(fixture('stack-with-invalid-liquid.yml'))
-        allow_any_instance_of(described_class).to receive(:env).and_return(
-          {
-            'STACK' => 'test',
-            'GRID' => 'test-grid',
-            'TAG' => '4.1',
-            'MYSQL_IMAGE' => 'mariadb:latest'
-          }
-        )
-        allow(ENV).to receive(:[]).with('TEST_ENV_VAR').and_return('foo')
+    context "for invalid Liquid syntax" do
+      subject do
+        described_class.new(fixture_path('stack-with-invalid-liquid.yml'))
       end
 
       it 'raises' do
@@ -467,4 +456,48 @@ describe Kontena::Cli::Stacks::YAML::Reader do
       end
     end
   end
+
+  context "for an undefined variable" do
+    subject do
+      described_class.new(fixture_path('stack-with-liquid-undefined.yml'))
+    end
+
+    it "raises an undefined variable error" do
+      expect{subject.execute}.to raise_error(Liquid::UndefinedVariable, /undefined variable asdflol/)
+    end
+  end
+
+  context "for an optional variable that is not defined" do
+    subject do
+      described_class.new(fixture_path('stack-with-liquid-optional.yml'))
+    end
+
+    before do
+      allow(ENV).to receive(:[]).with('asdf').and_return(nil)
+    end
+
+    it "omits the env" do
+      outcome = subject.execute
+
+      expect(outcome[:variables]).to eq('asdf' => nil), subject.variables.inspect
+      expect(outcome[:services]['test']['environment']).to eq nil
+    end
+  end
+
+  context "for an optional variable that is defined" do
+    subject do
+      described_class.new(fixture_path('stack-with-liquid-optional.yml'))
+    end
+
+    before do
+      allow(ENV).to receive(:[]).with('asdf').and_return('test')
+    end
+
+    it "defines the env" do
+      outcome = subject.execute
+
+      expect(outcome[:variables]).to eq 'asdf' => 'test'
+      expect(outcome[:services]['test']['environment']).to eq ['ASDF=test']
+    end
+  end
 end