diff options
| -rw-r--r-- | perl-external/files.txt | 3 | ||||
| -rw-r--r-- | perl-external/minicpan/modules/02packages.details.txt.gz | bin | 20071 -> 20125 bytes | |||
| -rw-r--r-- | perl-external/modules.txt | 1 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App.pm | 1 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Admin.pm | 6 | ||||
| -rw-r--r-- | t/app/controller/admin.t | 8 |
6 files changed, 18 insertions, 1 deletions
diff --git a/perl-external/files.txt b/perl-external/files.txt index eeb64ed34..e43fc2005 100644 --- a/perl-external/files.txt +++ b/perl-external/files.txt @@ -151,7 +151,6 @@ /authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-0.07.tar.gz /authors/id/J/JP/JPEACOCK/version-0.88.tar.gz /authors/id/J/JR/JROCKWAY/Context-Preserve-0.01.tar.gz -/authors/id/J/JR/JROCKWAY/Template-Plugin-DateTime-Format-0.02.tar.gz /authors/id/K/KA/KASEI/Class-Accessor-0.34.tar.gz /authors/id/K/KW/KWILLIAMS/Path-Class-0.23.tar.gz /authors/id/K/KW/KWILLIAMS/Probe-Perl-0.01.tar.gz @@ -218,10 +217,12 @@ /authors/id/R/RJ/RJBS/Test-Fatal-0.003.tar.gz /authors/id/R/RJ/RJBS/Version-Requirements-0.101020.tar.gz /authors/id/R/RK/RKITOVER/Catalyst-Model-DBIC-Schema-0.48.tar.gz +/authors/id/R/RK/RKITOVER/Catalyst-Plugin-SmartURI-0.036.tar.gz /authors/id/R/RK/RKITOVER/Class-Accessor-Grouped-0.10002.tar.gz /authors/id/R/RK/RKITOVER/DBIx-Class-Schema-Loader-0.07010.tar.gz /authors/id/R/RK/RKITOVER/Lingua-EN-Inflect-Phrase-0.04.tar.gz /authors/id/R/RK/RKITOVER/MooseX-Traits-Pluggable-0.10.tar.gz +/authors/id/R/RK/RKITOVER/URI-SmartURI-0.031.tar.gz /authors/id/R/RO/ROBIN/PadWalker-1.92.tar.gz /authors/id/R/RO/ROODE/Readonly-1.03.tar.gz /authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.00.tar.gz diff --git a/perl-external/minicpan/modules/02packages.details.txt.gz b/perl-external/minicpan/modules/02packages.details.txt.gz Binary files differindex 97ee79df3..1c902b5e8 100644 --- a/perl-external/minicpan/modules/02packages.details.txt.gz +++ b/perl-external/minicpan/modules/02packages.details.txt.gz diff --git a/perl-external/modules.txt b/perl-external/modules.txt index e22b99538..ad4caa873 100644 --- a/perl-external/modules.txt +++ b/perl-external/modules.txt @@ -9,6 +9,7 @@ Catalyst::Model::Adaptor Catalyst::Plugin::Authentication Catalyst::Plugin::ConfigLoader Catalyst::Plugin::Session::Store::DBIC +Catalyst::Plugin::SmartURI Catalyst::Plugin::Static::Simple Catalyst::Plugin::Unicode Catalyst::Plugin::Unicode::Encoding diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 811a40eb0..18f086868 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -22,6 +22,7 @@ use Catalyst ( 'Session::Store::DBIC', 'Session::State::Cookie', # FIXME - we're using our own override atm 'Authentication', + 'SmartURI', ); extends 'Catalyst'; diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index b76447233..152a167e6 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -25,6 +25,12 @@ Redirect to index page. There to make the allowed pages stuff neater =cut +sub begin : Private { + my ( $self, $c ) = @_; + + $c->uri_disposition('relative'); +} + sub summary : Path( 'summary' ) : Args(0) { my ( $self, $c ) = @_; $c->go( 'index' ); diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t index ea3e8a656..5b7a3e83a 100644 --- a/t/app/controller/admin.t +++ b/t/app/controller/admin.t @@ -6,6 +6,14 @@ use FixMyStreet::TestMech; my $mech = FixMyStreet::TestMech->new; +my $secret = FixMyStreet::App->model('DB::Secret')->search(); + +# don't explode if there's nothing in the secret table +if ( $secret == 0 ) { + diag "You need to put an entry in the secret table for the admin tests to run"; + plan skip_all => 'No entry in secret table'; +} + $mech->get_ok('/admin'); $mech->title_like(qr/Summary/); |