[Jifty-commit] jifty branch, master, updated. jifty-1.10228-20-g3d1b0d0

[Jifty commits]

The branch, master has been updated
       via  3d1b0d0439b8d3bb647748d6d18a1e00c1716fb0 (commit)
      from  479846782d380a3a742befbd5860305ab9ba684c (commit)

Summary of changes:
 MANIFEST                          |    2 -
 Makefile.PL                       |    1 -
 lib/Jifty/Test/WWW/Declare.pm     |   81 -------------------------------------
 t/TestApp/t/18-test-www-declare.t |   29 -------------
 4 files changed, 0 insertions(+), 113 deletions(-)
 delete mode 100644 lib/Jifty/Test/WWW/Declare.pm
 delete mode 100644 t/TestApp/t/18-test-www-declare.t

- Log -----------------------------------------------------------------
commit 3d1b0d0439b8d3bb647748d6d18a1e00c1716fb0
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Tue May 17 16:01:25 2011 -0400

    Remove Test::WWW::Declare
    
        That module died on the vine

diff --git a/MANIFEST b/MANIFEST
index ab4d8e3..13dfa90 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -317,7 +317,6 @@ lib/Jifty/Subs/Render.pm
 lib/Jifty/Test.pm
 lib/Jifty/Test/Dist.pm
 lib/Jifty/Test/Email.pm
-lib/Jifty/Test/WWW/Declare.pm
 lib/Jifty/Test/WWW/Mechanize.pm
 lib/Jifty/Test/WWW/Selenium.pm
 lib/Jifty/TestServer.pm
@@ -857,7 +856,6 @@ t/TestApp/t/14-template-paths.t
 t/TestApp/t/15-template-subclass.t
 t/TestApp/t/16-template-region.t
 t/TestApp/t/17-template-region-internal-redirect.t
-t/TestApp/t/18-test-www-declare.t
 t/TestApp/t/19-rightsfrom.t
 t/TestApp/t/20-error-pages.t
 t/TestApp/t/21-js-arguments.t
diff --git a/Makefile.PL b/Makefile.PL
index de738cd..deb2e08 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -130,7 +130,6 @@ feature 'Development of a jifty application' =>
     recommends('Test::MockModule' => '0.05'),
     recommends('Test::MockObject' => '1.07'),
     recommends('Module::Refresh' => '0.09'),
-    recommends('Test::WWW::Declare' => '0.01'),
     # Sub::Exporter is already required by SQL::ReservedWords (and also by
     # Moose if that's around), but make it explicit
     recommends('Sub::Exporter'),
diff --git a/lib/Jifty/Test/WWW/Declare.pm b/lib/Jifty/Test/WWW/Declare.pm
deleted file mode 100644
index 96cf758..0000000
--- a/lib/Jifty/Test/WWW/Declare.pm
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env perl
-package Jifty::Test::WWW::Declare;
-use strict;
-use warnings;
-use base qw(Exporter);
-
-# Sub::Exporter doesn't warn about redefining functions, which we do in the
-# import routine below
-use Sub::Exporter -setup => {
-    -as => 'export_subs',
-    exports => ['get'],
-};
-
-BEGIN { require Jifty::Test; require Test::WWW::Declare }
-
-our @EXPORT = qw($server $URL);
-
-our $server;
-our $URL;
-
-sub import
-{
-    my $class = shift;
-
-    # set up database and other things
-    Jifty::Test->import(@_);
-
-    # export the DSL-ey functions
-    Test::WWW::Declare->export_to_level(2);
-
-    # Note that these next exports must come AFTER T:W:D->export because we
-    # override parts of it
-
-    # Exporter: $server and $URL
-    __PACKAGE__->export_to_level(1);
-
-    # Sub::Exporter: get()
-    __PACKAGE__->export_subs({ into_level => 1 }, 'get');
-
-    # create a server (which will be automatically exported)
-    $server = Jifty::Test->make_server;
-    $URL = $server->started_ok;
-}
-
-=head1 NAME
-
-Jifty::Test::WWW::Declare - Subclass of L<Test::WWW::Declare> with
-extra Jifty features
-
-=head1 SYNOPSIS
-
-    use Jifty::Test::WWW::Declare tests => 2;
-
-    session user => run {
-        flow 'login page' => check {
-            get 'login';
-            content should match qr{Email:};
-            content should match qr{Password:};
-        };
-    };
-
-=head1 FUNCTIONS
-
-=head2 get PATH
-
-Automatically prepend the server's URL to the PATH. You may avoid this by
-specifying the full URL yourself (it checks for C</^http/>).
-
-=cut
-
-sub get
-{
-    my $url = shift;
-    $url = "$URL/$url"
-        unless $url =~ /^http/;
-
-    Test::WWW::Declare::get($url);
-}
-
-1;
-
diff --git a/t/TestApp/t/18-test-www-declare.t b/t/TestApp/t/18-test-www-declare.t
deleted file mode 100644
index 7e76273..0000000
--- a/t/TestApp/t/18-test-www-declare.t
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env perl
-use warnings;
-use strict;
-
-use Jifty::Test::Dist qw//;
-use Test::More;
-
-BEGIN {
-    unless (eval { require Test::WWW::Declare }) {
-        plan skip_all => "Test::WWW::Declare isn't installed";
-    }
-}
-
-use Jifty::Test::WWW::Declare tests => 2, actual_server => 1;
-
-# this is a duplication of t/TestApp/t/17-template-region-internal-redirect.t
-# if the user sees failures here, then he either saw failures in t/17 OR
-# J:T:W:D is broken
-
-session user => run {
-    flow "region with internal redirects" => check {
-        get "region-with-internal-redirect";
-        content should match qr/redirected ok/;
-        content should match qr/other region/;
-        content should match qr/still going/;
-        content shouldnt match qr/sorry/;
-    };
-};
-

-----------------------------------------------------------------------