fix some edge cases for use_moose option, and more tests

[dbsrgits/DBIx-Class-Schema-Loader.git] / t / 20invocations.t

diff --git a/t/20invocations.t b/t/20invocations.t
index 474133d..fe52379 100644 (file)
--- a/t/20invocations.t
+++ b/t/20invocations.t
@@ -104,7 +104,7 @@ my @invocations = (
         );
         DBICTest::Schema::12->clone;
     },
-    'skip_load_external_1' => sub {
+    'no_skip_load_external' => sub {
         # By default we should pull in t/lib/DBICTest/Schema/13/Foo.pm $skip_me since t/lib is in @INC
         use DBIx::Class::Schema::Loader;
         DBIx::Class::Schema::Loader::make_schema_at(
@@ -114,7 +114,7 @@ my @invocations = (
         );
         DBICTest::Schema::13->clone;
     },
-    'skip_load_external_2' => sub {
+    'skip_load_external' => sub {
         # When we explicitly skip_load_external t/lib/DBICTest/Schema/14/Foo.pm should be ignored
         use DBIx::Class::Schema::Loader;
         DBIx::Class::Schema::Loader::make_schema_at(
@@ -124,6 +124,15 @@ my @invocations = (
         );
         DBICTest::Schema::14->clone;
     },
+    'moose' => sub {
+        package DBICTest::Schema::8;
+        use base qw/ DBIx::Class::Schema::Loader /;
+        __PACKAGE__->naming('current');
+        __PACKAGE__->connect(
+            $make_dbictest_db::dsn,
+            { loader_options => { use_moose => 1 } }
+        );
+    },
 );
 
 # 4 tests per k/v pair
@@ -135,6 +144,11 @@ while(@invocations >= 2) {
     test_schema($style, &$subref);
 }
 
-is($DBICTest::Schema::13::Foo::skip_me, "bad mojo", "skip_load_external_1 skip_me");
-is($DBICTest::Schema::14::Foo::skip_me, undef,      "skip_load_external_2 skip_me");
+{
+    no warnings 'once';
 
+    is($DBICTest::Schema::13::Foo::skip_me, "bad mojo",
+        "external content loaded");
+    is($DBICTest::Schema::14::Foo::skip_me, undef,
+        "external content not loaded with skip_load_external => 1");
+}