[Jifty-commit] r5608 - in jifty/trunk: . lib/Jifty/Test t/Continuations/t t/Mapper/t t/TestApp-JiftyJS/t t/TestApp-Plugin-AppPluginHasModels/t t/TestApp-Plugin-Attributes/t t/TestApp-Plugin-Chart/t t/TestApp-Plugin-Comments/t t/TestApp-Plugin-OnClick/t t/TestApp-Plugin-PasswordAuth/t t/TestApp-Plugin-REST/t t/TestApp-Plugin-SinglePage/t t/TestApp/t t/TestApp/t/config t/lib

Jifty commits jifty-commit at lists.jifty.org
Tue Jul 29 13:26:03 EDT 2008


Author: alexmv
Date: Tue Jul 29 13:26:02 2008
New Revision: 5608

Added:
   jifty/trunk/lib/Jifty/Test/Dist.pm
      - copied, changed from r4221, /jifty/trunk/t/lib/Jifty/SubTest.pm
Removed:
   jifty/trunk/t/lib/
Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/MANIFEST
   jifty/trunk/MANIFEST.SKIP
   jifty/trunk/t/Continuations/t/00-prototype.t
   jifty/trunk/t/Continuations/t/01-raw-api.t
   jifty/trunk/t/Continuations/t/02-api.t
   jifty/trunk/t/Continuations/t/03-gc.t
   jifty/trunk/t/Continuations/t/04-before-blocks.t
   jifty/trunk/t/Mapper/t/00-prototype.t
   jifty/trunk/t/Mapper/t/01-raw-api.t
   jifty/trunk/t/Mapper/t/02-api.t
   jifty/trunk/t/TestApp-JiftyJS/t/00-action-AddTwoNumbers.t
   jifty/trunk/t/TestApp-JiftyJS/t/00-action-Play.t
   jifty/trunk/t/TestApp-JiftyJS/t/00-action-Play2.t
   jifty/trunk/t/TestApp-JiftyJS/t/00-model-Offer.t
   jifty/trunk/t/TestApp-JiftyJS/t/1-jifty-update.t
   jifty/trunk/t/TestApp-JiftyJS/t/2-behaviour.t
   jifty/trunk/t/TestApp-JiftyJS/t/3-continuation.t
   jifty/trunk/t/TestApp-JiftyJS/t/4-tangent.t
   jifty/trunk/t/TestApp-JiftyJS/t/5-action.t
   jifty/trunk/t/TestApp-JiftyJS/t/6-offer-actions.t
   jifty/trunk/t/TestApp-JiftyJS/t/7-redirect.t
   jifty/trunk/t/TestApp-JiftyJS/t/8-placeholder.t
   jifty/trunk/t/TestApp-Plugin-AppPluginHasModels/t/app-model-ref.t
   jifty/trunk/t/TestApp-Plugin-AppPluginHasModels/t/app-model.t
   jifty/trunk/t/TestApp-Plugin-AppPluginHasModels/t/plugin-model.t
   jifty/trunk/t/TestApp-Plugin-Attributes/t/00-basic.t
   jifty/trunk/t/TestApp-Plugin-Attributes/t/01-content.t
   jifty/trunk/t/TestApp-Plugin-Attributes/t/02-crud-methods.t
   jifty/trunk/t/TestApp-Plugin-Attributes/t/03-permissions.t
   jifty/trunk/t/TestApp-Plugin-Attributes/t/04-delete.t
   jifty/trunk/t/TestApp-Plugin-Chart/t/chart.t
   jifty/trunk/t/TestApp-Plugin-Chart/t/gd_graph.t
   jifty/trunk/t/TestApp-Plugin-Comments/t/00-model-BlogPost.t
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/t/css.t
   jifty/trunk/t/TestApp-Plugin-OnClick/t/onclick.t
   jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/00-model-User.t
   jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/01-tokengen.t
   jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/11-current_user.t
   jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/12-i18n.t
   jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/12-signup.t
   jifty/trunk/t/TestApp-Plugin-REST/t/00-model-User.t
   jifty/trunk/t/TestApp-Plugin-REST/t/00-prototype.t
   jifty/trunk/t/TestApp-Plugin-REST/t/02-basic-use.t
   jifty/trunk/t/TestApp-Plugin-SinglePage/t/history.t
   jifty/trunk/t/TestApp-Plugin-SinglePage/t/statevar.t
   jifty/trunk/t/TestApp/t/00-model-User.t
   jifty/trunk/t/TestApp/t/00-prototype.t
   jifty/trunk/t/TestApp/t/02-dispatch-http.t
   jifty/trunk/t/TestApp/t/02-dispatch-https.t
   jifty/trunk/t/TestApp/t/02-dispatch-show-rule-in-wrong-ruleset.t
   jifty/trunk/t/TestApp/t/02-dispatch.t
   jifty/trunk/t/TestApp/t/03-static.t
   jifty/trunk/t/TestApp/t/04-sessions.t
   jifty/trunk/t/TestApp/t/05-editactions-Cachable.t
   jifty/trunk/t/TestApp/t/05-editactions-Record.t
   jifty/trunk/t/TestApp/t/06-validation.t
   jifty/trunk/t/TestApp/t/07-sandboxing.t
   jifty/trunk/t/TestApp/t/08-notifications.t
   jifty/trunk/t/TestApp/t/09-redirect.t
   jifty/trunk/t/TestApp/t/10-compress.t
   jifty/trunk/t/TestApp/t/11-current_user.t
   jifty/trunk/t/TestApp/t/12-search.t
   jifty/trunk/t/TestApp/t/13-page-regions.t
   jifty/trunk/t/TestApp/t/14-template-paths.t
   jifty/trunk/t/TestApp/t/15-template-subclass.t
   jifty/trunk/t/TestApp/t/16-template-region.t
   jifty/trunk/t/TestApp/t/17-template-region-internal-redirect.t
   jifty/trunk/t/TestApp/t/18-test-www-declare.t
   jifty/trunk/t/TestApp/t/19-rightsfrom.t
   jifty/trunk/t/TestApp/t/20-error-pages.t
   jifty/trunk/t/TestApp/t/21-js-arguments.t
   jifty/trunk/t/TestApp/t/22-execute-action.t
   jifty/trunk/t/TestApp/t/23-extend-update-action.t
   jifty/trunk/t/TestApp/t/24-extend-create-action.t
   jifty/trunk/t/TestApp/t/before_access.t
   jifty/trunk/t/TestApp/t/config/01-basic.t
   jifty/trunk/t/TestApp/t/config/02-individual.t
   jifty/trunk/t/TestApp/t/crud.t
   jifty/trunk/t/TestApp/t/i18n-standalone.t
   jifty/trunk/t/TestApp/t/instance_id.t
   jifty/trunk/t/TestApp/t/regex_meta_in_path_info.t
   jifty/trunk/t/TestApp/t/upgrade.t
   jifty/trunk/t/TestApp/t/use_mason_wrapper.t

Log:
 r34906 at kohr-ah:  chmrr | 2008-07-29 13:24:39 -0400
  * Move t/lib/Jifty/SubTest.pm to lib/Jifty/Test/Dist.pm
  * Make it descend from Jifty::Test, so you don't need to use both


Modified: jifty/trunk/MANIFEST
==============================================================================
--- jifty/trunk/MANIFEST	(original)
+++ jifty/trunk/MANIFEST	Tue Jul 29 13:26:02 2008
@@ -342,6 +342,7 @@
 lib/Jifty/Subs.pm
 lib/Jifty/Subs/Render.pm
 lib/Jifty/Test.pm
+lib/Jifty/Test/Dist.pm
 lib/Jifty/Test/WWW/Declare.pm
 lib/Jifty/Test/WWW/Mechanize.pm
 lib/Jifty/Test/WWW/Selenium.pm
@@ -1160,7 +1161,6 @@
 t/Continuations/t/04-before-blocks.t
 t/DateTime.t
 t/Jifty.pm
-t/lib/Jifty/SubTest.pm
 t/Mapper/bin/jifty
 t/Mapper/lib/Mapper/Action/CrossBridge.pm
 t/Mapper/lib/Mapper/Action/GetGrail.pm

Modified: jifty/trunk/MANIFEST.SKIP
==============================================================================
--- jifty/trunk/MANIFEST.SKIP	(original)
+++ jifty/trunk/MANIFEST.SKIP	Tue Jul 29 13:26:02 2008
@@ -2,9 +2,6 @@
 \bCVS\b
 \b.svn\b
 ~$
-t/lib/File/
-t/Big-Dummy
-t/Problem-Module
 .gz$
 .bak$
 Makefile$

Copied: jifty/trunk/lib/Jifty/Test/Dist.pm (from r4221, /jifty/trunk/t/lib/Jifty/SubTest.pm)
==============================================================================
--- /jifty/trunk/t/lib/Jifty/SubTest.pm	(original)
+++ jifty/trunk/lib/Jifty/Test/Dist.pm	Tue Jul 29 13:26:02 2008
@@ -1,17 +1,35 @@
-package Jifty::SubTest;
+package Jifty::Test::Dist;
 
 use FindBin;
 use File::Spec;
 use Cwd;
 
 BEGIN {
-    $Jifty::SubTest::OrigCwd = Cwd::cwd;
+    $Jifty::Test::Dist::OrigCwd = Cwd::cwd;
 
     @INC = grep { defined } map { ref($_) ? $_ : File::Spec->rel2abs($_) } @INC;
     chdir "$FindBin::Bin/..";
 }
 
 use lib 'lib';
+use base qw/Jifty::Test/;
+
+=head1 NAME
+
+Jifty::Test::Dist - Tests in Jifty distributions inside of Jifty
+
+=head1 SYNOPSIS
+
+    use Jifty::Test::Dist tests => 5;
+
+=head1 DESCRIPTION
+
+Jifty::Test::Dist is a utility wrapper around L<Jifty::Test>; it
+changes the current working directory to be the one step above where
+the test file is, so that Jifty will detect the correct application
+root for the tests.
+
+=cut
 
 1;
 

Modified: jifty/trunk/t/Continuations/t/00-prototype.t
==============================================================================
--- jifty/trunk/t/Continuations/t/00-prototype.t	(original)
+++ jifty/trunk/t/Continuations/t/00-prototype.t	Tue Jul 29 13:26:02 2008
@@ -9,10 +9,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 1;
+use Jifty::Test::Dist tests => 1;
 
 ok(1, "Loaded the test script");
 1;

Modified: jifty/trunk/t/Continuations/t/01-raw-api.t
==============================================================================
--- jifty/trunk/t/Continuations/t/01-raw-api.t	(original)
+++ jifty/trunk/t/Continuations/t/01-raw-api.t	Tue Jul 29 13:26:02 2008
@@ -9,10 +9,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-use lib '../lib';
-use Jifty::Test tests => 47;
+use Jifty::Test::Dist tests => 47;
 
 use_ok('Jifty::Test::WWW::Mechanize');
 

Modified: jifty/trunk/t/Continuations/t/02-api.t
==============================================================================
--- jifty/trunk/t/Continuations/t/02-api.t	(original)
+++ jifty/trunk/t/Continuations/t/02-api.t	Tue Jul 29 13:26:02 2008
@@ -9,10 +9,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-use lib '../lib';
-use Jifty::Test tests => 31;
+use Jifty::Test::Dist tests => 31;
 
 use_ok('Jifty::Test::WWW::Mechanize');
 

Modified: jifty/trunk/t/Continuations/t/03-gc.t
==============================================================================
--- jifty/trunk/t/Continuations/t/03-gc.t	(original)
+++ jifty/trunk/t/Continuations/t/03-gc.t	Tue Jul 29 13:26:02 2008
@@ -4,10 +4,7 @@
 use strict;
 
 # {{{ Setup
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test;
+use Jifty::Test::Dist;
 
 plan skip_all => "test file not done yet";
 

Modified: jifty/trunk/t/Continuations/t/04-before-blocks.t
==============================================================================
--- jifty/trunk/t/Continuations/t/04-before-blocks.t	(original)
+++ jifty/trunk/t/Continuations/t/04-before-blocks.t	Tue Jul 29 13:26:02 2008
@@ -10,10 +10,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 9;
+use Jifty::Test::Dist tests => 9;
 
 use_ok('Jifty::Test::WWW::Mechanize');
 

Modified: jifty/trunk/t/Mapper/t/00-prototype.t
==============================================================================
--- jifty/trunk/t/Mapper/t/00-prototype.t	(original)
+++ jifty/trunk/t/Mapper/t/00-prototype.t	Tue Jul 29 13:26:02 2008
@@ -9,10 +9,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 1;
+use Jifty::Test::Dist tests => 1;
 
 ok(1, "Loaded the test script");
 1;

Modified: jifty/trunk/t/Mapper/t/01-raw-api.t
==============================================================================
--- jifty/trunk/t/Mapper/t/01-raw-api.t	(original)
+++ jifty/trunk/t/Mapper/t/01-raw-api.t	Tue Jul 29 13:26:02 2008
@@ -9,10 +9,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 32;
+use Jifty::Test::Dist tests => 32;
 use_ok('Jifty::Test::WWW::Mechanize');
 
 # Set up server

Modified: jifty/trunk/t/Mapper/t/02-api.t
==============================================================================
--- jifty/trunk/t/Mapper/t/02-api.t	(original)
+++ jifty/trunk/t/Mapper/t/02-api.t	Tue Jul 29 13:26:02 2008
@@ -9,10 +9,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 13;
+use Jifty::Test::Dist tests => 13;
 
 use_ok('Jifty::Test::WWW::Mechanize');
 

Modified: jifty/trunk/t/TestApp-JiftyJS/t/00-action-AddTwoNumbers.t
==============================================================================
--- jifty/trunk/t/TestApp-JiftyJS/t/00-action-AddTwoNumbers.t	(original)
+++ jifty/trunk/t/TestApp-JiftyJS/t/00-action-AddTwoNumbers.t	Tue Jul 29 13:26:02 2008
@@ -8,9 +8,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 1;
+use Jifty::Test::Dist tests => 1;
 
 # Make sure we can load the action
 use_ok('TestApp::JiftyJS::Action::AddTwoNumbers');

Modified: jifty/trunk/t/TestApp-JiftyJS/t/00-action-Play.t
==============================================================================
--- jifty/trunk/t/TestApp-JiftyJS/t/00-action-Play.t	(original)
+++ jifty/trunk/t/TestApp-JiftyJS/t/00-action-Play.t	Tue Jul 29 13:26:02 2008
@@ -8,9 +8,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 1;
+use Jifty::Test::Dist tests => 1;
 
 # Make sure we can load the action
 use_ok('TestApp::JiftyJS::Action::Play');

Modified: jifty/trunk/t/TestApp-JiftyJS/t/00-action-Play2.t
==============================================================================
--- jifty/trunk/t/TestApp-JiftyJS/t/00-action-Play2.t	(original)
+++ jifty/trunk/t/TestApp-JiftyJS/t/00-action-Play2.t	Tue Jul 29 13:26:02 2008
@@ -8,9 +8,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 1;
+use Jifty::Test::Dist tests => 1;
 
 # Make sure we can load the action
 use_ok('TestApp::JiftyJS::Action::Play2');

Modified: jifty/trunk/t/TestApp-JiftyJS/t/00-model-Offer.t
==============================================================================
--- jifty/trunk/t/TestApp-JiftyJS/t/00-model-Offer.t	(original)
+++ jifty/trunk/t/TestApp-JiftyJS/t/00-model-Offer.t	Tue Jul 29 13:26:02 2008
@@ -8,9 +8,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 11;
+use Jifty::Test::Dist tests => 11;
 
 # Make sure we can load the model
 use_ok('TestApp::JiftyJS::Model::Offer');

Modified: jifty/trunk/t/TestApp-JiftyJS/t/1-jifty-update.t
==============================================================================
--- jifty/trunk/t/TestApp-JiftyJS/t/1-jifty-update.t	(original)
+++ jifty/trunk/t/TestApp-JiftyJS/t/1-jifty-update.t	Tue Jul 29 13:26:02 2008
@@ -2,9 +2,7 @@
 
 use strict;
 use warnings;
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 29;
+use Jifty::Test::Dist tests => 29;
 use Jifty::Test::WWW::Selenium;
 use utf8;
 

Modified: jifty/trunk/t/TestApp-JiftyJS/t/2-behaviour.t
==============================================================================
--- jifty/trunk/t/TestApp-JiftyJS/t/2-behaviour.t	(original)
+++ jifty/trunk/t/TestApp-JiftyJS/t/2-behaviour.t	Tue Jul 29 13:26:02 2008
@@ -2,9 +2,7 @@
 
 use strict;
 use warnings;
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test qw(no_plan);
+use Jifty::Test::Dist qw(no_plan);
 use Jifty::Test::WWW::Selenium;
 use utf8;
 

Modified: jifty/trunk/t/TestApp-JiftyJS/t/3-continuation.t
==============================================================================
--- jifty/trunk/t/TestApp-JiftyJS/t/3-continuation.t	(original)
+++ jifty/trunk/t/TestApp-JiftyJS/t/3-continuation.t	Tue Jul 29 13:26:02 2008
@@ -2,9 +2,7 @@
 
 use strict;
 use warnings;
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 24;
+use Jifty::Test::Dist tests => 24;
 use Jifty::Test::WWW::Selenium;
 use utf8;
 

Modified: jifty/trunk/t/TestApp-JiftyJS/t/4-tangent.t
==============================================================================
--- jifty/trunk/t/TestApp-JiftyJS/t/4-tangent.t	(original)
+++ jifty/trunk/t/TestApp-JiftyJS/t/4-tangent.t	Tue Jul 29 13:26:02 2008
@@ -2,9 +2,7 @@
 
 use strict;
 use warnings;
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 17;
+use Jifty::Test::Dist tests => 17;
 use Jifty::Test::WWW::Selenium;
 use utf8;
 

Modified: jifty/trunk/t/TestApp-JiftyJS/t/5-action.t
==============================================================================
--- jifty/trunk/t/TestApp-JiftyJS/t/5-action.t	(original)
+++ jifty/trunk/t/TestApp-JiftyJS/t/5-action.t	Tue Jul 29 13:26:02 2008
@@ -2,9 +2,7 @@
 
 use strict;
 use warnings;
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test;
+use Jifty::Test::Dist;
 use Jifty::Test::WWW::Selenium;
 use utf8;
 

Modified: jifty/trunk/t/TestApp-JiftyJS/t/6-offer-actions.t
==============================================================================
--- jifty/trunk/t/TestApp-JiftyJS/t/6-offer-actions.t	(original)
+++ jifty/trunk/t/TestApp-JiftyJS/t/6-offer-actions.t	Tue Jul 29 13:26:02 2008
@@ -2,9 +2,7 @@
 
 use strict;
 use warnings;
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test;;
+use Jifty::Test::Dist;
 use Jifty::Test::WWW::Selenium;
 use utf8;
 

Modified: jifty/trunk/t/TestApp-JiftyJS/t/7-redirect.t
==============================================================================
--- jifty/trunk/t/TestApp-JiftyJS/t/7-redirect.t	(original)
+++ jifty/trunk/t/TestApp-JiftyJS/t/7-redirect.t	Tue Jul 29 13:26:02 2008
@@ -2,9 +2,7 @@
 
 use strict;
 use warnings;
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test;;
+use Jifty::Test::Dist;
 use Jifty::Test::WWW::Selenium;
 use utf8;
 

Modified: jifty/trunk/t/TestApp-JiftyJS/t/8-placeholder.t
==============================================================================
--- jifty/trunk/t/TestApp-JiftyJS/t/8-placeholder.t	(original)
+++ jifty/trunk/t/TestApp-JiftyJS/t/8-placeholder.t	Tue Jul 29 13:26:02 2008
@@ -2,9 +2,7 @@
 
 use strict;
 use warnings;
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test;
+use Jifty::Test::Dist;
 use Jifty::Test::WWW::Selenium;
 use utf8;
 

Modified: jifty/trunk/t/TestApp-Plugin-AppPluginHasModels/t/app-model-ref.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-AppPluginHasModels/t/app-model-ref.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-AppPluginHasModels/t/app-model-ref.t	Tue Jul 29 13:26:02 2008
@@ -8,9 +8,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 20;
+use Jifty::Test::Dist tests => 20;
 
 # Make sure we can load the model
 use_ok('TestApp::Plugin::AppPluginHasModels::Model::Wallpaper');

Modified: jifty/trunk/t/TestApp-Plugin-AppPluginHasModels/t/app-model.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-AppPluginHasModels/t/app-model.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-AppPluginHasModels/t/app-model.t	Tue Jul 29 13:26:02 2008
@@ -8,9 +8,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 16;
+use Jifty::Test::Dist tests => 16;
 
 # Make sure we can load the model
 use_ok('TestApp::Plugin::AppPluginHasModels::Model::Color');

Modified: jifty/trunk/t/TestApp-Plugin-AppPluginHasModels/t/plugin-model.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-AppPluginHasModels/t/plugin-model.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-AppPluginHasModels/t/plugin-model.t	Tue Jul 29 13:26:02 2008
@@ -8,9 +8,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 12;
+use Jifty::Test::Dist tests => 12;
 
 # Make sure we can load the model
 use_ok('TestApp::Plugin::AppPluginHasModels::Plugin::MyAppPlugin::Model::Color');

Modified: jifty/trunk/t/TestApp-Plugin-Attributes/t/00-basic.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-Attributes/t/00-basic.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-Attributes/t/00-basic.t	Tue Jul 29 13:26:02 2008
@@ -1,9 +1,7 @@
 #!/usr/bin/env perl
 use warnings;
 use strict;
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 12;
+use Jifty::Test::Dist tests => 12;
 
 my $song = TestApp::Plugin::Attributes::Model::Song->new;
 my ($ok, $msg) = $song->create(

Modified: jifty/trunk/t/TestApp-Plugin-Attributes/t/01-content.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-Attributes/t/01-content.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-Attributes/t/01-content.t	Tue Jul 29 13:26:02 2008
@@ -1,9 +1,7 @@
 #!/usr/bin/env perl
 use warnings;
 use strict;
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 7;
+use Jifty::Test::Dist tests => 7;
 
 my $song = TestApp::Plugin::Attributes::Model::Song->new;
 my ($ok, $msg) = $song->create(

Modified: jifty/trunk/t/TestApp-Plugin-Attributes/t/02-crud-methods.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-Attributes/t/02-crud-methods.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-Attributes/t/02-crud-methods.t	Tue Jul 29 13:26:02 2008
@@ -1,9 +1,7 @@
 #!/usr/bin/env perl
 use warnings;
 use strict;
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 8;
+use Jifty::Test::Dist tests => 8;
 
 my $song = TestApp::Plugin::Attributes::Model::Song->new;
 my ($ok, $msg) = $song->create(

Modified: jifty/trunk/t/TestApp-Plugin-Attributes/t/03-permissions.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-Attributes/t/03-permissions.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-Attributes/t/03-permissions.t	Tue Jul 29 13:26:02 2008
@@ -1,9 +1,7 @@
 #!/usr/bin/env perl
 use warnings;
 use strict;
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 30;
+use Jifty::Test::Dist tests => 30;
 
 my $song = TestApp::Plugin::Attributes::Model::Song->new;
 my ($ok, $msg) = $song->create(

Modified: jifty/trunk/t/TestApp-Plugin-Attributes/t/04-delete.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-Attributes/t/04-delete.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-Attributes/t/04-delete.t	Tue Jul 29 13:26:02 2008
@@ -1,9 +1,7 @@
 #!/usr/bin/env perl
 use warnings;
 use strict;
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 8;
+use Jifty::Test::Dist tests => 8;
 
 my $song = TestApp::Plugin::Attributes::Model::Song->new;
 my ($ok, $msg) = $song->create(

Modified: jifty/trunk/t/TestApp-Plugin-Chart/t/chart.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-Chart/t/chart.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-Chart/t/chart.t	Tue Jul 29 13:26:02 2008
@@ -2,8 +2,6 @@
 use strict;
 use warnings;
 
-use lib 't/lib';
-
 # XXX FIXME This is here to prevent a segfault on my machine during testing.
 #   -- sterling
 use Test::More;
@@ -15,8 +13,7 @@
     plan tests => 9;
 }
 
-use Jifty::SubTest;
-use Jifty::Test;
+use Jifty::Test::Dist;
 use Jifty::Test::WWW::Mechanize;
 
 use Jifty::Plugin::Chart::Renderer::Chart;

Modified: jifty/trunk/t/TestApp-Plugin-Chart/t/gd_graph.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-Chart/t/gd_graph.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-Chart/t/gd_graph.t	Tue Jul 29 13:26:02 2008
@@ -2,8 +2,6 @@
 use strict;
 use warnings;
 
-use lib 't/lib';
-
 # XXX FIXME This is here to prevent a segfault on my machine during testing.
 #   -- sterling
 use Test::More;
@@ -15,8 +13,7 @@
     plan tests => 9;
 }
 
-use Jifty::SubTest;
-use Jifty::Test;
+use Jifty::Test::Dist;
 use Jifty::Test::WWW::Mechanize;
 
 use Jifty::Plugin::Chart::Renderer::GD::Graph;

Modified: jifty/trunk/t/TestApp-Plugin-Comments/t/00-model-BlogPost.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-Comments/t/00-model-BlogPost.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-Comments/t/00-model-BlogPost.t	Tue Jul 29 13:26:02 2008
@@ -18,10 +18,7 @@
     }
 }
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test;
+use Jifty::Test::Dist;
 
 # Make sure we can load the model
 use_ok('TestApp::Plugin::Comments::Model::BlogPost');

Modified: jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/t/css.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/t/css.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/t/css.t	Tue Jul 29 13:26:02 2008
@@ -1,8 +1,6 @@
 use strict;
 use warnings;
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 7;
+use Jifty::Test::Dist tests => 7;
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;

Modified: jifty/trunk/t/TestApp-Plugin-OnClick/t/onclick.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-OnClick/t/onclick.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-OnClick/t/onclick.t	Tue Jul 29 13:26:02 2008
@@ -1,8 +1,6 @@
 use strict;
 use warnings;
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 10;
+use Jifty::Test::Dist tests => 10;
 use Jifty::Test::WWW::Selenium;
 use utf8;
 

Modified: jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/00-model-User.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/00-model-User.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/00-model-User.t	Tue Jul 29 13:26:02 2008
@@ -8,10 +8,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 24;
+use Jifty::Test::Dist tests => 24;
 
 # force to use English handle to compare strings successfully
 Jifty::I18N->get_language_handle('en');

Modified: jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/01-tokengen.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/01-tokengen.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/01-tokengen.t	Tue Jul 29 13:26:02 2008
@@ -9,11 +9,7 @@
 
 =cut
 
-
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 5;
+use Jifty::Test::Dist tests => 5;
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;

Modified: jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/11-current_user.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/11-current_user.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/11-current_user.t	Tue Jul 29 13:26:02 2008
@@ -8,10 +8,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 14;
+use Jifty::Test::Dist tests => 14;
 #use Jifty::Test::WWW::Mechanize;
 
 use_ok('TestApp::Plugin::PasswordAuth::Model::User');

Modified: jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/12-i18n.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/12-i18n.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/12-i18n.t	Tue Jul 29 13:26:02 2008
@@ -8,10 +8,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 7;
+use Jifty::Test::Dist tests => 7;
 use Jifty::Test::WWW::Mechanize;
 
 use Encode 'decode';

Modified: jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/12-signup.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/12-signup.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-PasswordAuth/t/12-signup.t	Tue Jul 29 13:26:02 2008
@@ -9,11 +9,7 @@
 
 =cut
 
-
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 5;
+use Jifty::Test::Dist tests => 5;
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;

Modified: jifty/trunk/t/TestApp-Plugin-REST/t/00-model-User.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-REST/t/00-model-User.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-REST/t/00-model-User.t	Tue Jul 29 13:26:02 2008
@@ -8,11 +8,7 @@
 
 =cut
 
-
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 12;
+use Jifty::Test::Dist tests => 12;
 # Make sure we can load the model
 use_ok('TestApp::Plugin::REST::Model::User');
 

Modified: jifty/trunk/t/TestApp-Plugin-REST/t/00-prototype.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-REST/t/00-prototype.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-REST/t/00-prototype.t	Tue Jul 29 13:26:02 2008
@@ -9,10 +9,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 1;
+use Jifty::Test::Dist tests => 1;
 
 ok(1, "Loaded the test script");
 1;

Modified: jifty/trunk/t/TestApp-Plugin-REST/t/02-basic-use.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-REST/t/02-basic-use.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-REST/t/02-basic-use.t	Tue Jul 29 13:26:02 2008
@@ -9,11 +9,7 @@
 
 =cut
 
-
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 82;
+use Jifty::Test::Dist tests => 82;
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;

Modified: jifty/trunk/t/TestApp-Plugin-SinglePage/t/history.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-SinglePage/t/history.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-SinglePage/t/history.t	Tue Jul 29 13:26:02 2008
@@ -1,8 +1,6 @@
 use strict;
 use warnings;
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 10;
+use Jifty::Test::Dist tests => 10;
 use Jifty::Test::WWW::Selenium;
 use utf8;
 

Modified: jifty/trunk/t/TestApp-Plugin-SinglePage/t/statevar.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-SinglePage/t/statevar.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-SinglePage/t/statevar.t	Tue Jul 29 13:26:02 2008
@@ -1,8 +1,6 @@
 use strict;
 use warnings;
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 6;
+use Jifty::Test::Dist tests => 6;
 use Jifty::Test::WWW::Selenium;
 use utf8;
 

Modified: jifty/trunk/t/TestApp/t/00-model-User.t
==============================================================================
--- jifty/trunk/t/TestApp/t/00-model-User.t	(original)
+++ jifty/trunk/t/TestApp/t/00-model-User.t	Tue Jul 29 13:26:02 2008
@@ -8,10 +8,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 24;
+use Jifty::Test::Dist tests => 24;
 Jifty::Test->web; # initialize for use with the as_*_action tests
 # Make sure we can load the model
 use_ok('TestApp::Model::User');

Modified: jifty/trunk/t/TestApp/t/00-prototype.t
==============================================================================
--- jifty/trunk/t/TestApp/t/00-prototype.t	(original)
+++ jifty/trunk/t/TestApp/t/00-prototype.t	Tue Jul 29 13:26:02 2008
@@ -9,10 +9,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 1;
+use Jifty::Test::Dist tests => 1;
 
 ok(1, "Loaded the test script");
 1;

Modified: jifty/trunk/t/TestApp/t/02-dispatch-http.t
==============================================================================
--- jifty/trunk/t/TestApp/t/02-dispatch-http.t	(original)
+++ jifty/trunk/t/TestApp/t/02-dispatch-http.t	Tue Jul 29 13:26:02 2008
@@ -5,9 +5,7 @@
 # Just in case
 BEGIN { delete $ENV{HTTPS}; }
 
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 5;
+use Jifty::Test::Dist tests => 5;
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;

Modified: jifty/trunk/t/TestApp/t/02-dispatch-https.t
==============================================================================
--- jifty/trunk/t/TestApp/t/02-dispatch-https.t	(original)
+++ jifty/trunk/t/TestApp/t/02-dispatch-https.t	Tue Jul 29 13:26:02 2008
@@ -4,9 +4,7 @@
 
 BEGIN { $ENV{HTTPS} = 1; }
 
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 6;
+use Jifty::Test::Dist tests => 6;
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;

Modified: jifty/trunk/t/TestApp/t/02-dispatch-show-rule-in-wrong-ruleset.t
==============================================================================
--- jifty/trunk/t/TestApp/t/02-dispatch-show-rule-in-wrong-ruleset.t	(original)
+++ jifty/trunk/t/TestApp/t/02-dispatch-show-rule-in-wrong-ruleset.t	Tue Jul 29 13:26:02 2008
@@ -2,9 +2,7 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 8;
+use Jifty::Test::Dist tests => 8;
 use Jifty::Test::WWW::Mechanize;
 use Test::Log4perl;
 

Modified: jifty/trunk/t/TestApp/t/02-dispatch.t
==============================================================================
--- jifty/trunk/t/TestApp/t/02-dispatch.t	(original)
+++ jifty/trunk/t/TestApp/t/02-dispatch.t	Tue Jul 29 13:26:02 2008
@@ -2,9 +2,7 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 29;
+use Jifty::Test::Dist tests => 29;
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;

Modified: jifty/trunk/t/TestApp/t/03-static.t
==============================================================================
--- jifty/trunk/t/TestApp/t/03-static.t	(original)
+++ jifty/trunk/t/TestApp/t/03-static.t	Tue Jul 29 13:26:02 2008
@@ -2,10 +2,7 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 6;
+use Jifty::Test::Dist tests => 6;
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;

Modified: jifty/trunk/t/TestApp/t/04-sessions.t
==============================================================================
--- jifty/trunk/t/TestApp/t/04-sessions.t	(original)
+++ jifty/trunk/t/TestApp/t/04-sessions.t	Tue Jul 29 13:26:02 2008
@@ -3,10 +3,7 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 11;
+use Jifty::Test::Dist tests => 11;
 
 use_ok('Jifty');
 Jifty->new();

Modified: jifty/trunk/t/TestApp/t/05-editactions-Cachable.t
==============================================================================
--- jifty/trunk/t/TestApp/t/05-editactions-Cachable.t	(original)
+++ jifty/trunk/t/TestApp/t/05-editactions-Cachable.t	Tue Jul 29 13:26:02 2008
@@ -3,11 +3,8 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-use Jifty::SubTest;
 BEGIN { $ENV{'JIFTY_CONFIG'} = 't/config-Cachable' }
-
-use Jifty::Test tests => 7;
+use Jifty::Test::Dist tests => 7;
 use Jifty::Test::WWW::Mechanize;
 
 # Make sure we can load the model

Modified: jifty/trunk/t/TestApp/t/05-editactions-Record.t
==============================================================================
--- jifty/trunk/t/TestApp/t/05-editactions-Record.t	(original)
+++ jifty/trunk/t/TestApp/t/05-editactions-Record.t	Tue Jul 29 13:26:02 2008
@@ -3,11 +3,8 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-use Jifty::SubTest;
 BEGIN { $ENV{'JIFTY_CONFIG'} = 't/config-Record' }
-
-use Jifty::Test tests => 10;
+use Jifty::Test::Dist tests => 10;
 use Jifty::Test::WWW::Mechanize;
 # Make sure we can load the model
 use_ok('TestApp::Model::User');

Modified: jifty/trunk/t/TestApp/t/06-validation.t
==============================================================================
--- jifty/trunk/t/TestApp/t/06-validation.t	(original)
+++ jifty/trunk/t/TestApp/t/06-validation.t	Tue Jul 29 13:26:02 2008
@@ -2,10 +2,7 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 27;
+use Jifty::Test::Dist tests => 27;
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;

Modified: jifty/trunk/t/TestApp/t/07-sandboxing.t
==============================================================================
--- jifty/trunk/t/TestApp/t/07-sandboxing.t	(original)
+++ jifty/trunk/t/TestApp/t/07-sandboxing.t	Tue Jul 29 13:26:02 2008
@@ -2,10 +2,7 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 79;
+use Jifty::Test::Dist tests => 79;
 use Jifty::Test::WWW::Mechanize;
 use Net::HTTP;
 use URI;

Modified: jifty/trunk/t/TestApp/t/08-notifications.t
==============================================================================
--- jifty/trunk/t/TestApp/t/08-notifications.t	(original)
+++ jifty/trunk/t/TestApp/t/08-notifications.t	Tue Jul 29 13:26:02 2008
@@ -2,10 +2,7 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 4;
+use Jifty::Test::Dist tests => 4;
 
 use_ok('Jifty::Notification');
 use_ok('Email::MIME::CreateHTML');

Modified: jifty/trunk/t/TestApp/t/09-redirect.t
==============================================================================
--- jifty/trunk/t/TestApp/t/09-redirect.t	(original)
+++ jifty/trunk/t/TestApp/t/09-redirect.t	Tue Jul 29 13:26:02 2008
@@ -10,9 +10,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 6;
+use Jifty::Test::Dist tests => 6;
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;

Modified: jifty/trunk/t/TestApp/t/10-compress.t
==============================================================================
--- jifty/trunk/t/TestApp/t/10-compress.t	(original)
+++ jifty/trunk/t/TestApp/t/10-compress.t	Tue Jul 29 13:26:02 2008
@@ -9,11 +9,8 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
 BEGIN { $ENV{'JIFTY_CONFIG'} = 't/config-Cachable' }
-
-use Jifty::Test tests => 5;
+use Jifty::Test::Dist tests => 5;
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;

Modified: jifty/trunk/t/TestApp/t/11-current_user.t
==============================================================================
--- jifty/trunk/t/TestApp/t/11-current_user.t	(original)
+++ jifty/trunk/t/TestApp/t/11-current_user.t	Tue Jul 29 13:26:02 2008
@@ -8,10 +8,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 33;
+use Jifty::Test::Dist tests => 33;
 use Jifty::Test::WWW::Mechanize;
 
 use_ok('TestApp::Model::User');

Modified: jifty/trunk/t/TestApp/t/12-search.t
==============================================================================
--- jifty/trunk/t/TestApp/t/12-search.t	(original)
+++ jifty/trunk/t/TestApp/t/12-search.t	Tue Jul 29 13:26:02 2008
@@ -8,12 +8,7 @@
 
 =cut
 
-use lib 't/lib';
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 53;
-
+use Jifty::Test::Dist tests => 53;
 
 my $user = TestApp::Model::User->new(current_user => TestApp::CurrentUser->superuser);
 

Modified: jifty/trunk/t/TestApp/t/13-page-regions.t
==============================================================================
--- jifty/trunk/t/TestApp/t/13-page-regions.t	(original)
+++ jifty/trunk/t/TestApp/t/13-page-regions.t	Tue Jul 29 13:26:02 2008
@@ -2,10 +2,7 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 39;
+use Jifty::Test::Dist tests => 39;
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;

Modified: jifty/trunk/t/TestApp/t/14-template-paths.t
==============================================================================
--- jifty/trunk/t/TestApp/t/14-template-paths.t	(original)
+++ jifty/trunk/t/TestApp/t/14-template-paths.t	Tue Jul 29 13:26:02 2008
@@ -2,10 +2,7 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test;
+use Jifty::Test::Dist;
 use Jifty::Test::WWW::Mechanize;
 
 my @tests = (

Modified: jifty/trunk/t/TestApp/t/15-template-subclass.t
==============================================================================
--- jifty/trunk/t/TestApp/t/15-template-subclass.t	(original)
+++ jifty/trunk/t/TestApp/t/15-template-subclass.t	Tue Jul 29 13:26:02 2008
@@ -2,10 +2,7 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test;
+use Jifty::Test::Dist;
 use Jifty::Test::WWW::Mechanize;
 
 my @tests = (

Modified: jifty/trunk/t/TestApp/t/16-template-region.t
==============================================================================
--- jifty/trunk/t/TestApp/t/16-template-region.t	(original)
+++ jifty/trunk/t/TestApp/t/16-template-region.t	Tue Jul 29 13:26:02 2008
@@ -2,10 +2,7 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test;
+use Jifty::Test::Dist;
 use Jifty::Test::WWW::Mechanize;
 
 my @tests = (

Modified: jifty/trunk/t/TestApp/t/17-template-region-internal-redirect.t
==============================================================================
--- jifty/trunk/t/TestApp/t/17-template-region-internal-redirect.t	(original)
+++ jifty/trunk/t/TestApp/t/17-template-region-internal-redirect.t	Tue Jul 29 13:26:02 2008
@@ -2,15 +2,9 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test;
+use Jifty::Test::Dist tests => 7;
 use Jifty::Test::WWW::Mechanize;
 
-plan tests => 7;
-
-
 my $server = Jifty::Test->make_server;
 isa_ok( $server, 'Jifty::Server' );
 my $URL = $server->started_ok;

Modified: jifty/trunk/t/TestApp/t/18-test-www-declare.t
==============================================================================
--- jifty/trunk/t/TestApp/t/18-test-www-declare.t	(original)
+++ jifty/trunk/t/TestApp/t/18-test-www-declare.t	Tue Jul 29 13:26:02 2008
@@ -2,8 +2,7 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-use Jifty::SubTest;
+use Jifty::Test::Dist qw//;
 use Test::More;
 
 BEGIN {

Modified: jifty/trunk/t/TestApp/t/19-rightsfrom.t
==============================================================================
--- jifty/trunk/t/TestApp/t/19-rightsfrom.t	(original)
+++ jifty/trunk/t/TestApp/t/19-rightsfrom.t	Tue Jul 29 13:26:02 2008
@@ -8,10 +8,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test no_plan => 1;;
+use Jifty::Test::Dist tests => 56;
 
 use_ok('TestApp::Model::User');
 use_ok('TestApp::Model::Thingy');

Modified: jifty/trunk/t/TestApp/t/20-error-pages.t
==============================================================================
--- jifty/trunk/t/TestApp/t/20-error-pages.t	(original)
+++ jifty/trunk/t/TestApp/t/20-error-pages.t	Tue Jul 29 13:26:02 2008
@@ -9,10 +9,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 10;
+use Jifty::Test::Dist tests => 10;
 use Jifty::Test::WWW::Mechanize;
 
 ok(1, "Loaded the test script");

Modified: jifty/trunk/t/TestApp/t/21-js-arguments.t
==============================================================================
--- jifty/trunk/t/TestApp/t/21-js-arguments.t	(original)
+++ jifty/trunk/t/TestApp/t/21-js-arguments.t	Tue Jul 29 13:26:02 2008
@@ -10,9 +10,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 6;
+use Jifty::Test::Dist tests => 6;
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;

Modified: jifty/trunk/t/TestApp/t/22-execute-action.t
==============================================================================
--- jifty/trunk/t/TestApp/t/22-execute-action.t	(original)
+++ jifty/trunk/t/TestApp/t/22-execute-action.t	Tue Jul 29 13:26:02 2008
@@ -9,9 +9,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 5;
+use Jifty::Test::Dist tests => 5;
 
 Jifty::Test->web;
 

Modified: jifty/trunk/t/TestApp/t/23-extend-update-action.t
==============================================================================
--- jifty/trunk/t/TestApp/t/23-extend-update-action.t	(original)
+++ jifty/trunk/t/TestApp/t/23-extend-update-action.t	Tue Jul 29 13:26:02 2008
@@ -9,9 +9,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 4;
+use Jifty::Test::Dist tests => 4;
 
 Jifty::Test->web;
 

Modified: jifty/trunk/t/TestApp/t/24-extend-create-action.t
==============================================================================
--- jifty/trunk/t/TestApp/t/24-extend-create-action.t	(original)
+++ jifty/trunk/t/TestApp/t/24-extend-create-action.t	Tue Jul 29 13:26:02 2008
@@ -9,9 +9,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-use Jifty::Test tests => 5;
+use Jifty::Test::Dist tests => 5;
 
 Jifty::Test->web;
 

Modified: jifty/trunk/t/TestApp/t/before_access.t
==============================================================================
--- jifty/trunk/t/TestApp/t/before_access.t	(original)
+++ jifty/trunk/t/TestApp/t/before_access.t	Tue Jul 29 13:26:02 2008
@@ -2,10 +2,7 @@
 use strict;
 use warnings;
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 4;
+use Jifty::Test::Dist tests => 4;
 
 use_ok('TestApp::Model::User');
 

Modified: jifty/trunk/t/TestApp/t/config/01-basic.t
==============================================================================
--- jifty/trunk/t/TestApp/t/config/01-basic.t	(original)
+++ jifty/trunk/t/TestApp/t/config/01-basic.t	Tue Jul 29 13:26:02 2008
@@ -2,10 +2,7 @@
 use strict;
 use warnings;
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test;
+use Jifty::Test::Dist;
 
 my %option_from_file = (
     EtcConfig         => 'etc/config.yml',

Modified: jifty/trunk/t/TestApp/t/config/02-individual.t
==============================================================================
--- jifty/trunk/t/TestApp/t/config/02-individual.t	(original)
+++ jifty/trunk/t/TestApp/t/config/02-individual.t	Tue Jul 29 13:26:02 2008
@@ -2,10 +2,7 @@
 use strict;
 use warnings;
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test;
+use Jifty::Test::Dist;
 
 my %option_from_file = (
     EtcConfig         => 'etc/config.yml',

Modified: jifty/trunk/t/TestApp/t/crud.t
==============================================================================
--- jifty/trunk/t/TestApp/t/crud.t	(original)
+++ jifty/trunk/t/TestApp/t/crud.t	Tue Jul 29 13:26:02 2008
@@ -2,10 +2,7 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 3;
+use Jifty::Test::Dist tests => 3;
 use Jifty::Test::WWW::Mechanize;
 
 my $server = Jifty::Test->make_server;

Modified: jifty/trunk/t/TestApp/t/i18n-standalone.t
==============================================================================
--- jifty/trunk/t/TestApp/t/i18n-standalone.t	(original)
+++ jifty/trunk/t/TestApp/t/i18n-standalone.t	Tue Jul 29 13:26:02 2008
@@ -2,10 +2,7 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 20;
+use Jifty::Test::Dist tests => 20;
 use Jifty::Test::WWW::Mechanize;
 use Net::HTTP;
 use URI;

Modified: jifty/trunk/t/TestApp/t/instance_id.t
==============================================================================
--- jifty/trunk/t/TestApp/t/instance_id.t	(original)
+++ jifty/trunk/t/TestApp/t/instance_id.t	Tue Jul 29 13:26:02 2008
@@ -9,10 +9,7 @@
 
 =cut
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 3;
+use Jifty::Test::Dist tests => 3;
 
 ok(1, "Loaded the test script");
 

Modified: jifty/trunk/t/TestApp/t/regex_meta_in_path_info.t
==============================================================================
--- jifty/trunk/t/TestApp/t/regex_meta_in_path_info.t	(original)
+++ jifty/trunk/t/TestApp/t/regex_meta_in_path_info.t	Tue Jul 29 13:26:02 2008
@@ -6,10 +6,7 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-
-use Jifty::SubTest;
-use Jifty::Test tests => 2;
+use Jifty::Test::Dist tests => 2;
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;

Modified: jifty/trunk/t/TestApp/t/upgrade.t
==============================================================================
--- jifty/trunk/t/TestApp/t/upgrade.t	(original)
+++ jifty/trunk/t/TestApp/t/upgrade.t	Tue Jul 29 13:26:02 2008
@@ -2,11 +2,8 @@
 use strict;
 use warnings;
 
-use lib 't/lib';
-
-use Jifty::SubTest;
 use Log::Log4perl;
-use Jifty::Test tests => 1;
+use Jifty::Test::Dist tests => 1;
 
 my $config = Jifty::YAML::LoadFile($ENV{JIFTY_TEST_CONFIG});
 $config->{'framework'}->{'Database'}->{'Version'} = '0.0.2';

Modified: jifty/trunk/t/TestApp/t/use_mason_wrapper.t
==============================================================================
--- jifty/trunk/t/TestApp/t/use_mason_wrapper.t	(original)
+++ jifty/trunk/t/TestApp/t/use_mason_wrapper.t	Tue Jul 29 13:26:02 2008
@@ -2,10 +2,7 @@
 use warnings;
 use strict;
 
-use lib 't/lib';
-use Jifty::SubTest;
-
-use Jifty::Test tests => 6;
+use Jifty::Test::Dist tests => 6;
 use Jifty::Test::WWW::Mechanize;
 
 my $server = Jifty::Test->make_server;


More information about the Jifty-commit mailing list