Merge branch 'master' into japanese

diff --git a/moose-class/exercises/t/00-prereq.t b/moose-class/exercises/t/00-prereq.t
index 9f9a778..122b89e 100644 (file)
--- a/moose-class/exercises/t/00-prereq.t
+++ b/moose-class/exercises/t/00-prereq.t
@@ -20,7 +20,7 @@ for my $mod ( keys %prereqs ) {
     }
 
     if ( $mod->VERSION < $prereqs{$mod} ) {
-        push @missing, "$mod must be version $prereqs{$mod} or greater";
+        push @missing, "$mod must be version $prereqs{$mod} or greater (you have " . $mod->VERSION . ")";
     }
 }
 

diff --git a/moose-class/exercises/t/lib/MooseClass/Tests.pm b/moose-class/exercises/t/lib/MooseClass/Tests.pm
index a8865e0..924c5db 100644 (file)
--- a/moose-class/exercises/t/lib/MooseClass/Tests.pm
+++ b/moose-class/exercises/t/lib/MooseClass/Tests.pm
@@ -260,7 +260,7 @@ sub has_meta {
     my $class = shift;
 
     ok( $class->can('meta'), "$class has a meta() method" )
-        or BAIL_OUT("Cannot run tests against a class without a meta!");
+        or BAIL_OUT("$class does not have a meta() method (did you forget to 'use Moose'?)");
 }
 
 sub check_isa {

diff --git a/moose-class/slides/index.html b/moose-class/slides/index.html
index e1e1445..7351420 100644 (file)
--- a/moose-class/slides/index.html
+++ b/moose-class/slides/index.html
@@ -1198,6 +1198,8 @@ use Moose;
 
 # perl bin/prove -lv t/01-classes.t
 
+# edit lib/Person.pm and lib/Employee.pm
+
 Iterate til this passes all its tests</pre>
 </div>