[Catalyst-commits] r12727 - in Catalyst-Runtime/5.80/trunk: lib/Catalyst t/aggregate

rafl at dev.catalyst.perl.org rafl at dev.catalyst.perl.org
Mon Jan 25 18:59:52 GMT 2010


Author: rafl
Date: 2010-01-25 18:59:52 +0000 (Mon, 25 Jan 2010)
New Revision: 12727

Modified:
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Component.pm
   Catalyst-Runtime/5.80/trunk/t/aggregate/unit_core_component.t
Log:
Revert "in what case is a numeric comparison called for? I cannot think of one. Is this the best way to test?"

This reverts commit 279b2f1abb0a8e056b8c905e5a4ecb66537ee194.

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Component.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Component.pm	2010-01-25 01:03:52 UTC (rev 12726)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Component.pm	2010-01-25 18:59:52 UTC (rev 12727)
@@ -84,7 +84,7 @@
         } elsif (Class::MOP::is_class_loaded($_[0]) &&
                 $_[0]->isa('Catalyst') && ref($_[1]) eq 'HASH') {
             $args = $_[1];
-        } elsif ($_[0] eq $_[1]) {
+        } elsif ($_[0] == $_[1]) {
             $args = $_[1];
         } else {
             $args = +{ @_ };

Modified: Catalyst-Runtime/5.80/trunk/t/aggregate/unit_core_component.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/aggregate/unit_core_component.t	2010-01-25 01:03:52 UTC (rev 12726)
+++ Catalyst-Runtime/5.80/trunk/t/aggregate/unit_core_component.t	2010-01-25 18:59:52 UTC (rev 12727)
@@ -1,4 +1,4 @@
-use Test::More tests => 23;
+use Test::More tests => 22;
 use strict;
 use warnings;
 
@@ -91,18 +91,3 @@
     is_deeply($args, [qw/foo3 bar3/], 'args passed to ACCEPT_CONTEXT ok');
 }
 
-# BUILDARGS logic
-{
-    {
-        package MyController;
-        @MyController::ISA = ('Catalyst::Controller');
-    }
-    my $warning;
-    local $SIG{__WARN__} = sub {
-        $warning = shift;
-        diag($warning);
-    };
-    my $controller = MyController->new('MyApp', undef);
-    like( $warning, qr/uninitialized value in string eq/, "no warning for == comparison");
-
-}




More information about the Catalyst-commits mailing list