aruba 0.14.2 → 0.14.3

data/spec/aruba/api/filesystem/file_size_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe 'Filesystem Api' do
 
     context 'when file does not exist' do
       let(:name) { 'non_existing_file' }
-      it { expect { size }.to raise_error }
+      it { expect { size }.to raise_error RSpec::Expectations::ExpectationNotMetError }
     end
   end
 end

data/spec/aruba/api_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'securerandom'
 require 'aruba/api'
 require 'fileutils'
 
@@ -748,33 +747,7 @@ describe Aruba::Api do
       end
     end
 
-    context '#check_file_size' do
-      it "should check an existing file size" do
-        @aruba.write_fixed_size_file(@file_name, @file_size)
-        @aruba.check_file_size([[@file_name, @file_size]])
-      end
-
-      it "should check an existing file size and fail" do
-        @aruba.write_fixed_size_file(@file_name, @file_size)
-        expect { @aruba.check_file_size([[@file_name, @file_size + 1]]) }.to raise_error
-      end
-
-      it "works with ~ in path name" do
-        file_path = File.join('~', random_string)
-
-        @aruba.with_environment 'HOME' => File.expand_path(aruba.current_directory) do
-          @aruba.write_fixed_size_file(file_path, @file_size)
-          @aruba.check_file_size([[file_path, @file_size]])
-        end
-      end
-
-      it "should check an existing file size and fail" do
-        @aruba.write_fixed_size_file(@file_name, @file_size)
-        expect { @aruba.check_file_size([[@file_name, @file_size + 1]]) }.to raise_error
-      end
-    end
-
-    describe '#filesystem_permissions' do
+    describe '#chmod' do
       def actual_permissions
         format( "%o" , File::Stat.new(file_path).mode )[-4,4]
       end
@@ -792,7 +765,7 @@ describe Aruba::Api do
       end
 
       before(:each) do
-        @aruba.filesystem_permissions(permissions, file_name)
+        @aruba.chmod(permissions, file_name)
       end
 
       context 'when file exists' do
@@ -815,205 +788,6 @@ describe Aruba::Api do
       end
     end
 
-    describe '#check_filesystem_permissions' do
-      let(:file_name) { @file_name }
-      let(:file_path) { @file_path }
-
-      let(:permissions) { '0655' }
-
-      before :each do
-        @aruba.set_environment_variable 'HOME', File.expand_path(@aruba.aruba.current_directory)
-      end
-
-      before(:each) do
-        File.open(file_path, 'w') { |f| f << "" }
-      end
-
-      before(:each) do
-        @aruba.filesystem_permissions(permissions, file_name)
-      end
-
-      context 'when file exists' do
-        context 'and should have permissions' do
-          context 'and permissions are given as string' do
-            it { @aruba.check_filesystem_permissions(permissions, file_name, true) }
-          end
-
-          context 'and permissions are given as octal number' do
-            let(:permissions) { 0666 }
-
-            it { @aruba.check_filesystem_permissions(permissions, file_name, true) }
-          end
-
-          context 'and path includes ~' do
-            let(:string) { random_string }
-            let(:file_name) { File.join('~', string) }
-            let(:file_path) { File.join(@aruba.aruba.current_directory, string) }
-
-            it { @aruba.check_filesystem_permissions(permissions, file_name, true) }
-          end
-
-          context 'but fails because the permissions are different' do
-            let(:expected_permissions) { 0666 }
-
-            it { expect { @aruba.check_filesystem_permissions(expected_permissions, file_name, true) }.to raise_error }
-          end
-        end
-
-        context 'and should not have permissions' do
-          context 'and succeeds when the difference is expected and permissions are different' do
-            let(:different_permissions) { 0666 }
-
-            it { @aruba.check_filesystem_permissions(different_permissions, file_name, false) }
-          end
-
-          context 'and fails because the permissions are the same although they should be different' do
-            let(:different_permissions) { 0655 }
-
-            it { expect { @aruba.check_filesystem_permissions(different_permissions, file_name, false) }.to raise_error }
-          end
-        end
-      end
-    end
-
-    context '#check_file_presence' do
-      before(:each) { File.open(@file_path, 'w') { |f| f << "" } }
-
-      it "should check existence using plain match" do
-        file_name = 'nested/dir/hello_world.txt'
-        file_path = File.join(@aruba.aruba.current_directory, file_name)
-
-        Aruba.platform.mkdir(File.dirname(file_path))
-        File.open(file_path, 'w') { |f| f << "" }
-
-        @aruba.check_file_presence(file_name)
-        @aruba.check_file_presence([file_name])
-        @aruba.check_file_presence([file_name], true)
-        @aruba.check_file_presence(['asdf'], false)
-      end
-
-      it "should check existence using regex" do
-        file_name = 'nested/dir/hello_world.txt'
-        file_path = File.join(@aruba.aruba.current_directory, file_name)
-
-        Aruba.platform.mkdir(File.dirname(file_path))
-        File.open(file_path, 'w') { |f| f << "" }
-
-        @aruba.check_file_presence([ /test123/ ], false )
-        @aruba.check_file_presence([ /hello_world.txt$/ ], true )
-        @aruba.check_file_presence([ /dir/ ], true )
-        @aruba.check_file_presence([ %r{nested/.+/} ], true )
-      end
-
-      it "is no problem to mix both" do
-        file_name = 'nested/dir/hello_world.txt'
-        file_path = File.join(@aruba.aruba.current_directory, file_name)
-
-        Aruba.platform.mkdir(File.dirname(file_path))
-        File.open(file_path, 'w') { |f| f << "" }
-
-        @aruba.check_file_presence([ file_name, /nested/  ], true )
-        @aruba.check_file_presence([ /test123/, 'asdf' ], false )
-      end
-
-      it "works with ~ in path name" do
-        file_path = File.join('~', random_string)
-
-        @aruba.with_environment 'HOME' => File.expand_path(@aruba.aruba.current_directory) do
-          Aruba.platform.mkdir(File.dirname(File.expand_path(file_path)))
-          File.open(File.expand_path(file_path), 'w') { |f| f << "" }
-
-          @aruba.check_file_presence( [ file_path ], true )
-        end
-      end
-    end
-
-    context "check file content" do
-      before :example do
-        @aruba.write_file(@file_name, "foo bar baz")
-      end
-
-      describe "#check_binary_file_content" do
-        let(:file_name) { @file_name }
-        let(:file_path) { @file_path }
-
-        let(:reference_file) { 'fixture' }
-        let(:reference_file_content) { 'foo bar baz' }
-
-        before :each do
-          @aruba.write_file(reference_file, reference_file_content)
-        end
-
-        context 'when files are the same' do
-          context 'and this is expected' do
-            it { @aruba.check_binary_file_content(file_name, reference_file) }
-            it { @aruba.check_binary_file_content(file_name, reference_file, true) }
-          end
-
-          context 'and this is not expected' do
-            it { expect { @aruba.check_binary_file_content(file_name, reference_file, false) }.to raise_error }
-          end
-        end
-
-        context 'when files are not the same' do
-          let(:reference_file_content) { 'bar' }
-
-          context 'and this is expected' do
-            it { @aruba.check_binary_file_content(file_name, reference_file, false) }
-          end
-
-          context 'and this is not expected' do
-            it { expect { @aruba.check_binary_file_content(file_name, reference_file, true) }.to raise_error }
-          end
-        end
-      end
-
-      context "#check_file_content" do
-        context "with regexp" do
-          let(:matching_content){/bar/}
-          let(:non_matching_content){/nothing/}
-          it "succeeds if file content matches" do
-            @aruba.check_file_content(@file_name, matching_content)
-            @aruba.check_file_content(@file_name, matching_content, true)
-          end
-
-          it "succeeds if file content does not match" do
-            @aruba.check_file_content(@file_name, non_matching_content, false)
-          end
-
-          it "works with ~ in path name" do
-            file_path = File.join('~', random_string)
-
-            @aruba.with_environment 'HOME' => File.expand_path(aruba.current_directory) do
-              @aruba.write_file(file_path, "foo bar baz")
-              @aruba.check_file_content(file_path, non_matching_content, false)
-            end
-          end
-        end
-        context "with string" do
-          let(:matching_content){"foo bar baz"}
-          let(:non_matching_content){"bar"}
-          it "succeeds if file content matches" do
-            @aruba.check_file_content(@file_name, matching_content)
-            @aruba.check_file_content(@file_name, matching_content, true)
-          end
-
-          it "succeeds if file content does not match" do
-            @aruba.check_file_content(@file_name, non_matching_content, false)
-          end
-
-          it "works with ~ in path name" do
-            file_path = File.join('~', random_string)
-
-            @aruba.with_environment 'HOME' => File.expand_path(aruba.current_directory) do
-              @aruba.write_file(file_path, "foo bar baz")
-              @aruba.check_file_content(file_path, non_matching_content, false)
-            end
-          end
-        end
-      end
-    end
-
     context "#with_file_content" do
       before :each do
         @aruba.write_file(@file_name, "foo bar baz")
@@ -1087,7 +861,7 @@ describe Aruba::Api do
 
         it "should announce to stdout exactly once" do
           @aruba.run_simple('echo "hello world"', false)
-          expect(@aruba.all_output).to include('hello world')
+          expect(@aruba.last_command_started.output).to include('hello world')
         end
       end
 
@@ -1098,26 +872,12 @@ describe Aruba::Api do
           end
 
           expect(result).not_to include('hello world')
-          expect(@aruba.all_output).to include('hello world')
+          expect(@aruba.last_command_started.output).to include('hello world')
         end
       end
     end
   end
 
-  describe "#assert_not_matching_output" do
-    before(:each){ @aruba.run_simple("echo foo", false) }
-    after(:each) { @aruba.all_commands.each(&:stop) }
-
-    it "passes when the output doesn't match a regexp" do
-      @aruba.assert_not_matching_output "bar", @aruba.all_output
-    end
-    it "fails when the output does match a regexp" do
-      expect do
-        @aruba.assert_not_matching_output "foo", @aruba.all_output
-      end . to raise_error RSpec::Expectations::ExpectationNotMetError
-    end
-  end
-
   describe '#run' do
     before(:each){ @aruba.run 'cat' }
     after(:each) { @aruba.all_commands.each(&:stop) }
@@ -1125,34 +885,20 @@ describe Aruba::Api do
     it "respond to input" do
       @aruba.type "Hello"
       @aruba.type ""
-      expect(@aruba.all_output).to eq "Hello\n"
+      expect(@aruba.last_command_started).to have_output "Hello"
     end
 
     it "respond to close_input" do
       @aruba.type "Hello"
       @aruba.close_input
-      expect(@aruba.all_output).to eq "Hello\n"
+      expect(@aruba.last_command_started).to have_output "Hello"
     end
 
     it "pipes data" do
       @aruba.write_file(@file_name, "Hello\nWorld!")
       @aruba.pipe_in_file(@file_name)
       @aruba.close_input
-      expect(@aruba.all_output).to eq "Hello\nWorld!"
-    end
-  end
-
-  describe "#run_simple" do
-    before(:each){@aruba.run_simple "true"}
-    after(:each) { @aruba.all_commands.each(&:stop) }
-    describe "get_process" do
-      it "returns a process" do
-        expect(@aruba.get_process("true")).not_to be(nil)
-      end
-
-      it "raises a descriptive exception" do
-        expect { @aruba.get_process("false") }.to raise_error CommandNotFoundError, "No command named 'false' has been started"
-      end
+      expect(@aruba.last_command_started).to have_output "Hello\nWorld!"
     end
   end
 
@@ -1173,37 +919,21 @@ describe Aruba::Api do
   describe "#set_environment_variable" do
     after(:each) do
       @aruba.all_commands.each(&:stop)
-      @aruba.restore_env
     end
 
     it "set environment variable" do
-      @aruba.set_env 'LONG_LONG_ENV_VARIABLE', 'true'
-      @aruba.run "env"
-      expect(@aruba.all_output).to include("LONG_LONG_ENV_VARIABLE=true")
+      @aruba.set_environment_variable 'LONG_LONG_ENV_VARIABLE', 'true'
+      @aruba.run_simple "env"
+      expect(@aruba.last_command_started.output).
+        to include("LONG_LONG_ENV_VARIABLE=true")
     end
 
     it "overwrites environment variable" do
-      @aruba.set_env 'LONG_LONG_ENV_VARIABLE', 'true'
-      @aruba.set_env 'LONG_LONG_ENV_VARIABLE', 'false'
-      @aruba.run "env"
-      expect(@aruba.all_output).to include("LONG_LONG_ENV_VARIABLE=false")
-    end
-  end
-
-  describe "#restore_env" do
-    after(:each) { @aruba.all_commands.each(&:stop) }
-    it "restores environment variable" do
-      @aruba.set_env 'LONG_LONG_ENV_VARIABLE', 'true'
-      @aruba.restore_env
-      @aruba.run "env"
-      expect(@aruba.all_output).not_to include("LONG_LONG_ENV_VARIABLE")
-    end
-    it "restores environment variable that has been set multiple times" do
-      @aruba.set_env 'LONG_LONG_ENV_VARIABLE', 'true'
-      @aruba.set_env 'LONG_LONG_ENV_VARIABLE', 'false'
-      @aruba.restore_env
-      @aruba.run "env"
-      expect(@aruba.all_output).not_to include("LONG_LONG_ENV_VARIABLE")
+      @aruba.set_environment_variable 'LONG_LONG_ENV_VARIABLE', 'true'
+      @aruba.set_environment_variable 'LONG_LONG_ENV_VARIABLE', 'false'
+      @aruba.run_simple "env"
+      expect(@aruba.last_command_started.output).
+        to include("LONG_LONG_ENV_VARIABLE=false")
     end
   end
 end # Aruba::Api

data/spec/aruba/matchers/command_spec.rb

@@ -81,7 +81,7 @@ RSpec.describe 'Command Matchers' do
         File.open(expand_path('cmd.sh'), 'w') { |f| f.puts string }
 
         File.chmod 0755, expand_path('cmd.sh')
-        prepend_environment_variable 'PATH', "#{expand_path('.')}:"
+        prepend_environment_variable 'PATH', "#{expand_path('.')}#{File::PATH_SEPARATOR}"
       end
 
       let(:cmd) { "cmd.sh #{output}" }
@@ -118,7 +118,7 @@ RSpec.describe 'Command Matchers' do
         File.open(expand_path('cmd.sh'), 'w') { |f| f.puts string }
 
         File.chmod 0755, expand_path('cmd.sh')
-        prepend_environment_variable 'PATH', "#{expand_path('.')}:"
+        prepend_environment_variable 'PATH', "#{expand_path('.')}#{File::PATH_SEPARATOR}"
       end
 
       let(:cmd) { "cmd.sh #{output}" }
@@ -155,7 +155,7 @@ RSpec.describe 'Command Matchers' do
         File.open(expand_path('cmd.sh'), 'w') { |f| f.puts string }
 
         File.chmod 0755, expand_path('cmd.sh')
-        prepend_environment_variable 'PATH', "#{expand_path('.')}:"
+        prepend_environment_variable 'PATH', "#{expand_path('.')}#{File::PATH_SEPARATOR}"
       end
 
       let(:cmd) { "cmd.sh #{output}" }

data/spec/aruba/matchers/deprecated_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+RSpec.describe 'Deprecated matchers' do
+  include_context 'uses aruba API'
+
+  before do
+    allow(Aruba.platform).to receive(:deprecated)
+  end
+
+  describe 'to_match_path_pattern' do
+    context 'when pattern is string' do
+      context 'when there is file which matches path pattern' do
+        before :each do
+          Aruba.platform.write_file(@file_path, '')
+        end
+
+        it { expect(all_paths).to match_path_pattern(expand_path(@file_name)) }
+      end
+
+      context 'when there is not file which matches path pattern' do
+        it { expect(all_paths).not_to match_path_pattern('test') }
+      end
+    end
+
+    context 'when pattern is regex' do
+      context 'when there is file which matches path pattern' do
+        before :each do
+          Aruba.platform.write_file(@file_path, '')
+        end
+
+        it { expect(all_paths).to match_path_pattern(/test/) }
+      end
+
+      context 'when there is not file which matches path pattern' do
+        it { expect(all_paths).not_to match_path_pattern(/test/) }
+      end
+    end
+  end
+end

data/spec/aruba/matchers/directory_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe 'Directory Matchers' do
 
   describe 'to_be_an_existing_directory' do
     let(:name) { 'test.d' }
-    let(:path) { File.join(@aruba.current_directory, name) }
+    let(:path) { @aruba.expand_path(name) }
 
     context 'when directory exists' do
       before :each do
@@ -25,7 +25,7 @@ RSpec.describe 'Directory Matchers' do
 
   describe 'to_have_sub_directory' do
     let(:name) { 'test.d' }
-    let(:path) { File.join(@aruba.current_directory, name) }
+    let(:path) { @aruba.expand_path(name) }
     let(:content) { %w(subdir.1.d subdir.2.d) }
 
     context 'when directory exists' do