tests/units/test_merge.rb

   1 #!/usr/bin/env ruby
   2
   3 require File.dirname(__FILE__) + '/../test_helper'
   4
   5 class TestMerge < Test::Unit::TestCase
   6   def setup
   7     set_file_paths
   8   end
   9
  10   def test_branch_and_merge
  11     in_temp_dir do |path|
  12       g = Git.clone(@wbare, 'branch_merge_test')
  13       Dir.chdir('branch_merge_test') do
  14
  15         g.branch('new_branch').in_branch('test') do
  16           assert_equal('new_branch', g.current_branch)
  17           new_file('new_file_1', 'hello')
  18           new_file('new_file_2', 'hello')
  19           g.add
  20           true
  21         end
  22
  23         assert_equal('master', g.current_branch)
  24
  25         new_file('new_file_3', 'hello')
  26         g.add
  27
  28         assert(!g.status['new_file_1'])  # file is not there
  29
  30         assert(g.branch('new_branch').merge)
  31         assert(g.status['new_file_1'])  # file has been merged in
  32       end
  33     end
  34   end
  35
  36   def test_branch_and_merge_two
  37     in_temp_dir do |path|
  38       g = Git.clone(@wbare, 'branch_merge_test')
  39       Dir.chdir('branch_merge_test') do
  40
  41         g.branch('new_branch').in_branch('test') do
  42           assert_equal('new_branch', g.current_branch)
  43           new_file('new_file_1', 'hello')
  44           new_file('new_file_2', 'hello')
  45           g.add
  46           true
  47         end
  48
  49         g.branch('new_branch2').in_branch('test') do
  50           assert_equal('new_branch2', g.current_branch)
  51           new_file('new_file_3', 'hello')
  52           new_file('new_file_4', 'hello')
  53           g.add
  54           true
  55         end
  56
  57         g.branch('new_branch').merge('new_branch2')
  58         assert(!g.status['new_file_3'])  # still in master branch
  59
  60         g.branch('new_branch').checkout
  61         assert(g.status['new_file_3'])  # file has been merged in
  62
  63         g.branch('master').checkout
  64         g.merge(g.branch('new_branch'))
  65         assert(g.status['new_file_3'])  # file has been merged in
  66
  67       end
  68     end
  69   end
  70
  71   def test_branch_and_merge_multiple
  72     in_temp_dir do |path|
  73       g = Git.clone(@wbare, 'branch_merge_test')
  74       Dir.chdir('branch_merge_test') do
  75
  76         g.branch('new_branch').in_branch('test') do
  77           assert_equal('new_branch', g.current_branch)
  78           new_file('new_file_1', 'hello')
  79           new_file('new_file_2', 'hello')
  80           g.add
  81           true
  82         end
  83
  84         g.branch('new_branch2').in_branch('test') do
  85           assert_equal('new_branch2', g.current_branch)
  86           new_file('new_file_3', 'hello')
  87           new_file('new_file_4', 'hello')
  88           g.add
  89           true
  90         end
  91
  92         assert(!g.status['new_file_1'])  # still in master branch
  93         assert(!g.status['new_file_3'])  # still in master branch
  94
  95         g.merge(['new_branch', 'new_branch2'])
  96
  97         assert(g.status['new_file_1'])  # file has been merged in
  98         assert(g.status['new_file_3'])  # file has been merged in
  99
 100       end
 101     end
 102   end
 103
 104 end