made tests pass, spreading FIXME's all over the place

[catagits/Catalyst-Runtime.git] / t / lib / TestCustomContainer.pm

diff --git a/t/lib/TestCustomContainer.pm b/t/lib/TestCustomContainer.pm
index d18e7a9..266b267 100644 (file)
--- a/t/lib/TestCustomContainer.pm
+++ b/t/lib/TestCustomContainer.pm
@@ -42,14 +42,12 @@ sub BUILD {
     is(get('/container_isa'), $self->container_class,   'and container isa our container class');
 
     {
-        # Foo ACCEPT_CONTEXT called twice - total: 2
-        # TestAppCustomContainer::Role::HoldsFoo COMPONENT
-        # and in the block injection
+        # Foo ACCEPT_CONTEXT called - total: 1
         ok(my ($res, $c) = ctx_request('/get_model_baz'), 'request');
         ok($res->is_success, 'request 2xx');
         is($res->content, 'TestAppCustomContainer::Model::Baz', 'content is expected');
 
-        ok(my $baz = $c->container->get_sub_container('component')->resolve(service => 'model_Baz'), 'fetching Baz');
+        ok(my $baz = $c->container->get_sub_container('model')->resolve(service => 'Baz', parameters => { ctx => $c, accept_context_args => [$c] } ), 'fetching Baz');
         isa_ok($baz, 'TestAppCustomContainer::Model::Baz');
         is($baz->accept_context_called, 1, 'ACCEPT_CONTEXT called');
         isa_ok($baz->foo, 'TestAppCustomContainer::Model::Foo', 'Baz got Foo ok');
@@ -58,14 +56,14 @@ sub BUILD {
         isa_ok($foo, 'TestAppCustomContainer::Model::Foo');
         is($foo->baz_got_it, 1, 'Baz accessed Foo once');
 
-        # Foo ACCEPT_CONTEXT called - total: 3
+        # Foo ACCEPT_CONTEXT called - total: 2
         ok(get('/get_model_baz'), 'another request');
-        is($baz->accept_context_called, 2, 'ACCEPT_CONTEXT called again');
+        is($baz->accept_context_called, 1, 'ACCEPT_CONTEXT not called again (instance per context)');
         is($foo->baz_got_it, 2, 'Baz accessed Foo again');
     }
 
     {
-        # Foo ACCEPT_CONTEXT called twice - total: 5
+        # Foo ACCEPT_CONTEXT called - total: 3
         ok(my ($res, $c) = ctx_request('/get_model_bar'), 'request');
         ok($res->is_success, 'request 2xx');
         is($res->content, 'TestAppCustomContainer::Model::Bar', 'content is expected');
@@ -81,21 +79,21 @@ sub BUILD {
         isa_ok($foo, 'TestAppCustomContainer::Model::Foo');
         is($foo->bar_got_it, 1, 'Bar accessed Foo once');
 
-        # Foo ACCEPT_CONTEXT *not* called - total: 5
+        # Foo ACCEPT_CONTEXT *not* called - total: 3
         ok(get('/get_model_bar'), 'another request');
         is($bar->accept_context_called, 1, 'ACCEPT_CONTEXT not called again (lifecycle is Singleton)');
         is($foo->bar_got_it, 1, 'Bar didn\'t access Foo again');
     }
 
     {
-        # Foo ACCEPT_CONTEXT called - total: 6
+        # Foo ACCEPT_CONTEXT called - total: 4
         ok(my ($res, $c) = ctx_request('/get_model_foo'), 'request');
         ok($res->is_success, 'request 2xx');
         is($res->content, 'TestAppCustomContainer::Model::Foo', 'content is expected');
 
         ok(my $foo = $c->container->get_sub_container('component')->resolve(service => 'model_Foo'), 'fetching Foo');
         isa_ok($foo, 'TestAppCustomContainer::Model::Foo');
-        is($foo->accept_context_called, 6, 'ACCEPT_CONTEXT called');
+        is($foo->accept_context_called, 4, 'ACCEPT_CONTEXT called');
         is($foo->bar_got_it, 1, 'Bar accessed Foo once');
         is($foo->baz_got_it, 2, 'Baz accessed Foo twice');
     }