diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | cpanfile | 2 | ||||
| -rw-r--r-- | cpanfile.snapshot | 6 | ||||
| -rw-r--r-- | perllib/FixMyStreet/TestAppProve.pm | 18 |
4 files changed, 12 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c622e1cfd..3d23557fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ - Development improvements: - Add HTML email previewer. - Add CORS header to Open311 output. #2022 + - Add some Cypress browser-based testing. * v2.3.1 (12th February 2018) - Front end improvements: @@ -130,7 +130,7 @@ recommends 'Linux::Inotify2' if $^O eq 'linux'; recommends 'Mac::FSEvents' if $^O eq 'darwin'; # Modules used by the test suite -requires 'Test::PostgreSQL', '1.24'; +requires 'Test::PostgreSQL', '1.25'; requires 'CGI::Simple'; requires 'HTTP::Headers'; requires 'HTTP::Response'; diff --git a/cpanfile.snapshot b/cpanfile.snapshot index b118d9c93..c671ae907 100644 --- a/cpanfile.snapshot +++ b/cpanfile.snapshot @@ -6188,10 +6188,10 @@ DISTRIBUTIONS Test::More 0 Test::Tester 0.107 perl 5.006 - Test-PostgreSQL-1.24 - pathname: T/TJ/TJC/Test-PostgreSQL-1.24.tar.gz + Test-PostgreSQL-1.25 + pathname: T/TJ/TJC/Test-PostgreSQL-1.25.tar.gz provides: - Test::PostgreSQL 1.24 + Test::PostgreSQL 1.25 requirements: DBD::Pg 0 DBI 0 diff --git a/perllib/FixMyStreet/TestAppProve.pm b/perllib/FixMyStreet/TestAppProve.pm index 049f7da6c..4a55d587b 100644 --- a/perllib/FixMyStreet/TestAppProve.pm +++ b/perllib/FixMyStreet/TestAppProve.pm @@ -37,20 +37,16 @@ my $pg; sub spin_up_database { warn "Spinning up a Pg cluster/database...\n"; - $pg = Test::PostgreSQL->new(); + $pg = Test::PostgreSQL->new( + seed_scripts => [ + 'db/schema.sql', + 'db/fixture.sql', + 'db/generate_secret.sql', + ], + ); warn sprintf "# Connected to %s\n", $pg->dsn; - my $dbh = DBI->connect($pg->dsn); - - my $tmpwarn = $SIG{__WARN__}; - $SIG{__WARN__} = - sub { print STDERR @_ if $_[0] !~ m/NOTICE: CREATE TABLE/; }; - $dbh->do( path('db/schema.sql')->slurp ) or die $!; - $dbh->do( path('db/fixture.sql')->slurp ) or die $!; - $dbh->do( path('db/generate_secret.sql')->slurp ) or die $!; - $SIG{__WARN__} = $tmpwarn; - return { FMS_DB_PORT => $pg->port, FMS_DB_NAME => 'test', |