[Jifty-commit] r1542 - in jifty/trunk: t/Continuations/t t/Mapper/t
t/TestApp/t t/lib t/lib/Jifty
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Wed Jul 12 08:18:45 EDT 2006
Author: clkao
Date: Wed Jul 12 08:18:24 2006
New Revision: 1542
Added:
jifty/trunk/t/lib/
jifty/trunk/t/lib/Jifty/
jifty/trunk/t/lib/Jifty/SubTest.pm (contents, props changed)
Modified:
jifty/trunk/lib/Jifty/Test.pm
jifty/trunk/lib/Jifty/TestServer.pm
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/t/00-model-User.t
jifty/trunk/t/TestApp/t/00-prototype.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
Log:
* Make jifty tests respect the current given @INC, so it doesn't
use lib when you are supposed to use blib during make test.
* Make the subtest system less painful.
* Use Jifty::Script to invoke test server, so it doesn't depend on
bin/jifty.
Modified: jifty/trunk/lib/Jifty/Test.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Test.pm (original)
+++ jifty/trunk/lib/Jifty/Test.pm Wed Jul 12 08:18:24 2006
@@ -54,7 +54,6 @@
}
}
my $root = Jifty::Util->app_root;
- unshift @INC, "$root/lib" if ($root);
# Mason's disk caching sometimes causes false tests
rmtree(["$root/var/mason"], 0, 1);
Modified: jifty/trunk/lib/Jifty/TestServer.pm
==============================================================================
--- jifty/trunk/lib/Jifty/TestServer.pm (original)
+++ jifty/trunk/lib/Jifty/TestServer.pm Wed Jul 12 08:18:24 2006
@@ -54,9 +54,9 @@
if (my $coverage = $ENV{JIFTY_TESTSERVER_COVERAGE}) {
push @extra, '-MDevel::Cover';
}
- # FIXME: put something here to ensure bin/jifty (even
- # $findbin/../bin/jifty) exists
- exec(@perl, @extra, 'bin/jifty', 'server', '--quiet',
+
+ exec(@perl, @extra, '-MJifty::Util', '-MJifty::Script',
+ '-e', 'Jifty::Script->dispatch', 'server', '--quiet',
'--sigready', 'USR1',
$ENV{JIFTY_TESTSERVER_DBIPROF} ? ('--dbiprof') : (),
);
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 Wed Jul 12 08:18:24 2006
@@ -9,8 +9,9 @@
=cut
-BEGIN {chdir "t/Continuations"}
-use lib '../../lib';
+use lib 't/lib';
+use Jifty::SubTest;
+
use Jifty::Test tests => 1;
ok(1, "Loaded the test script");
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 Wed Jul 12 08:18:24 2006
@@ -9,7 +9,8 @@
=cut
-BEGIN {chdir "t/Continuations"}
+use lib 't/lib';
+use Jifty::SubTest;
use lib '../lib';
use Jifty::Test tests => 47;
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 Wed Jul 12 08:18:24 2006
@@ -9,7 +9,8 @@
=cut
-BEGIN {chdir "t/Continuations"}
+use lib 't/lib';
+use Jifty::SubTest;
use lib '../lib';
use Jifty::Test tests => 31;
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 Wed Jul 12 08:18:24 2006
@@ -4,8 +4,9 @@
use strict;
# {{{ Setup
-BEGIN {chdir "t/Continuations"}
-use lib '../../lib';
+use lib 't/lib';
+use Jifty::SubTest;
+
use Jifty::Test skip_all => "test file not done yet";
#### garbage collection
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 Wed Jul 12 08:18:24 2006
@@ -10,8 +10,9 @@
=cut
-BEGIN {chdir "t/Continuations"}
-use lib '../../lib';
+use lib 't/lib';
+use Jifty::SubTest;
+
use Jifty::Test 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 Wed Jul 12 08:18:24 2006
@@ -9,8 +9,9 @@
=cut
-BEGIN {chdir "t/Mapper"}
-use lib '../../lib';
+use lib 't/lib';
+use Jifty::SubTest;
+
use Jifty::Test tests => 1;
ok(1, "Loaded the test script");
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 Wed Jul 12 08:18:24 2006
@@ -9,8 +9,9 @@
=cut
-BEGIN {chdir "t/Mapper"}
-use lib '../../lib';
+use lib 't/lib';
+use Jifty::SubTest;
+
use Jifty::Test tests => 32;
use_ok('Jifty::Test::WWW::Mechanize');
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 Wed Jul 12 08:18:24 2006
@@ -9,8 +9,9 @@
=cut
-BEGIN {chdir "t/Mapper"}
-use lib '../../lib';
+use lib 't/lib';
+use Jifty::SubTest;
+
use Jifty::Test tests => 11;
use_ok('Jifty::Test::WWW::Mechanize');
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 Wed Jul 12 08:18:24 2006
@@ -8,10 +8,10 @@
=cut
-BEGIN {chdir "t/TestApp"}
-use lib '../../lib';
-use Jifty::Test tests => 12;
+use lib 't/lib';
+use Jifty::SubTest;
+use Jifty::Test tests => 12;
# 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 Wed Jul 12 08:18:24 2006
@@ -9,8 +9,9 @@
=cut
-BEGIN {chdir "t/TestApp"}
-use lib '../../lib';
+use lib 't/lib';
+use Jifty::SubTest;
+
use Jifty::Test tests => 1;
ok(1, "Loaded the test script");
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 Wed Jul 12 08:18:24 2006
@@ -2,8 +2,8 @@
use warnings;
use strict;
-BEGIN {chdir "t/TestApp"}
-use lib '../../lib';
+use lib 't/lib';
+use Jifty::SubTest;
use Jifty::Test tests => 28;
use Jifty::Test::WWW::Mechanize;
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 Wed Jul 12 08:18:24 2006
@@ -2,8 +2,9 @@
use warnings;
use strict;
-BEGIN {chdir "t/TestApp"}
-use lib '../../lib';
+use lib 't/lib';
+use Jifty::SubTest;
+
use Jifty::Test tests => 6;
use Jifty::Test::WWW::Mechanize;
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 Wed Jul 12 08:18:24 2006
@@ -3,8 +3,9 @@
use warnings;
use strict;
-BEGIN {chdir "t/TestApp"}
-use lib '../../lib';
+use lib 't/lib';
+use Jifty::SubTest;
+
use Jifty::Test tests => 11;
use_ok('Jifty');
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 Wed Jul 12 08:18:24 2006
@@ -3,11 +3,10 @@
use warnings;
use strict;
-BEGIN {
-chdir "t/TestApp";
-$ENV{'JIFTY_CONFIG'} = 't/config-Cachable';
-}
-use lib '../../lib';
+use lib 't/lib';
+use Jifty::SubTest;
+BEGIN { $ENV{'JIFTY_CONFIG'} = 't/config-Cachable' }
+
use Jifty::Test tests => 8;
use Jifty::Test::WWW::Mechanize;
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 Wed Jul 12 08:18:24 2006
@@ -3,11 +3,9 @@
use warnings;
use strict;
-BEGIN {
-chdir "t/TestApp";
-$ENV{'JIFTY_CONFIG'} = 't/config-Record';
-}
-use lib '../../lib';
+use lib 't/lib';
+use Jifty::SubTest;
+BEGIN { $ENV{'JIFTY_CONFIG'} = 't/config-Record' }
use Jifty::Test tests => 10;
use Jifty::Test::WWW::Mechanize;
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 Wed Jul 12 08:18:24 2006
@@ -2,8 +2,9 @@
use warnings;
use strict;
-BEGIN {chdir "t/TestApp"}
-use lib '../../lib';
+use lib 't/lib';
+use Jifty::SubTest;
+
use Jifty::Test tests => 13;
use Jifty::Test::WWW::Mechanize;
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 Wed Jul 12 08:18:24 2006
@@ -2,8 +2,9 @@
use warnings;
use strict;
-BEGIN {chdir "t/TestApp"}
-use lib '../../lib';
+use lib 't/lib';
+use Jifty::SubTest;
+
use Jifty::Test tests => 79;
use Jifty::Test::WWW::Mechanize;
use Net::HTTP;
Added: jifty/trunk/t/lib/Jifty/SubTest.pm
==============================================================================
--- (empty file)
+++ jifty/trunk/t/lib/Jifty/SubTest.pm Wed Jul 12 08:18:24 2006
@@ -0,0 +1,13 @@
+package Jifty::SubTest;
+
+use FindBin;
+use Cwd;
+BEGIN {
+ @INC = map { ref($_) ? $_ : Cwd::abs_path($_) } @INC;
+ chdir "$FindBin::Bin/..";
+}
+
+use lib 'lib';
+
+1;
+
More information about the Jifty-commit
mailing list