Merge branch 'develop'

# Conflicts:
#	lib/leap_cli/version.rb

1 files changed, 4 insertions, 3 deletions

diff --git a/test/unit/command_line_test.rb b/test/unit/command_line_test.rb
index 0b57ed0..393bcf2 100644
--- a/test/unit/command_line_test.rb
+++ b/test/unit/command_line_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require_relative 'test_helper'
 
 class CommandLineTest < Minitest::Test
 
@@ -13,7 +13,7 @@ class CommandLineTest < Minitest::Test
     with_multiple_rubies do
       output = leap_bin('list')
       assert_equal 0, $?, "list should exit 0"
-      assert output =~ /ns1   dns/m
+      assert output =~ /ns1  dns/m
     end
   end
 
@@ -21,7 +21,8 @@ class CommandLineTest < Minitest::Test
     cleanup_files('nodes/banana.json', 'files/nodes/banana')
     output = leap_bin("node add banana tags:production "+
       "services:openvpn ip_address:1.1.1.1 openvpn.gateway_address:2.2.2.2")
-    assert_match /created nodes\/banana\.json/, output
+    assert_match(/created nodes\/banana\.json/, output)
+    cleanup_files('nodes/banana.json', 'files/nodes/banana')
   end
 
 end