Make the Gitlab::Popen path argument optional

Jacob Vosmaer
1 parent 0432bdf1
Showing 2 changed files with 11 additions and 1 deletions Show diff stats
lib/gitlab/popen.rb
spec/lib/gitlab/popen_spec.rb
@@ -3,11 +3,12 @@ require &#39;open3&#39;
  
 module Gitlab
   module Popen
-    def popen(cmd, path)
+    def popen(cmd, path=nil)
       unless cmd.is_a?(Array)
         raise "System commands must be given as an array of strings"
       end
  
+      path ||= Dir.pwd
       vars = { "PWD" => path }
       options = { chdir: path }
  
@@ -32,5 +32,14 @@ describe &#39;Gitlab::Popen&#39;, no_db: true do
     end
   end
  
+  context 'without a directory argument' do
+    before do
+      @output, @status = @klass.new.popen(%W(ls))
+    end
+
+    it { @status.should be_zero }
+    it { @output.should include('spec') }
+  end
+
 end
...	...	@@ -3,11 +3,12 @@ require 'open3'
3	3
4	4	module Gitlab
5	5	module Popen
6		- def popen(cmd, path)
	6	+ def popen(cmd, path=nil)
7	7	unless cmd.is_a?(Array)
8	8	raise "System commands must be given as an array of strings"
9	9	end
10	10
	11	+ path \|\|= Dir.pwd
11	12	vars = { "PWD" => path }
12	13	options = { chdir: path }
13	14
...	...
...	...	@@ -32,5 +32,14 @@ describe 'Gitlab::Popen', no_db: true do
32	32	end
33	33	end
34	34
	35	+ context 'without a directory argument' do
	36	+ before do
	37	+ @output, @status = @klass.new.popen(%W(ls))
	38	+ end
	39	+
	40	+ it { @status.should be_zero }
	41	+ it { @output.should include('spec') }
	42	+ end
	43	+
35	44	end
36	45
...	...