PATCH end it 'without specifying a mirror should show all uncommitted changes with a banner' do diff = nil in_dir(@repository_dir) do diff = run_command("#{BRAID_BIN} diff") end expect(diff).to eq(< - +

@@ -81,6 +81,8 @@

Have boxes with smaller text with the class "minor". See the "Recent" boxy below.

Happy boxying!

PATCH end it 'with the mirror specified and --cached should show only the staged uncommitted changes' do diff = nil in_dir(@repository_dir) do diff = run_command("#{BRAID_BIN} diff skit1 -- --cached") end expect(diff).to eq(< - +

PATCH end it 'without specifying a mirror and with --cached should show only the staged uncommitted changes with a banner' do diff = nil in_dir(@repository_dir) do diff = run_command("#{BRAID_BIN} diff -- --cached") end expect(diff).to eq(< - +

PATCH end end describe 'with changes to multiple files and a file path argument' do before do FileUtils.cp_r(File.join(FIXTURE_PATH, 'skit1.3') + '/.', "#{@repository_dir}/skit1") in_dir(@repository_dir) do run_command('git add *') run_command('git commit -m "Some local changes"') end end it 'should show only the diff in the specified file' do diff = nil in_dir(@repository_dir) do # Test that file paths are taken relative to the downstream repository # root, as documented, rather than the mirror. diff = run_command("#{BRAID_BIN} diff skit1 -- skit1/layouts/README.md") end expect(diff).to eq(< - +

PATCH end it 'without specifying a mirror should emit diff and banners' do diff = nil in_dir(@repository_dir) do diff = run_command("#{BRAID_BIN} diff") end expect(diff).to eq(< - +

PATCH end end end describe 'braided from a single file' do before do in_dir(@repository_dir) do run_command("#{BRAID_BIN} add #{@vendor_repository_dir} --path layouts/layout.liquid skit-layout.liquid") end end describe 'with no changes' do it 'with the mirror specified should emit no output' do diff = nil in_dir(@repository_dir) do diff = run_command("#{BRAID_BIN} diff skit-layout.liquid") end expect(diff).to eq('') end it 'without specifying a mirror should emit only banners' do diff = nil in_dir(@repository_dir) do diff = run_command("#{BRAID_BIN} diff") end expect(diff).to eq("=======================================================\nBraid: Diffing skit-layout.liquid\n=======================================================\n") end end describe 'with changes' do before do FileUtils.cp_r(File.join(FIXTURE_PATH, 'skit1.1') + '/layouts/layout.liquid', "#{@repository_dir}/skit-layout.liquid", {preserve: true}) in_dir(@repository_dir) do run_command('git add *') run_command('git commit -m "Some local changes"') end end it 'with the mirror specified should emit diff' do diff = nil in_dir(@repository_dir) do diff = run_command("#{BRAID_BIN} diff skit-layout.liquid") end expect(diff).to eq(< - +

PATCH end it 'without specifying a mirror should emit diff and banners' do diff = nil in_dir(@repository_dir) do diff = run_command("#{BRAID_BIN} diff") end expect(diff).to eq(< - +

PATCH end end describe 'with changes including a mode change' do before do in_dir(@repository_dir) do @filemode_enabled = filemode_enabled end FileUtils.cp_r(File.join(FIXTURE_PATH, 'skit1.1x') + '/layouts/layout.liquid', "#{@repository_dir}/skit-layout.liquid", {preserve: true}) in_dir(@repository_dir) do run_command('git add *') run_command('git commit -m "Some local changes"') end end it 'with the mirror specified should emit diff' do # Right way to do this? See # https://github.com/cucumber/aruba/issues/301 . It's unclear what # we'd have to do to get the information in time to use :unless. If # we don't do that, a success seems less bad than a known # failure ("pending"). next unless @filemode_enabled diff = nil in_dir(@repository_dir) do diff = run_command("#{BRAID_BIN} diff skit-layout.liquid") end expect(diff).to eq(< - +

PATCH end it 'without specifying a mirror should emit diff and banners' do next unless @filemode_enabled diff = nil in_dir(@repository_dir) do diff = run_command("#{BRAID_BIN} diff") end expect(diff).to eq(< - +

PATCH end end end describe 'braided as a tag directly in' do before do in_dir(@repository_dir) do run_command("#{BRAID_BIN} add #{@vendor_repository_dir} --tag v1") end end describe 'with no changes' do it 'with the mirror specified should emit no output' do diff = nil in_dir(@repository_dir) do diff = run_command("#{BRAID_BIN} diff skit1") end expect(diff).to eq('') end it 'without specifying a mirror should emit only banners' do diff = nil in_dir(@repository_dir) do diff = run_command("#{BRAID_BIN} diff") end expect(diff).to eq("=======================================================\nBraid: Diffing skit1\n=======================================================\n") end end describe 'with changes' do before do FileUtils.cp_r(File.join(FIXTURE_PATH, 'skit1.1') + '/.', "#{@repository_dir}/skit1") in_dir(@repository_dir) do run_command('git add *') run_command('git commit -m "Some local changes"') end end it 'with the mirror specified should emit diff' do diff = nil in_dir(@repository_dir) do diff = run_command("#{BRAID_BIN} diff skit1") end expect(diff).to eq(< - +

PATCH end end end end