diff options
Diffstat (limited to 't')
| -rw-r--r-- | t/app/controller/photo.t | 10 | ||||
| -rw-r--r-- | t/app/model/photoset.t | 5 | ||||
| -rw-r--r-- | t/cobrand/zurich.t | 5 | ||||
| -rw-r--r-- | t/open311.t | 5 | ||||
| -rw-r--r-- | t/sendreport/open311.t | 8 |
5 files changed, 28 insertions, 5 deletions
diff --git a/t/app/controller/photo.t b/t/app/controller/photo.t index e9183836b..e28ee1946 100644 --- a/t/app/controller/photo.t +++ b/t/app/controller/photo.t @@ -24,7 +24,10 @@ subtest "Check multiple upload worked" => sub { FixMyStreet::override_config { ALLOWED_COBRANDS => [ { fixmystreet => '.' } ], MAPIT_URL => 'http://mapit.uk/', - UPLOAD_DIR => $UPLOAD_DIR, + PHOTO_STORAGE_BACKEND => 'FileSystem', + PHOTO_STORAGE_OPTIONS => { + UPLOAD_DIR => $UPLOAD_DIR, + }, }, sub { $mech->log_in_ok('test@example.com'); @@ -77,7 +80,10 @@ subtest "Check photo uploading URL works" => sub { # submit initial pc form FixMyStreet::override_config { - UPLOAD_DIR => $UPLOAD_DIR, + PHOTO_STORAGE_BACKEND => 'FileSystem', + PHOTO_STORAGE_OPTIONS => { + UPLOAD_DIR => $UPLOAD_DIR, + }, }, sub { $mech->post( '/photo/upload', Content_Type => 'form-data', diff --git a/t/app/model/photoset.t b/t/app/model/photoset.t index d171ba88b..708bda891 100644 --- a/t/app/model/photoset.t +++ b/t/app/model/photoset.t @@ -15,7 +15,10 @@ my $db = FixMyStreet::DB->schema; my $user = $db->resultset('User')->find_or_create({ name => 'Bob', email => 'bob@example.com' }); FixMyStreet::override_config { - UPLOAD_DIR => $UPLOAD_DIR, + PHOTO_STORAGE_BACKEND => 'FileSystem', + PHOTO_STORAGE_OPTIONS => { + UPLOAD_DIR => $UPLOAD_DIR, + }, }, sub { my $image_path = path('t/app/controller/sample.jpg'); diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t index eccb0c8eb..dbd6ec882 100644 --- a/t/cobrand/zurich.t +++ b/t/cobrand/zurich.t @@ -416,7 +416,10 @@ FixMyStreet::override_config { ALLOWED_COBRANDS => [ 'zurich' ], MAPIT_URL => 'http://mapit.zurich/', MAP_TYPE => 'Zurich,OSM', - UPLOAD_DIR => $UPLOAD_DIR, + PHOTO_STORAGE_BACKEND => 'FileSystem', + PHOTO_STORAGE_OPTIONS => { + UPLOAD_DIR => $UPLOAD_DIR, + }, }, sub { # Photo publishing $mech->get_ok( '/admin/report_edit/' . $report->id ); diff --git a/t/open311.t b/t/open311.t index 4dc1b2959..e1ad578d7 100644 --- a/t/open311.t +++ b/t/open311.t @@ -322,7 +322,10 @@ subtest 'check media url set' => sub { $comment->cobrand('fixmystreet'); FixMyStreet::override_config { - UPLOAD_DIR => $UPLOAD_DIR, + PHOTO_STORAGE_BACKEND => 'FileSystem', + PHOTO_STORAGE_OPTIONS => { + UPLOAD_DIR => $UPLOAD_DIR, + }, }, sub { my $results = make_update_req( $comment, '<?xml version="1.0" encoding="utf-8"?><service_request_updates><request_update><update_id>248</update_id></request_update></service_request_updates>' ); diff --git a/t/sendreport/open311.t b/t/sendreport/open311.t index 26764dc19..e68a0aa3c 100644 --- a/t/sendreport/open311.t +++ b/t/sendreport/open311.t @@ -74,6 +74,10 @@ subtest 'test report with multiple photos only sends one', sub { STAGING_FLAGS => { send_reports => 1 }, ALLOWED_COBRANDS => [ 'fixmystreet' ], MAPIT_URL => 'http://mapit.uk/', + PHOTO_STORAGE_BACKEND => 'FileSystem', + PHOTO_STORAGE_OPTIONS => { + UPLOAD_DIR => $UPLOAD_DIR, + }, }, sub { $test_data = FixMyStreet::Script::Reports::send(); }; @@ -107,6 +111,10 @@ subtest 'test sending multiple photos', sub { STAGING_FLAGS => { send_reports => 1 }, ALLOWED_COBRANDS => [ 'tester' ], MAPIT_URL => 'http://mapit.uk/', + PHOTO_STORAGE_BACKEND => 'FileSystem', + PHOTO_STORAGE_OPTIONS => { + UPLOAD_DIR => $UPLOAD_DIR, + }, }, sub { $test_data = FixMyStreet::Script::Reports::send(); }; |