require 'spec_helper' describe Gitlab::Diff::Parser do include RepoHelpers let(:project) { create(:project) } let(:commit) { project.commit(sample_commit.id) } let(:diff) { commit.diffs.first } let(:parser) { Gitlab::Diff::Parser.new } describe :parse do let(:diff) do < path } - options = { chdir: path } + + vars = { + "PWD" => path + } + + options = { + chdir: path + } unless File.directory?(path) FileUtils.mkdir_p(path) @@ -19,6 +25,7 @@ module Popen @cmd_output = "" @cmd_status = 0 + Open3.popen3(vars, *cmd, options) do |stdin, stdout, stderr, wait_thr| @cmd_output << stdout.read @cmd_output << stderr.read eos end before do @lines = parser.parse(diff.lines) end it { expect(@lines.size).to eq(30) } describe 'lines' do describe 'first line' do let(:line) { @lines.first } it { expect(line.type).to eq('match') } it { expect(line.old_pos).to eq(6) } it { expect(line.new_pos).to eq(6) } it { expect(line.text).to eq('@@ -6,12 +6,18 @@ module Popen') } end describe 'removal line' do let(:line) { @lines[10] } it { expect(line.type).to eq('old') } it { expect(line.old_pos).to eq(14) } it { expect(line.new_pos).to eq(13) } it { expect(line.text).to eq('- options = { chdir: path }') } end describe 'addition line' do let(:line) { @lines[16] } it { expect(line.type).to eq('new') } it { expect(line.old_pos).to eq(15) } it { expect(line.new_pos).to eq(18) } it { expect(line.text).to eq('+ options = {') } end describe 'unchanged line' do let(:line) { @lines.last } it { expect(line.type).to eq(nil) } it { expect(line.old_pos).to eq(24) } it { expect(line.new_pos).to eq(31) } it { expect(line.text).to eq(' @cmd_output << stderr.read') } end end end end