X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fmodel_collectionofrepos.t;h=4736dd57f84ef98bcdd935a9174742a24fd3f54a;hb=4d334b5359bb28a7b0781c44db9ebe710be22965;hp=834ba6212ed474a5c15d36f5c1f377477caf3666;hpb=ea7725112cb1e27f0c76481742daad900380b8cd;p=catagits%2FGitalist.git

diff --git a/t/model_collectionofrepos.t b/t/model_collectionofrepos.t
index 834ba62..4736dd5 100644
--- a/t/model_collectionofrepos.t
+++ b/t/model_collectionofrepos.t
@@ -27,6 +27,7 @@ my $run_options = {};
 my $mock_ctx_meta = Class::MOP::Class->create_anon_class( superclasses => ['Moose::Object'] );
 $mock_ctx_meta->add_method('run_options' => sub { $run_options });
 $mock_ctx_meta->add_attribute($_, accessor => $_, required => 1) for qw/request response/;
+$mock_ctx_meta->add_method('debug' => sub {});
 $mock_ctx_meta->add_attribute('stash', accessor => 'stash', required => 1, default => sub { {} });
 $mock_ctx_meta->add_around_method_modifier( stash => sub { # Nicked straight from Catalyst.pm
     my $orig = shift;
@@ -46,11 +47,13 @@ $mock_log->add_method($_ => sub {}) for qw/ warn info debug /;
 my $logger = $mock_log->name->new;
 $mock_ctx_meta->add_method('log' => sub { $logger });
 
+my $host = "git.shadowcat.co.uk";
+$mock_ctx_meta->add_method('uri' => sub { URI->new("http://$host/") });
 our $ctx_gen = sub {
     my ($cb, %args) = @_;
     my $ctx = $mock_ctx_meta->new_object(
         response    => Catalyst::Response->new,
-        request     => Catalyst::Request->new,
+        request     => Catalyst::Request->new(uri => URI->new("http://$host/")),
         stash       => {},
         %args
     );
@@ -61,17 +64,18 @@ our $ctx_gen = sub {
 };
 
 local %ENV = %ENV;
+delete $ENV{GITALIST_CONFIG};
 delete $ENV{GITALIST_REPO_DIR};
 
 throws_ok { my $i = Gitalist::Model::CollectionOfRepos->COMPONENT($ctx_gen->(), {}); $i->{_application} = $mock_ctx_meta->name; }
     qr/Don't know where to get repositores from/, 'Blows up nicely with no repos dir';
 
-throws_ok { Gitalist::Model::CollectionOfRepos->COMPONENT($ctx_gen->(), { repos_dir => '/does/not/exist' }) }
+throws_ok { Gitalist::Model::CollectionOfRepos->COMPONENT($ctx_gen->(), { repo_dir => '/does/not/exist' }) }
     qr|No such file or directory|, 'Blows up nicely with repos dir does not exist';
 
 {
     my $td = tempdir( CLEANUP => 1 );
-    test_with_config({ repos_dir => $td }, msg => 'repos_dir is tempdir');
+    test_with_config({ repo_dir => $td }, msg => 'repo_dir is tempdir');
     # NOTE - This is cheating, there isn't a real git repository here, so things will explode (hopefully)
     #        if we go much further..
     test_with_config({ repos => $td }, msg => 'repos is tempdir (scalar)');
@@ -101,13 +105,13 @@ throws_ok { Gitalist::Model::CollectionOfRepos->COMPONENT($ctx_gen->(), { repos
 }
 
 {
-    my $i = test_with_config({ repos_dir => "$FindBin::Bin/lib/repositories"});
+    my $i = test_with_config({ repo_dir => "$FindBin::Bin/lib/repositories"});
     is scalar($i->repositories->flatten), 3, 'Found 3 repos';
     isa_ok $i, 'Gitalist::Git::CollectionOfRepositories::FromDirectory';
 }
 
 {
-    my $i = test_with_config({ repos_dir => "$FindBin::Bin/lib/repositories", search_recursively => 1 });
+    my $i = test_with_config({ repo_dir => "$FindBin::Bin/lib/repositories", search_recursively => 1 });
     is scalar($i->repositories->flatten), 7, 'Found 7 repos recursively using config';
     isa_ok $i, 'Gitalist::Git::CollectionOfRepositories::FromDirectoryRecursive';
 }
@@ -115,7 +119,7 @@ throws_ok { Gitalist::Model::CollectionOfRepos->COMPONENT($ctx_gen->(), { repos
     my($tempfh, $wl) = tempfile(UNLINK => 1);
     print {$tempfh} "repo1";
     close $tempfh;
-    my $i = test_with_config({ repos_dir => "$FindBin::Bin/lib/repositories", whitelist => $wl });
+    my $i = test_with_config({ repo_dir => "$FindBin::Bin/lib/repositories", whitelist => $wl });
     is scalar($i->repositories->flatten), 1, 'Found 1 repos using whitelist';
     isa_ok $i, 'Gitalist::Git::CollectionOfRepositories::FromDirectory::WhiteList';
 }
@@ -132,7 +136,7 @@ throws_ok { Gitalist::Model::CollectionOfRepos->COMPONENT($ctx_gen->(), { repos
 
 {
     my $i = test_with_config({
-        repos_dir => "$FindBin::Bin/lib/repositories",
+        repo_dir => "$FindBin::Bin/lib/repositories",
         class    => 'TestModelSimple'
     });
     is scalar($i->repositories->flatten), 3, 'Found 3 repos';
@@ -141,7 +145,7 @@ throws_ok { Gitalist::Model::CollectionOfRepos->COMPONENT($ctx_gen->(), { repos
 
 {
     my $i = test_with_config({
-        repos_dir => "$FindBin::Bin/lib/repositories",
+        repo_dir => "$FindBin::Bin/lib/repositories",
         class    => 'TestModelFancy',
         args     => { fanciness => 1 },
     });
@@ -150,6 +154,57 @@ throws_ok { Gitalist::Model::CollectionOfRepos->COMPONENT($ctx_gen->(), { repos
     ok $i->fanciness, "The TestModelFancy is fancy (so --model-args worked)";
 }
 
+sub test_vhost_instance {
+    test_with_config({
+        class    => 'Gitalist::Git::CollectionOfRepositories::Vhost',
+        args     => {
+            vhost_dispatch => {
+                "git.shadowcat.co.uk" => "default",
+                "git.moose.perl.org" => "moose",
+                "git.catalyst.perl.org" => "catgit",
+                "_default_" => "default",
+            },
+            collections => {
+                moose => { class => 'Gitalist::Git::CollectionOfRepositories::FromDirectory', repo_dir => "$FindBin::Bin/lib/repositories_sets/moose" },
+                catgit => { class => 'Gitalist::Git::CollectionOfRepositories::FromDirectory', repo_dir => "$FindBin::Bin/lib/repositories_sets/catgit" },
+                default => { class => 'Gitalist::Git::CollectionOfRepositories::FromDirectoryRecursive', repo_dir => "$FindBin::Bin/lib/repositories_sets"},
+            }
+        },
+    });
+}
+
+my $c_name = "$FindBin::Bin/lib/repositories_sets/catgit/Catalyst-Runtime";
+my $m_name = "$FindBin::Bin/lib/repositories_sets/moose/Moose";
+{
+    my $i = test_vhost_instance();
+    is scalar($i->repositories->flatten), 2, 'Found 2 repos on test vhost';
+    my @r = $i->repositories->flatten;
+    my @paths = sort map { $_->path . "" } $i->repositories->flatten;
+    is_deeply \@paths, [sort $c_name, $m_name];
+}
+
+{
+    $host = "git.moose.perl.org";
+    my $i = test_vhost_instance();
+    is scalar($i->repositories->flatten), 1, 'Found 1 repos on moose vhost';
+    is $i->repositories->[0]->path.'', $m_name;
+}
+
+{
+    $host = "git.catalyst.perl.org";
+    my $i = test_vhost_instance();
+    is scalar($i->repositories->flatten), 1, 'Found 1 repos on catalyst vhost';
+    is $i->repositories->[0]->path.'', $c_name;
+}
+
+{
+    $host = "git.shadowcat.co.uk";
+    my $i = test_vhost_instance();
+    is scalar($i->repositories->flatten), 2, 'Found 2 repos on git.shadowcat vhost';
+    my @paths = sort map { $_->path . "" } $i->repositories->flatten;
+    is_deeply \@paths, [sort $c_name, $m_name];
+}
+
 sub test_with_config {
     my ($config, %opts) = @_;
     my $msg = delete $opts{msg} || 'Built Model without exception';
@@ -159,9 +214,6 @@ sub test_with_config {
     ok $m, 'Has model';
     my $i = $m->ACCEPT_CONTEXT($ctx);
     ok $i, 'Has model instance from ACCEPT_CONTEXT';
-    isnt $i, $m, 'Model instance returned from ACCEPT_CONTEXT not same as model';
-    is $i, $m->ACCEPT_CONTEXT($ctx), 'Same model instance for same context';
-    isnt $i, $m->ACCEPT_CONTEXT($ctx_gen->()), 'Different model instance for different context';
     return $i;
 }