From efcce7fc123b9e64fb9d93224e4e78d09144af3d Mon Sep 17 00:00:00 2001
From: scott Chacon <schacon@agadorsparticus.(none)>
Date: Sat, 10 Nov 2007 15:34:12 -0800
Subject: got clone and init to work - my first writing functions

---
 tests/test_helper.rb       |  6 +++---
 tests/units/test_init.rb   | 16 ++++++++++++----
 tests/units/test_lib.rb    |  8 ++++----
 tests/units/test_log.rb    |  2 +-
 tests/units/test_object.rb |  6 +++---
 5 files changed, 23 insertions(+), 15 deletions(-)

(limited to 'tests')

diff --git a/tests/test_helper.rb b/tests/test_helper.rb
index 03b5f8a..cf67576 100644
--- a/tests/test_helper.rb
+++ b/tests/test_helper.rb
@@ -14,9 +14,9 @@ class Test::Unit::TestCase
       @test_dir = File.join(cwd, 'tests', 'files')
     end
     
-    @wdir = File.join(@test_dir, 'working')
-    @wbare = File.join(@test_dir, 'working.git')
-    @index = File.join(@test_dir, 'index')
+    @wdir = File.expand_path(File.join(@test_dir, 'working'))
+    @wbare = File.expand_path(File.join(@test_dir, 'working.git'))
+    @index = File.expand_path(File.join(@test_dir, 'index'))
   end
   
   def in_temp_dir(remove_after = true)
diff --git a/tests/units/test_init.rb b/tests/units/test_init.rb
index f1a8ba4..4681ba0 100644
--- a/tests/units/test_init.rb
+++ b/tests/units/test_init.rb
@@ -21,7 +21,7 @@ class TestInit < Test::Unit::TestCase
   end
   
   def test_git_bare
-    g = Git.repo @wbare
+    g = Git.bare @wbare
     assert_equal(g.repo.path, @wbare)
   end
   
@@ -51,11 +51,19 @@ class TestInit < Test::Unit::TestCase
   
   def test_git_clone
     in_temp_dir do |path|      
-      Git.clone(uri, :repository => dir)
-      assert(File.exists?(File.join(dir, 'config')))
+      g = Git.clone(@wbare, 'bare-co')
+      assert(File.exists?(File.join(g.repo.path, 'config')))
     end
   end
-
+  
+  def test_git_clone_bare
+    in_temp_dir do |path|      
+      g = Git.clone(@wbare, 'bare.git', :bare => true)
+      assert(File.exists?(File.join(g.repo.path, 'config')))
+      assert_nil(g.dir)
+    end
+  end
+  
   # trying to open a git project using a bare repo - rather than using Git.repo
   def test_git_open_error
     assert_raise ArgumentError do
diff --git a/tests/units/test_lib.rb b/tests/units/test_lib.rb
index 03a4411..5fbd896 100644
--- a/tests/units/test_lib.rb
+++ b/tests/units/test_lib.rb
@@ -82,10 +82,10 @@ class TestLib < Test::Unit::TestCase
   def test_branches_all
     branches = @lib.branches_all
     assert(branches.size > 0)
-    assert(branches.select { |b| b.current }.size > 0)  # has a current branch
-    assert(branches.select { |b| b.remote }.size > 0)   # has a remote branch
-    assert(branches.select { |b| !b.remote }.size > 0)  # has a local branch
-    assert(branches.select { |b| b.name == 'master' }.size > 0)  # has a master branch
+    assert(branches.select { |b| b[1] }.size > 0)  # has a current branch
+    assert(branches.select { |b| /\//.match(b[0]) }.size > 0)   # has a remote branch
+    assert(branches.select { |b| !/\//.match(b[0]) }.size > 0)  # has a local branch
+    assert(branches.select { |b| /master/.match(b[0]) }.size > 0)  # has a master branch
   end
 
   def test_config_remote
diff --git a/tests/units/test_log.rb b/tests/units/test_log.rb
index b62c544..7198b8a 100644
--- a/tests/units/test_log.rb
+++ b/tests/units/test_log.rb
@@ -36,7 +36,7 @@ class TestLog < Test::Unit::TestCase
     assert_equal(30, l.size)
     
     l = @git.log.between('v2.5').object('example.txt')
-    assert_equal(2, l.size)
+    assert_equal(3, l.size)
   
     l = @git.log.between('v2.5', 'test').object('example.txt')
     assert_equal(1, l.size)
diff --git a/tests/units/test_object.rb b/tests/units/test_object.rb
index df565d5..c115b75 100644
--- a/tests/units/test_object.rb
+++ b/tests/units/test_object.rb
@@ -32,9 +32,9 @@ class TestObject < Test::Unit::TestCase
   end
   
   def test_object_to_s
-    assert_equal('commit 1cc8667014381e2788a94777532a788307f38d26', @commit.to_s)
-    assert_equal('tree   94c827875e2cadb8bc8d4cdd900f19aa9e8634c7', @tree.to_s)
-    assert_equal('blob   ba492c62b6227d7f3507b4dcc6e6d5f13790eabf', @blob.to_s)
+    assert_equal('1cc8667014381e2788a94777532a788307f38d26', @commit.to_s)
+    assert_equal('94c827875e2cadb8bc8d4cdd900f19aa9e8634c7', @tree.to_s)
+    assert_equal('ba492c62b6227d7f3507b4dcc6e6d5f13790eabf', @blob.to_s)
   end
   
   def test_object_size
-- 
cgit