Fix the logic somewhat

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

diff --git a/t/lib/TestAppCustomContainer/NoSugarContainer.pm b/t/lib/TestAppCustomContainer/NoSugarContainer.pm
index 55fdd83..cfb5e36 100644 (file)
--- a/t/lib/TestAppCustomContainer/NoSugarContainer.pm
+++ b/t/lib/TestAppCustomContainer/NoSugarContainer.pm
@@ -8,50 +8,19 @@ extends 'Catalyst::IOC::Container';
 sub BUILD {
     my $self = shift;
 
-    $self->get_sub_container('component')->add_service(
-        # Catalyst::IOC::ConstructorInjection gives the constructor the wrong
-        # parameters
-        Bread::Board::ConstructorInjection->new(
-            name             => 'model_Bar',
+    $self->get_sub_container('model')->add_service(
+        Catalyst::IOC::ConstructorInjection->new(
+            name             => 'Bar',
             lifecycle        => 'Singleton',
             class            => 'TestAppCustomContainer::Model::Bar',
-            constructor_name => 'new',
             dependencies     => {
                 application_name => depends_on( '/application_name' ),
                 config => depends_on( '/config' ),
-                foo => Bread::Board::Dependency->new(
-                    service_name => 'foo',
-                    service_path => '/model/Foo',
-
-                    # FIXME - obviously this is a mistake
-                    # what to do with ctx here?
-                    # I have no way to get $s here, do I?
-                    service_params => {
-                        ctx => +{},
-                        accept_context_args => [ +{} ],
-                    },
-                ),
-            },
-        )
-    );
-    $self->get_sub_container('model')->add_service(
-        Catalyst::IOC::BlockInjection->new(
-            name         => 'Bar',
-            lifecycle    => 'Singleton',
-            dependencies => [
-                depends_on( '/component/model_Bar' ),
-            ],
-            block => sub {
-                shift->param('model_Bar');
+                foo => depends_on('/model/Foo'),
             },
         )
     );
 
-    # FIXME - this is to avoid the default service to be added
-    # if that happened, the app would die
-    $self->get_sub_container('component')->add_service(
-        service model_Baz => 'TestAppCustomContainer::Model::Baz',
-    );
     $self->get_sub_container('model')->add_service(
         # FIXME - i think it should be a ConstructorInjection
         # but only BlockInjection gets ctx parameter