Transition from Mojolicious::Lite to full Mojolicious app

2 files changed, 24 insertions, 28 deletions

diff --git a/t/01-basic.t b/t/01-basic.t
index da7b654..4f471b0 100644
--- a/t/01-basic.t
+++ b/t/01-basic.t
@@ -4,7 +4,7 @@ use Test::Mojo;
 use FindBin;
 require "$FindBin::Bin/../index.pl";
 
-my $t = Test::Mojo->new;
+my $t = Test::Mojo->new('DBInfoscreen');
 $t->get_ok('/')->status_is(200)->content_like(qr/db-infoscreen/);
 
 done_testing();
diff --git a/t/22-json.t b/t/22-json.t
index 9db67b8..471467f 100644
--- a/t/22-json.t
+++ b/t/22-json.t
@@ -8,39 +8,35 @@ use Test::Mojo;
 use FindBin;
 require "$FindBin::Bin/../index.pl";
 
-my $t = Test::Mojo->new;
+my $t = Test::Mojo->new('DBInfoscreen');
 
 # Note: These tests depends on IRIS live data. If it fails, it -might- also
 # be because of IRIS problems or unanticipated schedule changes.
 # TODO: Support mock XML from hard disk.
 
-$t->get_ok('/EDUV?mode=json&version=1')
-  ->status_is(200)
-  ->json_has('/departures', 'has departures')
-  ->json_has('/departures/0', 'has a departure')
-  ->json_has('/departures/0/route', '.route')
-  ->json_has('/departures/0/delay', '.delay')
-  ->json_like('/departures/0/destination',
-              qr{ ^ (Dortmund|Bochum|Essen|D.sseldorf|Solingen) \s Hbf $}x,
-              '.destination')
-  ->json_like('/departures/0/isCancelled', qr{ ^ 0 | 1 $ }x, '.is_cancelled')
-  ->json_has('/departures/0/messages', '.messages')
-  ->json_has('/departures/0/messages/delay', '.messages.delay')
-  ->json_has('/departures/0/messages/qos', '.messages.qos')
-  ->json_like('/departures/0/time', qr{ ^ \d \d? : \d\d $ }x, '.time')
-  ->json_is('/departures/0/train', 'S 1', '.train')
-  ->json_like('/departures/0/platform', qr{ ^ 1 | 2 $}x, '.platform')
-  ->json_like('/departures/0/route/0/name',
-              qr{ ^ (Dortmund|Bochum|Essen|D.sseldorf|Solingen) \s Hbf $}x,
-              '.route[0]')
-  ->json_like('/departures/0/via/0',
-              qr{ ^ Dortmund-Dorstfeld \s S.d | Dortmund-Oespel $}x,
-              '.via[0]')
-  ;
+$t->get_ok('/EDUV?mode=json&version=1')->status_is(200)
+  ->json_has( '/departures',         'has departures' )
+  ->json_has( '/departures/0',       'has a departure' )
+  ->json_has( '/departures/0/route', '.route' )
+  ->json_has( '/departures/0/delay', '.delay' )
+  ->json_like( '/departures/0/destination',
+	qr{ ^ (Dortmund|Bochum|Essen|D.sseldorf|Solingen) \s Hbf $}x,
+	'.destination' )
+  ->json_like( '/departures/0/isCancelled', qr{ ^ 0 | 1 $ }x, '.is_cancelled' )
+  ->json_has( '/departures/0/messages',       '.messages' )
+  ->json_has( '/departures/0/messages/delay', '.messages.delay' )
+  ->json_has( '/departures/0/messages/qos',   '.messages.qos' )
+  ->json_like( '/departures/0/time', qr{ ^ \d \d? : \d\d $ }x, '.time' )
+  ->json_is( '/departures/0/train', 'S 1', '.train' )
+  ->json_like( '/departures/0/platform', qr{ ^ 1 | 2 $}x, '.platform' )
+  ->json_like( '/departures/0/route/0/name',
+	qr{ ^ (Dortmund|Bochum|Essen|D.sseldorf|Solingen) \s Hbf $}x, '.route[0]' )
+  ->json_like( '/departures/0/via/0',
+	qr{ ^ Dortmund-Dorstfeld \s S.d | Dortmund-Oespel $}x, '.via[0]' );
+
+$t->get_ok('/EDUV?mode=json&version=1&callback=my_callback')->status_is(200)
+  ->content_like( qr{ ^ my_callback \( }x, 'json callback works' );
 
-$t->get_ok('/EDUV?mode=json&version=1&callback=my_callback')
-  ->status_is(200)
-  ->content_like(qr{ ^ my_callback \( }x, 'json callback works');
 # ) <- just here to fix bracket grouping in vim
 
 done_testing();