Start conversion to new model

[catagits/Gitalist.git] / t / model_Git.t

diff --git a/t/model_Git.t b/t/model_Git.t
index fcaf04e..cc195c9 100644 (file)
--- a/t/model_Git.t
+++ b/t/model_Git.t
@@ -1,13 +1,12 @@
 use strict;
 use warnings;
 use FindBin qw/$Bin/;
-use Test::More qw/no_plan/;
+use Test::More;
 
 BEGIN { use_ok 'Gitalist::Model::Git' }
 
-my $c = bless {}, 'Gitalist';
-my $m = Gitalist::Model::Git->new($c, { repo_dir => "$Bin/lib/repositories" });
-isa_ok($m, 'Gitalist::Model::Git');
+my $m = Git::Repos->new({ repo_dir => "$Bin/lib/repositories" });
+isa_ok($m, 'Git::Repos');
 
 # 'bare.git' is a bare git repository in the repository dir
 use Path::Class;
@@ -27,37 +26,34 @@ ok( scalar @{$projectList} == 2, 'list_projects returns an array with the correc
 is( $projectList->[0]->{name}, 'bare.git', 'list_projects has correct name for "bare.git" repo' );
 #ok( $projectList->[1]->{name} eq 'working/.git', 'list_projects has correct name for "working" repo' );
 
-$m->project('repo1');
 
-like($m->head_hash, qr/^([0-9a-fA-F]{40})$/, 'head_hash');
+# Liberally borrowed from rafl's gitweb
+my $repo = 'repo1';
 
-{
-    my @tree = $m->list_tree('3bc0634310b9c62222bb0e724c11ffdfb297b4ac');
+like($m->head_hash('HEAD', $repo), qr/^([0-9a-fA-F]{40})$/, 'head_hash');
 
-    is(scalar @tree, 1);
+{
+    my @tree = $m->list_tree('3bc0634310b9c62222bb0e724c11ffdfb297b4ac', $repo);
+    is(scalar @tree, 1, "tree array contains one entry.");
     is_deeply($tree[0], {
-            mode => oct 100644,
-            modestr => '-rw-r--r--',
-            type => 'blob',
-            object => '257cc5642cb1a054f08cc83f2d943e56fd3ebe99',
-            file => 'file1'
+        mode => oct 100644,
+        modestr => '-rw-r--r--',
+        type => 'blob',
+        object => '257cc5642cb1a054f08cc83f2d943e56fd3ebe99',
+        file => 'file1'
     });
 
     is($m->get_object_mode_string($tree[0]), '-rw-r--r--');
 }
 
-is($m->get_object_type('729a7c3f6ba5453b42d16a43692205f67fb23bc1'), 'tree');
-is($m->get_object_type('257cc5642cb1a054f08cc83f2d943e56fd3ebe99'), 'blob');
-is($m->get_object_type('5716ca5987cbf97d6bb54920bea6adde242d87e6'), 'blob');
+is($m->get_object_type('729a7c3f6ba5453b42d16a43692205f67fb23bc1', $repo), 'tree');
+is($m->get_object_type('257cc5642cb1a054f08cc83f2d943e56fd3ebe99', $repo), 'blob');
+is($m->get_object_type('5716ca5987cbf97d6bb54920bea6adde242d87e6', $repo), 'blob');
 
-is($m->cat_file('257cc5642cb1a054f08cc83f2d943e56fd3ebe99'), 'foo');
-is($m->cat_file('5716ca5987cbf97d6bb54920bea6adde242d87e6'), 'bar');
+is($m->cat_file('257cc5642cb1a054f08cc83f2d943e56fd3ebe99', $repo), "foo\n");
+is($m->cat_file('5716ca5987cbf97d6bb54920bea6adde242d87e6', $repo), "bar\n");
 
-# XXX Write something to test a sane interface, then fix the diff interface.
-is($m->diff(
-  commit => $m->get_object('3bc0634310b9c62222bb0e724c11ffdfb297b4ac'),
-  parent => '3f7567c7bdf7e7ebf410926493b92d398333116e',
-), <<EOD);
+is($m->diff('3bc0634310b9c62222bb0e724c11ffdfb297b4ac', '3f7567c7bdf7e7ebf410926493b92d398333116e', $repo), <<EOD);
 diff --git a/file1 b/file1
 index 257cc56..5716ca5 100644
 --- a/file1
@@ -67,3 +63,5 @@ index 257cc56..5716ca5 100644
 +bar
 EOD
 
+done_testing;
+