X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02git_object.t;h=0ea808a91e95745168f2dce2535f68e633b63b3c;hb=df6292661bd22bb00ba89f0684b60bb8096383c8;hp=5a56041a85cbd40493f5529bc061c1881ddcbc92;hpb=44a9ed75e5d936e96ce63cfb13c943ab3f59dc52;p=catagits%2FGitalist.git

diff --git a/t/02git_object.t b/t/02git_object.t
index 5a56041..0ea808a 100644
--- a/t/02git_object.t
+++ b/t/02git_object.t
@@ -1,13 +1,20 @@
+use FindBin qw/$Bin/;
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
+
 use strict;
 use warnings;
-use FindBin qw/$Bin/;
 use Test::More;
 use Test::Exception;
 use Data::Dumper;
 
 use Path::Class;
 use Gitalist::Git::Repository;
-my $project = Gitalist::Git::Repository->new(
+my $repository = Gitalist::Git::Repository->new(
     dir("$Bin/lib/repositories/repo1"),
 );
 
@@ -19,7 +26,7 @@ BEGIN {
     }
 
 my $object = Gitalist::Git::Object::Tree->new(
-    project => $project,
+    repository => $repository,
     sha1 => '729a7c3f6ba5453b42d16a43692205f67fb23bc1',
     type => 'tree',
     file => 'dir1',
@@ -30,19 +37,19 @@ is($object->sha1,'729a7c3f6ba5453b42d16a43692205f67fb23bc1', 'sha1 is correct');
 is($object->type, 'tree', 'type is correct');
 is($object->file, 'dir1', 'file is correct');
 is($object->mode, 16384, 'mode is correct');
-is($object->modestr, 'd---------', "modestr is correct" );
+is($object->modestr, 'drwxr-xr-x', "modestr is correct" );
 is($object->size, 33, "size is correct");
 
 # Create object from sha1.
 my $obj2 = Gitalist::Git::Object::Blob->new(
-    project => $project,
+    repository => $repository,
     sha1 => '5716ca5987cbf97d6bb54920bea6adde242d87e6',
 );
 isa_ok($obj2, 'Gitalist::Git::Object::Blob', 'blob object');
 is($obj2->sha1,'5716ca5987cbf97d6bb54920bea6adde242d87e6', 'sha1 is correct');
 is($obj2->type, 'blob', 'type is correct');
 is($obj2->mode, 0, 'mode is correct');
-is($obj2->modestr, '?---------', "modestr is correct" );
+is($obj2->modestr, '----------', "modestr is correct" );
 is($obj2->content, "bar\n", 'obj2 contents is correct');
 is($obj2->size, 4, "size is correct");
 dies_ok {
@@ -53,13 +60,11 @@ dies_ok {
 } 'comment is an empty string';
 
 my $commit_obj = Gitalist::Git::Object::Commit->new(
-    project => $project,
+    repository => $repository,
     sha1 => '3f7567c7bdf7e7ebf410926493b92d398333116e',
 );
 isa_ok($commit_obj, 'Gitalist::Git::Object::Commit', "commit object");
 my ($tree, $patch) = $commit_obj->diff(
-    parent => undef,
-    file => undef,
     patch => 1,
 );
 $patch = $patch->[0];
@@ -78,7 +83,9 @@ is($patch->{diff}, '--- a/file1
 ', 'patch->{diff} is correct');
 is($patch->{dst}, '5716ca5987cbf97d6bb54920bea6adde242d87e6', 'patch->{dst} is correct');
 
-ok(index(do { local $/; my $fh = $commit_obj->get_patch; <$fh> },
+{
+    my $contents = do { local $/; my $fh = $commit_obj->get_patch; <$fh> };
+ok(index($contents,
 'From 3f7567c7bdf7e7ebf410926493b92d398333116e Mon Sep 17 00:00:00 2001
 From: Florian Ragwitz <rafl@debian.org>
 Date: Tue, 6 Mar 2007 20:39:45 +0100
@@ -95,10 +102,17 @@ index 257cc56..5716ca5 100644
 @@ -1 +1 @@
 -foo
 +bar
---') == 0, 'commit_obj->get_patch can return a patch');
-
-like(do { local $/; my $fh = $commit_obj->get_patch(undef, 3); <$fh> },
-    qr!PATCH 2/2!, 'commit_obj->get_patch can return a patchset');
+--') == 0, 'commit_obj->get_patch can return a patch')
+    or warn("Got instead: $contents");
+}
 
+# Note - 2 patches = 3 parts due to where we split.
+{
+    my $contents = do { local $/; my $fh = $commit_obj->get_patch(undef, 3); <$fh> };
+    my @bits = split /Subject: \[PATC/, $contents;
+    is(scalar(@bits), 3,
+        'commit_obj->get_patch can return a patchset')
+        or warn("Contents was $contents");
+}
 done_testing;