adapt TestAppCustomContainer, not to break everything while it's not ready

diff --git a/t/lib/TestAppCustomContainer.pm b/t/lib/TestAppCustomContainer.pm
index eb57069..a70d3f0 100644 (file)
--- a/t/lib/TestAppCustomContainer.pm
+++ b/t/lib/TestAppCustomContainer.pm
@@ -4,6 +4,10 @@ use Catalyst;
 extends 'Catalyst';
 use namespace::autoclean;
 
+__PACKAGE__->config(
+    container_class => $ENV{TEST_APP_CURRENT_CONTAINER}
+) if $ENV{TEST_APP_CURRENT_CONTAINER};
+
 __PACKAGE__->setup;
 
 1;

diff --git a/t/lib/TestAppCustomContainer/Controller/Root.pm b/t/lib/TestAppCustomContainer/Controller/Root.pm
index 891a63a..f4b973a 100644 (file)
--- a/t/lib/TestAppCustomContainer/Controller/Root.pm
+++ b/t/lib/TestAppCustomContainer/Controller/Root.pm
@@ -2,6 +2,18 @@ package TestAppCustomContainer::Controller::Root;
 use Moose;
 BEGIN { extends 'Catalyst::Controller' }
 
+__PACKAGE__->config(namespace => '');
+
+sub container_class :Local {
+    my ($self, $c) = @_;
+    $c->res->body($c->config->{container_class});
+}
+
+sub container_isa :Local {
+    my ($self, $c) = @_;
+    $c->res->body(ref $c->container);
+}
+
 __PACKAGE__->meta->make_immutable;
 no Moose;
 1;

diff --git a/t/lib/TestAppCustomContainer/NoSugarContainer.pm b/t/lib/TestAppCustomContainer/NoSugarContainer.pm
index 8fb17eb..d9f3c68 100644 (file)
--- a/t/lib/TestAppCustomContainer/NoSugarContainer.pm
+++ b/t/lib/TestAppCustomContainer/NoSugarContainer.pm
@@ -11,7 +11,7 @@ sub BUILD {
         Catalyst::IOC::ConstructorInjection->new(
             name         => 'model_Baz',
             class        => 'TestAppCustomContainer::Model::Baz',
-            lifecycle    => 'InstancePerContext',
+#            lifecycle    => 'InstancePerContext',
             dependencies => [
                 depends_on( '/application_name' ),
                 depends_on( '/config' ),

diff --git a/t/lib/TestAppCustomContainer/SugarContainer.pm b/t/lib/TestAppCustomContainer/SugarContainer.pm
index 39e0c07..5643886 100644 (file)
--- a/t/lib/TestAppCustomContainer/SugarContainer.pm
+++ b/t/lib/TestAppCustomContainer/SugarContainer.pm
@@ -12,7 +12,7 @@ sub BUILD {
         Catalyst::IOC::ConstructorInjection->new(
             name         => 'model_Baz',
             class        => 'TestAppCustomContainer::Model::Baz',
-            lifecycle    => 'InstancePerContext',
+#            lifecycle    => 'InstancePerContext',
             dependencies => [
                 depends_on( '/application_name' ),
                 depends_on( '/config' ),