[Jifty-commit] r4359 - in jifty/trunk: .

[jifty-commit at lists.jifty.org]

Author: sartak
Date: Fri Nov  2 14:43:38 2007
New Revision: 4359

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/t/TestApp-Plugin-OAuth/t/00-test-setup.t
   jifty/trunk/t/TestApp-Plugin-OAuth/t/01-basic.t
   jifty/trunk/t/TestApp-Plugin-OAuth/t/02-request-token.t
   jifty/trunk/t/TestApp-Plugin-OAuth/t/03-authorize.t
   jifty/trunk/t/TestApp-Plugin-OAuth/t/04-access-token.t

Log:
 r44548 at onn:  sartak | 2007-11-02 14:43:04 -0400
 Correctly skip OAuth tests in the absence of Net::OAuth


Modified: jifty/trunk/t/TestApp-Plugin-OAuth/t/00-test-setup.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-OAuth/t/00-test-setup.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-OAuth/t/00-test-setup.t	Fri Nov  2 14:43:38 2007
@@ -2,18 +2,20 @@
 use warnings;
 use strict;
 
+use Test::More;
+BEGIN {
+    if (eval { require Net::OAuth::Request; require Crypt::OpenSSL::RSA; 1 }) {
+        plan tests => 9;
+    }
+    else {
+        plan skip_all => "Net::OAuth isn't installed";
+    }
+}
+
 use lib 't/lib';
 use Jifty::SubTest;
-
 use TestApp::Plugin::OAuth::Test;
 
-if (eval { require Net::OAuth::Request; require Crypt::OpenSSL::RSA; 1 }) {
-    plan tests => 9;
-}
-else {
-    plan skip_all => "Net::OAuth isn't installed";
-}
-
 # sign PLAINTEXT {{{
 is(sign('POST', 'jjd999tj88uiths3', 'djr9rjt0jd78jf88',
         oauth_signature_method => 'PLAINTEXT'),

Modified: jifty/trunk/t/TestApp-Plugin-OAuth/t/01-basic.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-OAuth/t/01-basic.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-OAuth/t/01-basic.t	Fri Nov  2 14:43:38 2007
@@ -2,18 +2,21 @@
 use warnings;
 use strict;
 
+use Test::More;
+BEGIN {
+    if (eval { require Net::OAuth::Request; require Crypt::OpenSSL::RSA; 1 }) {
+        plan tests => 9;
+    }
+    else {
+        plan skip_all => "Net::OAuth isn't installed";
+    }
+}
+
 use lib 't/lib';
 use Jifty::SubTest;
 
 use Jifty::Test;
 
-if (eval { require Net::OAuth::Request; require Crypt::OpenSSL::RSA; 1 }) {
-    plan tests => 9;
-}
-else {
-    plan skip_all => "Net::OAuth isn't installed";
-}
-
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;

Modified: jifty/trunk/t/TestApp-Plugin-OAuth/t/02-request-token.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-OAuth/t/02-request-token.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-OAuth/t/02-request-token.t	Fri Nov  2 14:43:38 2007
@@ -2,18 +2,21 @@
 use warnings;
 use strict;
 
+use Test::More;
+BEGIN {
+    if (eval { require Net::OAuth::Request; require Crypt::OpenSSL::RSA; 1 }) {
+        plan tests => 59;
+    }
+    else {
+        plan skip_all => "Net::OAuth isn't installed";
+    }
+}
+
 use lib 't/lib';
 use Jifty::SubTest;
 
 use TestApp::Plugin::OAuth::Test;
 
-if (eval { require Net::OAuth::Request; require Crypt::OpenSSL::RSA; 1 }) {
-    plan tests => 59;
-}
-else {
-    plan skip_all => "Net::OAuth isn't installed";
-}
-
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;

Modified: jifty/trunk/t/TestApp-Plugin-OAuth/t/03-authorize.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-OAuth/t/03-authorize.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-OAuth/t/03-authorize.t	Fri Nov  2 14:43:38 2007
@@ -2,18 +2,21 @@
 use warnings;
 use strict;
 
+use Test::More;
+BEGIN {
+    if (eval { require Net::OAuth::Request; require Crypt::OpenSSL::RSA; 1 }) {
+        plan tests => 86;
+    }
+    else {
+        plan skip_all => "Net::OAuth isn't installed";
+    }
+}
+
 use lib 't/lib';
 use Jifty::SubTest;
 
 use TestApp::Plugin::OAuth::Test;
 
-if (eval { require Net::OAuth::Request; require Crypt::OpenSSL::RSA; 1 }) {
-    plan tests => 86;
-}
-else {
-    plan skip_all => "Net::OAuth isn't installed";
-}
-
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;

Modified: jifty/trunk/t/TestApp-Plugin-OAuth/t/04-access-token.t
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-OAuth/t/04-access-token.t	(original)
+++ jifty/trunk/t/TestApp-Plugin-OAuth/t/04-access-token.t	Fri Nov  2 14:43:38 2007
@@ -2,18 +2,21 @@
 use warnings;
 use strict;
 
+use Test::More;
+BEGIN {
+    if (eval { require Net::OAuth::Request; require Crypt::OpenSSL::RSA; 1 }) {
+        plan tests => 71;
+    }
+    else {
+        plan skip_all => "Net::OAuth isn't installed";
+    }
+}
+
 use lib 't/lib';
 use Jifty::SubTest;
 
 use TestApp::Plugin::OAuth::Test;
 
-if (eval { require Net::OAuth::Request; require Crypt::OpenSSL::RSA; 1 }) {
-    plan tests => 71;
-}
-else {
-    plan skip_all => "Net::OAuth isn't installed";
-}
-
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;