spec/integration/push_spec.rb in braid-1.0.16 vs spec/integration/push_spec.rb in braid-1.0.17

@@ -1,17 +1,17 @@
-require File.dirname(__FILE__) + '/../integration_helper'
+require File.dirname(__FILE__) + '/integration_helper'
 
 describe 'Pushing to a mirror' do
 
   before do
     FileUtils.rm_rf(TMP_PATH)
     FileUtils.mkdir_p(TMP_PATH)
   end
 
   describe 'from a git repository' do
     before do
-      @repository_dir = create_git_repo_from_fixture('shiny')
+      @repository_dir = create_git_repo_from_fixture('shiny', :name => 'Some body', :email => '[e-mail]')
       @vendor_repository_dir = create_git_repo_from_fixture('skit1')
       @file_name = 'layouts/layout.liquid'
 
       in_dir(@repository_dir) do
         run_command("#{BRAID_BIN} add #{@vendor_repository_dir}")
@@ -29,37 +29,51 @@
     end
 
     context 'with remote updtodate' do
       it 'should push changes successfully' do
         braid_output = nil
+        commit_message = 'Make some changes'
         in_dir(@repository_dir) do
-          set_editor_message('Make some changes')
+          set_editor_message(commit_message)
           braid_output = run_command("#{EDITOR_CMD_PREFIX} #{BRAID_BIN} push skit1")
         end
-        braid_output.should =~ /Braid: Cloning mirror with local changes./
-        braid_output.should =~ /Make some changes/
-        braid_output.should =~ /Braid: Pushing changes to remote branch master./
+        expect(braid_output).to match(/Braid: Cloning mirror with local changes./)
+        expect(braid_output).to match(/Make some changes/)
+        expect(braid_output).to match(/Braid: Pushing changes to remote branch master./)
 
         assert_no_diff("#{FIXTURE_PATH}/skit1.1/#{@file_name}", "#{@repository_dir}/skit1/#{@file_name}")
         assert_no_diff("#{FIXTURE_PATH}/skit1.1/#{@file_name}", "#{@vendor_repository_dir}/#{@file_name}")
+
+        in_dir(@vendor_repository_dir) do
+          run_command('git checkout master 2>&1')
+
+          assert_commit_subject(commit_message)
+          assert_commit_author('Some body')
+          assert_commit_email('[e-mail]')
+        end
       end
 
       it 'should push changes to specified branch successfully' do
+        commit_message = 'Make some changes'
         braid_output = nil
         in_dir(@repository_dir) do
-          set_editor_message('Make some changes')
+          set_editor_message(commit_message)
           braid_output = run_command("#{EDITOR_CMD_PREFIX} #{BRAID_BIN} push skit1 --branch MyBranch")
         end
-        braid_output.should =~ /Braid: Cloning mirror with local changes./
-        braid_output.should =~ /Make some changes/
-        braid_output.should =~ /Braid: Pushing changes to remote branch MyBranch./
+        expect(braid_output).to match(/Braid: Cloning mirror with local changes./)
+        expect(braid_output).to match(/Make some changes/)
+        expect(braid_output).to match(/Braid: Pushing changes to remote branch MyBranch./)
 
         assert_no_diff("#{FIXTURE_PATH}/skit1/#{@file_name}", "#{@vendor_repository_dir}/#{@file_name}")
         assert_no_diff("#{FIXTURE_PATH}/skit1.1/#{@file_name}", "#{@repository_dir}/skit1/#{@file_name}")
 
         in_dir(@vendor_repository_dir) do
           run_command('git checkout MyBranch 2>&1')
+
+          assert_commit_subject(commit_message)
+          assert_commit_author('Some body')
+          assert_commit_email('[e-mail]')
         end
 
         assert_no_diff("#{FIXTURE_PATH}/skit1.1/#{@file_name}", "#{@vendor_repository_dir}/#{@file_name}")
       end
     end
@@ -71,18 +85,65 @@
         in_dir(@vendor_repository_dir) do
           run_command('git add *')
           run_command('git commit -m "Update vendored directory"')
         end
       end
-      it 'should push changes successfully' do
+      it 'should halt before attempting to push changes' do
         braid_output = nil
         in_dir(@repository_dir) do
           set_editor_message('Make some changes')
           braid_output = run_command("#{EDITOR_CMD_PREFIX} #{BRAID_BIN} push skit1")
         end
-        braid_output.should =~ /Braid: Mirror is not up to date. Stopping./
+        expect(braid_output).to match(/Braid: Mirror is not up to date. Stopping./)
 
         assert_no_diff("#{FIXTURE_PATH}/skit1.2/#{@file_name}", "#{TMP_PATH}/skit1/#{@file_name}")
+      end
+    end
+  end
+
+  describe 'from a git repository braided into subdirectory' do
+    before do
+      @repository_dir = create_git_repo_from_fixture('shiny', :name => 'Some body', :email => '[e-mail]')
+      @vendor_repository_dir = create_git_repo_from_fixture('skit1')
+      @file_name = 'layouts/layout.liquid'
+
+      in_dir(@repository_dir) do
+        run_command("#{BRAID_BIN} add #{@vendor_repository_dir} --path layouts")
+      end
+
+      in_dir(@vendor_repository_dir) do
+        run_command('git config receive.denyCurrentBranch updateInstead')
+      end
+
+      update_dir_from_fixture('shiny/skit1', 'skit1.1/layouts')
+      in_dir(@repository_dir) do
+        run_command('git add *')
+        run_command('git commit -m "Make some changes to vendored files"')
+      end
+    end
+
+    context 'with remote updtodate' do
+      it 'should push changes successfully' do
+        braid_output = nil
+        commit_message = 'Make some changes'
+        in_dir(@repository_dir) do
+          set_editor_message(commit_message)
+          braid_output = run_command("#{EDITOR_CMD_PREFIX} #{BRAID_BIN} push skit1")
+        end
+        expect(braid_output).to match(/Braid: Cloning mirror with local changes./)
+        expect(braid_output).to match(/Make some changes/)
+        expect(braid_output).to match(/Braid: Pushing changes to remote branch master./)
+
+        assert_no_diff("#{FIXTURE_PATH}/skit1.1/#{@file_name}", "#{@repository_dir}/skit1/layout.liquid")
+        assert_no_diff("#{FIXTURE_PATH}/skit1.1/#{@file_name}", "#{@vendor_repository_dir}/#{@file_name}")
+
+        in_dir(@vendor_repository_dir) do
+          run_command('git checkout master 2>&1')
+
+          assert_commit_subject(commit_message)
+          assert_commit_author('Some body')
+          assert_commit_email('[e-mail]')
+        end
       end
     end
   end
 end