X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F26dump_use_moose.t;h=13104551ebb8c0689b04b1619c2f0ce5f6cf0842;hb=8de81918c82b582587eaeb905bac03deaeef9061;hp=ac1830cf6f9a330636c247f50229e22fe29a3e9f;hpb=74f213a5b308eb7b7d1fb9f980740801d5a8bf1e;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/t/26dump_use_moose.t b/t/26dump_use_moose.t
index ac1830c..1310455 100644
--- a/t/26dump_use_moose.t
+++ b/t/26dump_use_moose.t
@@ -126,39 +126,42 @@ $t->dump_test(
 );
 
 # add Moose custom content then check it is not repeated
-
+# after that regen again *without* the use_moose flag, make
+# sure moose isn't stripped away
 $t->append_to_class('DBICTest::DumpMore::1::Foo', qq{__PACKAGE__->meta->make_immutable;\n1;\n});
 
-$t->dump_test(
-  classname => 'DBICTest::DumpMore::1',
-  options => {
-    use_moose => 1,
-    result_base_class => 'My::ResultBaseClass',
-    schema_base_class => 'My::SchemaBaseClass',
-  },
-  warnings => [
-    qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
-    qr/Schema dump completed/,
-  ],
-  regexes => {
-    schema => [
-      qr/\nuse Moose;\nuse MooseX::NonMoose;\nuse namespace::autoclean;\nextends 'My::SchemaBaseClass';\n\n/,
-      qr/\n__PACKAGE__->meta->make_immutable;\n1;(?!\n1;\n)\n.*/,
-    ],
-    Foo => [
-      qr/\nuse Moose;\nuse MooseX::NonMoose;\nuse namespace::autoclean;\nextends 'My::ResultBaseClass';\n\n/,
-      qr/\n__PACKAGE__->meta->make_immutable;\n1;(?!\n1;\n)\n.*/,
-    ],
-    Bar => [
-      qr/\nuse Moose;\nuse MooseX::NonMoose;\nuse namespace::autoclean;\nextends 'My::ResultBaseClass';\n\n/,
-      qr/\n__PACKAGE__->meta->make_immutable;\n1;(?!\n1;\n)\n.*/,
-    ],
-  },
-  neg_regexes => {
-    Foo => [
-      qr/\n__PACKAGE__->meta->make_immutable;\n.*\n__PACKAGE__->meta->make_immutable;/s,
-    ],
-  },
-);
+for my $supply_use_moose (1, 0) {
+  $t->dump_test(
+    classname => 'DBICTest::DumpMore::1',
+    options => {
+      $supply_use_moose ? (use_moose => 1) : (),
+      result_base_class => 'My::ResultBaseClass',
+      schema_base_class => 'My::SchemaBaseClass',
+    },
+    warnings => [
+      qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
+      qr/Schema dump completed/,
+    ],
+    regexes => {
+      schema => [
+        qr/\nuse Moose;\nuse MooseX::NonMoose;\nuse namespace::autoclean;\nextends 'My::SchemaBaseClass';\n\n/,
+        qr/\n__PACKAGE__->meta->make_immutable;\n1;(?!\n1;\n)\n.*/,
+      ],
+      Foo => [
+        qr/\nuse Moose;\nuse MooseX::NonMoose;\nuse namespace::autoclean;\nextends 'My::ResultBaseClass';\n\n/,
+        qr/\n__PACKAGE__->meta->make_immutable;\n1;(?!\n1;\n)\n.*/,
+      ],
+      Bar => [
+        qr/\nuse Moose;\nuse MooseX::NonMoose;\nuse namespace::autoclean;\nextends 'My::ResultBaseClass';\n\n/,
+        qr/\n__PACKAGE__->meta->make_immutable;\n1;(?!\n1;\n)\n.*/,
+      ],
+    },
+    neg_regexes => {
+      Foo => [
+        qr/\n__PACKAGE__->meta->make_immutable;\n.*\n__PACKAGE__->meta->make_immutable;/s,
+      ],
+    },
+  );
+}
 
 done_testing;