Revert changes no longer necessary in lib/gitlab/popen.rbsh-optimize-project-creation

2 files changed, 4 insertions, 4 deletions

diff --git a/lib/gitlab/popen.rb b/lib/gitlab/popen.rb
index 66ed580ed30..4bc5cda8cb5 100644
--- a/lib/gitlab/popen.rb
+++ b/lib/gitlab/popen.rb
@@ -5,14 +5,14 @@ module Gitlab
   module Popen
     extend self
 
-    def popen(cmd, path = nil, vars = {}, options = {})
+    def popen(cmd, path = nil, vars = {})
       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
+      options = { chdir: path }
 
       unless File.directory?(path)
         FileUtils.mkdir_p(path)
diff --git a/spec/lib/gitlab/popen_spec.rb b/spec/lib/gitlab/popen_spec.rb
index a7098da6e49..af50ecdb2ab 100644
--- a/spec/lib/gitlab/popen_spec.rb
+++ b/spec/lib/gitlab/popen_spec.rb
@@ -34,12 +34,12 @@ describe 'Gitlab::Popen', lib: true, no_db: true do
 
   context 'with custom options' do
     let(:vars) { { 'foobar' => 123, 'PWD' => path } }
-    let(:options) { { opt_test: 456 } }
+    let(:options) { { chdir: path } }
 
     it 'calls popen3 with the provided environment variables' do
       expect(Open3).to receive(:popen3).with(vars, 'ls', options)
 
-      @output, @status = @klass.new.popen(%w(ls), path, { 'foobar' => 123 }, options)
+      @output, @status = @klass.new.popen(%w(ls), path, { 'foobar' => 123 })
     end
   end