summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
Diffstat (limited to 't')
-rw-r--r--t/11-journey-stats.t4
-rw-r--r--t/12-journey-edit.t90
-rw-r--r--t/22-transit-visibility.t41
-rw-r--r--t/23-journey-visibility.t17
-rw-r--r--t/24-past-visibility.t17
-rw-r--r--t/r-negative-delay.t2
6 files changed, 103 insertions, 68 deletions
diff --git a/t/11-journey-stats.t b/t/11-journey-stats.t
index 9853b85..4623402 100644
--- a/t/11-journey-stats.t
+++ b/t/11-journey-stats.t
@@ -81,7 +81,7 @@ $t->post_ok(
csrf_token => $csrf_token,
action => 'save',
train => 'RE 42 11238',
- dep_station => 'EMST',
+ dep_station => 'EMSTP',
sched_departure => '16.10.2018 17:36',
rt_departure => '16.10.2018 17:36',
arr_station => 'EG',
@@ -122,7 +122,7 @@ $t->post_ok(
csrf_token => $csrf_token,
action => 'save',
train => 'RE 42 11238',
- dep_station => 'EMST',
+ dep_station => 'EMSTP',
sched_departure => '16.11.2018 17:36',
rt_departure => '16.11.2018 17:45',
arr_station => 'EG',
diff --git a/t/12-journey-edit.t b/t/12-journey-edit.t
index 27e309b..a38a7cc 100644
--- a/t/12-journey-edit.t
+++ b/t/12-journey-edit.t
@@ -16,6 +16,7 @@ use FindBin;
require "$FindBin::Bin/../index.pl";
use DateTime;
+use utf8;
my $t = Test::Mojo->new('Travelynx');
@@ -75,11 +76,12 @@ $t->post_ok(
);
$t->status_is(302)->header_is( location => '/' );
-$t->app->journeys->add(
+my ( $success, $error ) = $t->app->journeys->add(
db => $t->app->pg->db,
uid => $uid,
- dep_station => 'EMST',
- arr_station => 'EG',
+ backend_id => 1,
+ dep_station => 'Münster(Westf)Hbf',
+ arr_station => 'Gelsenkirchen Hbf',
sched_departure => DateTime->new(
year => 2018,
month => 10,
@@ -119,12 +121,22 @@ $t->app->journeys->add(
comment => 'Huhu'
);
-$t->get_ok('/journey/1')->status_is(200)->content_like(qr{M.nster\(Westf\)Hbf})
- ->content_like(qr{Gelsenkirchen Hbf})->content_like(qr{RE 11238})
- ->content_like(qr{Linie 42})->content_like(qr{..:36})
- ->content_like(qr{..:34})->content_like(qr{ca[.] 62 km})
- ->content_like(qr{Luftlinie: 62 km})->content_like(qr{64 km/h})
- ->content_like(qr{Huhu})->content_like(qr{Daten wurden manuell eingetragen});
+ok( $success, "journeys->add" );
+is( $error, undef, "journeys->add" );
+
+$t->get_ok('/journey/1')
+ ->status_is(200)
+ ->content_like(qr{M.nster\(Westf\)Hbf})
+ ->content_like(qr{Gelsenkirchen Hbf})
+ ->content_like(qr{RE 11238})
+ ->content_like(qr{Linie 42})
+ ->content_like(qr{..:36})
+ ->content_like(qr{..:34})
+ ->content_like(qr{ca[.] 62 km})
+ ->content_like(qr{Luftlinie: 62 km})
+ ->content_like(qr{64 km/h})
+ ->content_like(qr{Huhu})
+ ->content_like(qr{Daten wurden manuell eingetragen});
$t->post_ok(
'/journey/edit' => form => {
@@ -133,10 +145,14 @@ $t->post_ok(
}
);
-$t->status_is(200)->content_like(qr{M.nster\(Westf\)Hbf})
- ->content_like(qr{Gelsenkirchen Hbf})->content_like(qr{RE 11238})
- ->content_like(qr{Linie 42})->content_like(qr{16.10.2018 ..:36})
- ->content_like(qr{16.10.2018 ..:34})->content_like(qr{Huhu});
+$t->status_is(200)
+ ->content_like(qr{M.nster\(Westf\)Hbf})
+ ->content_like(qr{Gelsenkirchen Hbf})
+ ->content_like(qr{RE 11238})
+ ->content_like(qr{Linie 42})
+ ->content_like(qr{16.10.2018 ..:36})
+ ->content_like(qr{16.10.2018 ..:34})
+ ->content_like(qr{Huhu});
$csrf_token = $t->tx->res->dom->at('input[name=csrf_token]')->attr('value');
@@ -156,12 +172,19 @@ $t->post_ok(
$t->status_is(302)->header_is( location => '/journey/1' );
-$t->get_ok('/journey/1')->status_is(200)->content_like(qr{M.nster\(Westf\)Hbf})
- ->content_like(qr{Gelsenkirchen Hbf})->content_like(qr{RE 11238})
- ->content_like(qr{Linie 42})->content_like(qr{..:36})
- ->content_like(qr{..:34})->content_like(qr{ca[.] 62 km})
- ->content_like(qr{Luftlinie: 62 km})->content_like(qr{64 km/h})
- ->content_like(qr{Huhu})->content_like(qr{Daten wurden manuell eingetragen});
+$t->get_ok('/journey/1')
+ ->status_is(200)
+ ->content_like(qr{M.nster\(Westf\)Hbf})
+ ->content_like(qr{Gelsenkirchen Hbf})
+ ->content_like(qr{RE 11238})
+ ->content_like(qr{Linie 42})
+ ->content_like(qr{..:36})
+ ->content_like(qr{..:34})
+ ->content_like(qr{ca[.] 62 km})
+ ->content_like(qr{Luftlinie: 62 km})
+ ->content_like(qr{64 km/h})
+ ->content_like(qr{Huhu})
+ ->content_like(qr{Daten wurden manuell eingetragen});
$t->post_ok(
'/journey/edit' => form => {
@@ -170,10 +193,14 @@ $t->post_ok(
}
);
-$t->status_is(200)->content_like(qr{M.nster\(Westf\)Hbf})
- ->content_like(qr{Gelsenkirchen Hbf})->content_like(qr{RE 11238})
- ->content_like(qr{Linie 42})->content_like(qr{16.10.2018 ..:36})
- ->content_like(qr{16.10.2018 ..:34})->content_like(qr{Huhu});
+$t->status_is(200)
+ ->content_like(qr{M.nster\(Westf\)Hbf})
+ ->content_like(qr{Gelsenkirchen Hbf})
+ ->content_like(qr{RE 11238})
+ ->content_like(qr{Linie 42})
+ ->content_like(qr{16.10.2018 ..:36})
+ ->content_like(qr{16.10.2018 ..:34})
+ ->content_like(qr{Huhu});
$csrf_token = $t->tx->res->dom->at('input[name=csrf_token]')->attr('value');
@@ -193,13 +220,18 @@ $t->post_ok(
$t->status_is(302)->header_is( location => '/journey/1' );
-$t->get_ok('/journey/1')->status_is(200)->content_like(qr{M.nster\(Westf\)Hbf})
- ->content_like(qr{Gelsenkirchen Hbf})->content_like(qr{RE 11238})
+$t->get_ok('/journey/1')
+ ->status_is(200)
+ ->content_like(qr{M.nster\(Westf\)Hbf})
+ ->content_like(qr{Gelsenkirchen Hbf})
+ ->content_like(qr{RE 11238})
->content_like(qr{Linie 42})
- ->content_like(qr{..:42\s*\(\+6,\s*Plan: ..:36\)})
- ->content_like(qr{..:33\s*\(-1,\s*Plan: ..:34\)})
- ->content_like(qr{ca[.] 62 km})->content_like(qr{Luftlinie: 62 km})
- ->content_like(qr{73 km/h})->content_like(qr{Huhu})
+ ->content_like(qr{..:42\s*\n*\s*\(\+6,\s*Plan: ..:36\)})
+ ->content_like(qr{..:33\s*\n*\s*\(-1,\s*Plan: ..:34\)})
+ ->content_like(qr{ca[.] 62 km})
+ ->content_like(qr{Luftlinie: 62 km})
+ ->content_like(qr{73 km/h})
+ ->content_like(qr{Huhu})
->content_like(qr{Daten wurden manuell eingetragen});
$t->app->pg->db->query('drop schema travelynx_test_12 cascade');
diff --git a/t/22-transit-visibility.t b/t/22-transit-visibility.t
index 7e995c5..8a68f5c 100644
--- a/t/22-transit-visibility.t
+++ b/t/22-transit-visibility.t
@@ -108,10 +108,10 @@ sub test_intransit_visibility {
$opt{effective_visibility_str}, $desc );
if ( $opt{public} ) {
- $t->get_ok('/status/test1')->status_is(200)->content_like(qr{DPN 667});
+ $t->get_ok('/status/test1')->status_is(200)->content_like(qr{DPN\s*667});
$t->get_ok('/ajax/status/test1.html')->status_is(200)
- ->content_like(qr{DPN 667});
- $t->get_ok('/p/test1')->status_is(200)->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
+ $t->get_ok('/p/test1')->status_is(200)->content_like(qr{DPN\s*667});
}
else {
$t->get_ok('/status/test1')->status_is(200)
@@ -124,9 +124,9 @@ sub test_intransit_visibility {
if ( $opt{with_token} ) {
$t->get_ok("/status/test1/$token")->status_is(200)
- ->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
$t->get_ok("/ajax/status/test1.html?token=$j_token")->status_is(200)
- ->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
}
else {
$t->get_ok("/status/test1/$token")->status_is(200)
@@ -142,10 +142,10 @@ sub test_intransit_visibility {
# users can see their own status if visibility is >= followrs
if ( $opt{effective_visibility} >= 60 ) {
- $t->get_ok('/status/test1')->status_is(200)->content_like(qr{DPN 667});
+ $t->get_ok('/status/test1')->status_is(200)->content_like(qr{DPN\s*667});
$t->get_ok('/ajax/status/test1.html')->status_is(200)
- ->content_like(qr{DPN 667});
- $t->get_ok('/p/test1')->status_is(200)->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
+ $t->get_ok('/p/test1')->status_is(200)->content_like(qr{DPN\s*667});
}
else {
$t->get_ok('/status/test1')->status_is(200)
@@ -159,9 +159,9 @@ sub test_intransit_visibility {
# users can see their own status with token if visibility is >= unlisted
if ( $opt{effective_visibility} >= 30 ) {
$t->get_ok("/status/test1/$token")->status_is(200)
- ->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
$t->get_ok("/ajax/status/test1.html?token=$j_token")->status_is(200)
- ->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
}
else {
$t->get_ok("/status/test1/$token")->status_is(200)
@@ -178,10 +178,10 @@ sub test_intransit_visibility {
# uid2 can see uid1 if visibility is >= followers
if ( $opt{effective_visibility} >= 60 ) {
- $t->get_ok('/status/test1')->status_is(200)->content_like(qr{DPN 667});
+ $t->get_ok('/status/test1')->status_is(200)->content_like(qr{DPN\s*667});
$t->get_ok('/ajax/status/test1.html')->status_is(200)
- ->content_like(qr{DPN 667});
- $t->get_ok('/p/test1')->status_is(200)->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
+ $t->get_ok('/p/test1')->status_is(200)->content_like(qr{DPN\s*667});
}
else {
$t->get_ok('/status/test1')->status_is(200)
@@ -195,9 +195,9 @@ sub test_intransit_visibility {
# uid2 can see uid1 with token if visibility is >= unlisted
if ( $opt{effective_visibility} >= 30 ) {
$t->get_ok("/status/test1/$token")->status_is(200)
- ->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
$t->get_ok("/ajax/status/test1.html?token=$j_token")->status_is(200)
- ->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
}
else {
$t->get_ok("/status/test1/$token")->status_is(200)
@@ -214,10 +214,10 @@ sub test_intransit_visibility {
# uid3 can see uid1 if visibility is >= travelynx
if ( $opt{effective_visibility} >= 80 ) {
- $t->get_ok('/status/test1')->status_is(200)->content_like(qr{DPN 667});
+ $t->get_ok('/status/test1')->status_is(200)->content_like(qr{DPN\s*667});
$t->get_ok('/ajax/status/test1.html')->status_is(200)
- ->content_like(qr{DPN 667});
- $t->get_ok('/p/test1')->status_is(200)->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
+ $t->get_ok('/p/test1')->status_is(200)->content_like(qr{DPN\s*667});
}
else {
$t->get_ok('/status/test1')->status_is(200)
@@ -231,9 +231,9 @@ sub test_intransit_visibility {
# uid3 can see uid1 with token if visibility is >= unlisted
if ( $opt{effective_visibility} >= 30 ) {
$t->get_ok("/status/test1/$token")->status_is(200)
- ->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
$t->get_ok("/ajax/status/test1.html?token=$j_token")->status_is(200)
- ->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
}
else {
$t->get_ok("/status/test1/$token")->status_is(200)
@@ -341,6 +341,7 @@ $t->app->in_transit->add(
departure_eva => 8000001,
train => $train_dep,
route => [],
+ backend_id => $t->app->stations->get_backend_id( iris => 1 ),
);
$t->app->in_transit->set_arrival_eva(
uid => $uid1,
diff --git a/t/23-journey-visibility.t b/t/23-journey-visibility.t
index 2124940..1cc7e64 100644
--- a/t/23-journey-visibility.t
+++ b/t/23-journey-visibility.t
@@ -111,7 +111,7 @@ sub test_journey_visibility {
if ( $opt{public} ) {
$t->get_ok("/p/test1/j/$jid")->status_is(200)
- ->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
}
else {
$t->get_ok("/p/test1/j/$jid")->status_is(404)
@@ -120,7 +120,7 @@ sub test_journey_visibility {
if ( $opt{with_token} ) {
$t->get_ok("/p/test1/j/$jid$token")->status_is(200)
- ->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
}
else {
$t->get_ok("/p/test1/j/$jid$token")->status_is(404)
@@ -135,7 +135,7 @@ sub test_journey_visibility {
# users can see their own status if visibility is >= followrs
if ( $opt{effective_visibility} >= 60 ) {
$t->get_ok("/p/test1/j/$jid")->status_is(200)
- ->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
}
else {
$t->get_ok("/p/test1/j/$jid")->status_is(404)
@@ -145,7 +145,7 @@ sub test_journey_visibility {
# users can see their own status with token if visibility is >= unlisted
if ( $opt{effective_visibility} >= 30 ) {
$t->get_ok("/p/test1/j/$jid$token")->status_is(200)
- ->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
}
else {
$t->get_ok("/p/test1/j/$jid$token")->status_is(404)
@@ -161,7 +161,7 @@ sub test_journey_visibility {
# uid2 can see uid1 if visibility is >= followers
if ( $opt{effective_visibility} >= 60 ) {
$t->get_ok("/p/test1/j/$jid")->status_is(200)
- ->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
}
else {
$t->get_ok("/p/test1/j/$jid")->status_is(404)
@@ -171,7 +171,7 @@ sub test_journey_visibility {
# uid2 can see uid1 with token if visibility is >= unlisted
if ( $opt{effective_visibility} >= 30 ) {
$t->get_ok("/p/test1/j/$jid$token")->status_is(200)
- ->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
}
else {
$t->get_ok("/p/test1/j/$jid$token")->status_is(404)
@@ -187,7 +187,7 @@ sub test_journey_visibility {
# uid3 can see uid1 if visibility is >= travelynx
if ( $opt{effective_visibility} >= 80 ) {
$t->get_ok("/p/test1/j/$jid")->status_is(200)
- ->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
}
else {
$t->get_ok("/p/test1/j/$jid")->status_is(404)
@@ -197,7 +197,7 @@ sub test_journey_visibility {
# uid3 can see uid1 with token if visibility is >= unlisted
if ( $opt{effective_visibility} >= 30 ) {
$t->get_ok("/p/test1/j/$jid$token")->status_is(200)
- ->content_like(qr{DPN 667});
+ ->content_like(qr{DPN\s*667});
}
else {
$t->get_ok("/p/test1/j/$jid$token")->status_is(404)
@@ -303,6 +303,7 @@ $t->app->in_transit->add(
departure_eva => 8000001,
train => $train_dep,
route => [],
+ backend_id => $t->app->stations->get_backend_id( iris => 1 ),
);
$t->app->in_transit->set_arrival_eva(
uid => $uid1,
diff --git a/t/24-past-visibility.t b/t/24-past-visibility.t
index 51c8081..cf981b9 100644
--- a/t/24-past-visibility.t
+++ b/t/24-past-visibility.t
@@ -116,11 +116,11 @@ sub test_history_visibility {
if ( $opt{public} ) {
$t->get_ok('/p/test1')->status_is(200)
- ->content_like( qr{DPN 667}, "public $desc" );
+ ->content_like( qr{DPN\s*667}, "public $desc" );
}
else {
$t->get_ok('/p/test1')->status_is(200)
- ->content_unlike( qr{DPN 667}, "public $desc" );
+ ->content_unlike( qr{DPN\s*667}, "public $desc" );
}
login(
@@ -130,11 +130,11 @@ sub test_history_visibility {
if ( $opt{self} ) {
$t->get_ok('/p/test1')->status_is(200)
- ->content_like( qr{DPN 667}, "self $desc" );
+ ->content_like( qr{DPN\s*667}, "self $desc" );
}
else {
$t->get_ok('/p/test1')->status_is(200)
- ->content_unlike( qr{DPN 667}, "self $desc" );
+ ->content_unlike( qr{DPN\s*667}, "self $desc" );
}
logout();
@@ -145,11 +145,11 @@ sub test_history_visibility {
if ( $opt{followers} ) {
$t->get_ok('/p/test1')->status_is(200)
- ->content_like( qr{DPN 667}, "follower $desc" );
+ ->content_like( qr{DPN\s*667}, "follower $desc" );
}
else {
$t->get_ok('/p/test1')->status_is(200)
- ->content_unlike( qr{DPN 667}, "follower $desc" );
+ ->content_unlike( qr{DPN\s*667}, "follower $desc" );
}
logout();
@@ -160,11 +160,11 @@ sub test_history_visibility {
if ( $opt{travelynx} ) {
$t->get_ok('/p/test1')->status_is(200)
- ->content_like( qr{DPN 667}, "travelynx $desc" );
+ ->content_like( qr{DPN\s*667}, "travelynx $desc" );
}
else {
$t->get_ok('/p/test1')->status_is(200)
- ->content_unlike( qr{DPN 667}, "travelynx $desc" );
+ ->content_unlike( qr{DPN\s*667}, "travelynx $desc" );
}
logout();
@@ -266,6 +266,7 @@ $t->app->in_transit->add(
departure_eva => 8000001,
train => $train_dep,
route => [],
+ backend_id => $t->app->stations->get_backend_id( iris => 1 ),
);
$t->app->in_transit->set_arrival_eva(
uid => $uid1,
diff --git a/t/r-negative-delay.t b/t/r-negative-delay.t
index 78bd6e0..4f9d94e 100644
--- a/t/r-negative-delay.t
+++ b/t/r-negative-delay.t
@@ -82,7 +82,7 @@ $t->post_ok(
csrf_token => $csrf_token,
action => 'save',
train => 'RE 42 11238',
- dep_station => 'EMST',
+ dep_station => 'EMSTP',
sched_departure => '16.10.2018 17:36',
rt_departure => '16.10.2018 17:35',
arr_station => 'EG',