From: gfx <gfuji@cpan.org>
Date: Mon, 21 Sep 2009 06:28:04 +0000 (+0900)
Subject: Merge branch 'master' into topic/more-compatible
X-Git-Tag: 0.32~28
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5bbb261757cccd44652d2f7530600bd2374e55be;p=gitmo%2FMouse.git

Merge branch 'master' into topic/more-compatible

Conflicts:
	t/800_shikabased/013-compatibility-get_method_list.t
---

5bbb261757cccd44652d2f7530600bd2374e55be
diff --cc t/800_shikabased/013-compatibility-get_method_list.t
index 4b5b124,735d5c3..f197ca6
--- a/t/800_shikabased/013-compatibility-get_method_list.t
+++ b/t/800_shikabased/013-compatibility-get_method_list.t
@@@ -1,20 -1,26 +1,22 @@@
  use strict;
  use warnings;
- use Test::More tests => 6;
+ use Test::More;
+ plan skip_all => "This test requires Moose 0.91" unless eval { require Moose; Moose->VERSION(0.91); };
+ plan tests => 6;
  
 -test($_) for qw/Moose Mouse/;
 -exit;
 -
 -sub test {
 -    my $class = shift;
 -    eval <<"...";
  {
 -    package ${class}Class;
 -    use ${class};
 +    package MouseClass;
 +    use Carp; # import external functions (not our methods)
 +    use Mouse;
      sub foo { }
 -    no ${class};
 +    no Mouse;
  }
  {
 -    package ${class}ClassImm;
 -    use ${class};
 +    package MouseClassImm;
 +    use Carp; # import external functions (not our methods)
 +    use Mouse;
      sub foo { }
 -    no ${class};
 +    no Mouse;
      __PACKAGE__->meta->make_immutable();
  }
  {