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 efc1459..cc195c9 100644 (file)
--- a/t/model_Git.t
+++ b/t/model_Git.t
@@ -1,38 +1,67 @@
 use strict;
 use warnings;
-use Test::More qw/no_plan/;
+use FindBin qw/$Bin/;
+use Test::More;
 
 BEGIN { use_ok 'Gitalist::Model::Git' }
 
-my $Git = Gitalist::Model::Git->new;
+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;
 my $repoBare = Path::Class::Dir->new('t/lib/repositories/bare.git');
-ok( $Git->is_git_repo( $repoBare ), 'is_git_repo true for bare git repo' );
+ok( $m->is_git_repo( $repoBare ), 'is_git_repo true for bare git repo' );
 
 # 'working' is a working copy w/ git repo in the repository dir
 my $repoWorking = Path::Class::Dir->new('t/lib/repositories/working');
-ok( $Git->is_git_repo( $repoWorking ), 'is_git_repo true for git repo in working copy' );
+#ok( $m->is_git_repo( $repoWorking ), 'is_git_repo true for git repo in working copy' );
 
 # 'empty.git' is an empty directory in the repository dir
 my $repoEmpty = Path::Class::Dir->new('t/lib/repositories/empty.git');
-ok( ! $Git->is_git_repo( $repoEmpty ), 'is_git_repo is false for empty dir' );
+ok( ! $m->is_git_repo( $repoEmpty ), 'is_git_repo is false for empty dir' );
 
-# At present, these tests only work if the APP_TEST env var is set.
-# This is needed to load the test configuration.
-diag("*** SKIPPING app tests.
-*** Set APP_TEST for the tests to run fully") if !$ENV{APP_TEST};
-SKIP: {
-  skip "Set APP_TEST for the tests to run fully",
-    3 if !$ENV{APP_TEST};
-
-my $projectList = $Git->list_projects;
+my $projectList = $m->list_projects('t/lib/repositories');
 ok( scalar @{$projectList} == 2, 'list_projects returns an array with the correct number of members' );
-ok( $projectList->[0]->{name} eq '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' );
+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' );
+
+
+# Liberally borrowed from rafl's gitweb
+my $repo = 'repo1';
+
+like($m->head_hash('HEAD', $repo), qr/^([0-9a-fA-F]{40})$/, 'head_hash');
+
+{
+    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'
+    });
+
+    is($m->get_object_mode_string($tree[0]), '-rw-r--r--');
+}
+
+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', $repo), "foo\n");
+is($m->cat_file('5716ca5987cbf97d6bb54920bea6adde242d87e6', $repo), "bar\n");
+
+is($m->diff('3bc0634310b9c62222bb0e724c11ffdfb297b4ac', '3f7567c7bdf7e7ebf410926493b92d398333116e', $repo), <<EOD);
+diff --git a/file1 b/file1
+index 257cc56..5716ca5 100644
+--- a/file1
++++ b/file1
+@@ -1 +1 @@
+-foo
++bar
+EOD
 
-use Data::Dumper;
-warn( Dumper($projectList) );
+done_testing;
 
-} # Close APP_TEST skip