Tests: perltidy (3a5c4c27) · Commits · derf / travelynx

t/11-journey-stats.t

+43 −18

Original line number	Diff line number	Diff line
		@@ -94,25 +94,38 @@ $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})
		$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{Passierschein A38})
		->content_like(qr{Daten wurden manuell eingetragen});

		$t->get_ok('/history/2018/10')->status_is(200)->content_like(qr{62 km})
		->content_like(qr{00:58 Stunden})->content_like(qr{00:00 Stunden})
		$t->get_ok('/history/2018/10')
		->status_is(200)
		->content_like(qr{62 km})
		->content_like(qr{00:58 Stunden})
		->content_like(qr{00:00 Stunden})
		->content_like(qr{Bei Abfahrt: 00:00 Stunden})
		->content_like(qr{Bei Ankunft: 00:00 Stunden});

		$t->get_ok('/history/2018')->status_is(200)->content_like(qr{62 km})
		->content_like(qr{00:58 Stunden})->content_like(qr{00:00 Stunden})
		$t->get_ok('/history/2018')
		->status_is(200)
		->content_like(qr{62 km})
		->content_like(qr{00:58 Stunden})
		->content_like(qr{00:00 Stunden})
		->content_like(qr{Bei Abfahrt: 00:00 Stunden})
		->content_like(qr{Bei Ankunft: 00:00 Stunden});

		$t->get_ok('/history/map')->status_is(200)
		$t->get_ok('/history/map')
		->status_is(200)
		->content_like(qr{\[\[51.956[^,],7.635[^]]\],'M.nster$Westf$Hbf'\],})
		->content_like(qr{\[\[51.504[^,],7.102[^]]\],'Gelsenkirchen Hbf'\]});

		@@ -134,14 +147,20 @@ $t->post_ok(
		);
		$t->status_is(302)->header_is( location => '/journey/2' );

		$t->get_ok('/history/2018/11')->status_is(200)->content_like(qr{62 km})
		->content_like(qr{01:15 Stunden})->content_like(qr{nach Fahrplan: 00:58})
		$t->get_ok('/history/2018/11')
		->status_is(200)
		->content_like(qr{62 km})
		->content_like(qr{01:15 Stunden})
		->content_like(qr{nach Fahrplan: 00:58})
		->content_like(qr{00:00 Stunden})
		->content_like(qr{Bei Abfahrt: 00:09 Stunden})
		->content_like(qr{Bei Ankunft: 00:26 Stunden});

		$t->get_ok('/history/2018')->status_is(200)->content_like(qr{124 km})
		->content_like(qr{02:13 Stunden})->content_like(qr{nach Fahrplan: 01:56})
		$t->get_ok('/history/2018')
		->status_is(200)
		->content_like(qr{124 km})
		->content_like(qr{02:13 Stunden})
		->content_like(qr{nach Fahrplan: 01:56})
		->content_like(qr{00:00 Stunden})
		->content_like(qr{Bei Abfahrt: 00:09 Stunden})
		->content_like(qr{Bei Ankunft: 00:26 Stunden});
		@@ -164,14 +183,20 @@ $t->post_ok(
		);
		$t->status_is(302)->header_is( location => '/journey/3' );

		$t->get_ok('/history/2018/11')->status_is(200)->content_like(qr{513 km})
		->content_like(qr{05:15 Stunden})->content_like(qr{nach Fahrplan: 04:58})
		$t->get_ok('/history/2018/11')
		->status_is(200)
		->content_like(qr{513 km})
		->content_like(qr{05:15 Stunden})
		->content_like(qr{nach Fahrplan: 04:58})
		->content_like(qr{00:00 Stunden})
		->content_like(qr{Bei Abfahrt: 00:09 Stunden})
		->content_like(qr{Bei Ankunft: 00:26 Stunden});

		$t->get_ok('/history/2018')->status_is(200)->content_like(qr{576 km})
		->content_like(qr{06:13 Stunden})->content_like(qr{nach Fahrplan: 05:56})
		$t->get_ok('/history/2018')
		->status_is(200)
		->content_like(qr{576 km})
		->content_like(qr{06:13 Stunden})
		->content_like(qr{nach Fahrplan: 05:56})
		->content_like(qr{00:00 Stunden})
		->content_like(qr{Bei Abfahrt: 00:09 Stunden})
		->content_like(qr{Bei Ankunft: 00:26 Stunden});

t/22-transit-visibility.t

+76 −36

Original line number	Diff line number	Diff line
		@@ -110,30 +110,40 @@ sub test_intransit_visibility {
		$opt{effective_visibility_str}, $desc );

		if ( $opt{public} ) {
		$t->get_ok('/status/test1')->status_is(200)->content_like(qr{DPN\s*667});
		$t->get_ok('/ajax/status/test1.html')->status_is(200)
		$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\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)
		$t->get_ok('/status/test1')
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		$t->get_ok('/ajax/status/test1.html')->status_is(200)
		$t->get_ok('/ajax/status/test1.html')
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		$t->get_ok('/p/test1')->status_is(200)
		$t->get_ok('/p/test1')
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		}

		if ( $opt{with_token} ) {
		$t->get_ok("/status/test1/$token")->status_is(200)
		$t->get_ok("/status/test1/$token")
		->status_is(200)
		->content_like(qr{DPN\s*667});
		$t->get_ok("/ajax/status/test1.html?token=$j_token")->status_is(200)
		$t->get_ok("/ajax/status/test1.html?token=$j_token")
		->status_is(200)
		->content_like(qr{DPN\s*667});
		}
		else {
		$t->get_ok("/status/test1/$token")->status_is(200)
		$t->get_ok("/status/test1/$token")
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		$t->get_ok("/ajax/status/test1.html?token=$j_token")->status_is(200)
		$t->get_ok("/ajax/status/test1.html?token=$j_token")
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		}

		@@ -144,31 +154,41 @@ 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\s*667});
		$t->get_ok('/ajax/status/test1.html')->status_is(200)
		$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\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)
		$t->get_ok('/status/test1')
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		$t->get_ok('/ajax/status/test1.html')->status_is(200)
		$t->get_ok('/ajax/status/test1.html')
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		$t->get_ok('/p/test1')->status_is(200)
		$t->get_ok('/p/test1')
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		}

		# 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)
		$t->get_ok("/status/test1/$token")
		->status_is(200)
		->content_like(qr{DPN\s*667});
		$t->get_ok("/ajax/status/test1.html?token=$j_token")->status_is(200)
		$t->get_ok("/ajax/status/test1.html?token=$j_token")
		->status_is(200)
		->content_like(qr{DPN\s*667});
		}
		else {
		$t->get_ok("/status/test1/$token")->status_is(200)
		$t->get_ok("/status/test1/$token")
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		$t->get_ok("/ajax/status/test1.html?token=$j_token")->status_is(200)
		$t->get_ok("/ajax/status/test1.html?token=$j_token")
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		}

		@@ -180,31 +200,41 @@ 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\s*667});
		$t->get_ok('/ajax/status/test1.html')->status_is(200)
		$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\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)
		$t->get_ok('/status/test1')
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		$t->get_ok('/ajax/status/test1.html')->status_is(200)
		$t->get_ok('/ajax/status/test1.html')
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		$t->get_ok('/p/test1')->status_is(200)
		$t->get_ok('/p/test1')
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		}

		# uid2 can see uid1 with token if visibility is >= unlisted
		if ( $opt{effective_visibility} >= 30 ) {
		$t->get_ok("/status/test1/$token")->status_is(200)
		$t->get_ok("/status/test1/$token")
		->status_is(200)
		->content_like(qr{DPN\s*667});
		$t->get_ok("/ajax/status/test1.html?token=$j_token")->status_is(200)
		$t->get_ok("/ajax/status/test1.html?token=$j_token")
		->status_is(200)
		->content_like(qr{DPN\s*667});
		}
		else {
		$t->get_ok("/status/test1/$token")->status_is(200)
		$t->get_ok("/status/test1/$token")
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		$t->get_ok("/ajax/status/test1.html?token=$j_token")->status_is(200)
		$t->get_ok("/ajax/status/test1.html?token=$j_token")
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		}

		@@ -216,31 +246,41 @@ 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\s*667});
		$t->get_ok('/ajax/status/test1.html')->status_is(200)
		$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\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)
		$t->get_ok('/status/test1')
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		$t->get_ok('/ajax/status/test1.html')->status_is(200)
		$t->get_ok('/ajax/status/test1.html')
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		$t->get_ok('/p/test1')->status_is(200)
		$t->get_ok('/p/test1')
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		}

		# uid3 can see uid1 with token if visibility is >= unlisted
		if ( $opt{effective_visibility} >= 30 ) {
		$t->get_ok("/status/test1/$token")->status_is(200)
		$t->get_ok("/status/test1/$token")
		->status_is(200)
		->content_like(qr{DPN\s*667});
		$t->get_ok("/ajax/status/test1.html?token=$j_token")->status_is(200)
		$t->get_ok("/ajax/status/test1.html?token=$j_token")
		->status_is(200)
		->content_like(qr{DPN\s*667});
		}
		else {
		$t->get_ok("/status/test1/$token")->status_is(200)
		$t->get_ok("/status/test1/$token")
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		$t->get_ok("/ajax/status/test1.html?token=$j_token")->status_is(200)
		$t->get_ok("/ajax/status/test1.html?token=$j_token")
		->status_is(200)
		->content_like(qr{nicht eingecheckt});
		}

t/23-journey-visibility.t

+32 −16

Original line number	Diff line number	Diff line
		@@ -112,20 +112,24 @@ sub test_journey_visibility {
		$opt{effective_visibility_str}, $desc );

		if ( $opt{public} ) {
		$t->get_ok("/p/test1/j/$jid")->status_is(200)
		$t->get_ok("/p/test1/j/$jid")
		->status_is(200)
		->content_like(qr{DPN\s*667});
		}
		else {
		$t->get_ok("/p/test1/j/$jid")->status_is(404)
		$t->get_ok("/p/test1/j/$jid")
		->status_is(404)
		->content_like(qr{Fahrt nicht gefunden.});
		}

		if ( $opt{with_token} ) {
		$t->get_ok("/p/test1/j/$jid$token")->status_is(200)
		$t->get_ok("/p/test1/j/$jid$token")
		->status_is(200)
		->content_like(qr{DPN\s*667});
		}
		else {
		$t->get_ok("/p/test1/j/$jid$token")->status_is(404)
		$t->get_ok("/p/test1/j/$jid$token")
		->status_is(404)
		->content_like(qr{Fahrt nicht gefunden.});
		}

		@@ -136,21 +140,25 @@ 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)
		$t->get_ok("/p/test1/j/$jid")
		->status_is(200)
		->content_like(qr{DPN\s*667});
		}
		else {
		$t->get_ok("/p/test1/j/$jid")->status_is(404)
		$t->get_ok("/p/test1/j/$jid")
		->status_is(404)
		->content_like(qr{Fahrt nicht gefunden.});
		}

		# 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)
		$t->get_ok("/p/test1/j/$jid$token")
		->status_is(200)
		->content_like(qr{DPN\s*667});
		}
		else {
		$t->get_ok("/p/test1/j/$jid$token")->status_is(404)
		$t->get_ok("/p/test1/j/$jid$token")
		->status_is(404)
		->content_like(qr{Fahrt nicht gefunden.});
		}

		@@ -162,21 +170,25 @@ 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)
		$t->get_ok("/p/test1/j/$jid")
		->status_is(200)
		->content_like(qr{DPN\s*667});
		}
		else {
		$t->get_ok("/p/test1/j/$jid")->status_is(404)
		$t->get_ok("/p/test1/j/$jid")
		->status_is(404)
		->content_like(qr{Fahrt nicht gefunden.});
		}

		# 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)
		$t->get_ok("/p/test1/j/$jid$token")
		->status_is(200)
		->content_like(qr{DPN\s*667});
		}
		else {
		$t->get_ok("/p/test1/j/$jid$token")->status_is(404)
		$t->get_ok("/p/test1/j/$jid$token")
		->status_is(404)
		->content_like(qr{Fahrt nicht gefunden.});
		}

		@@ -188,21 +200,25 @@ 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)
		$t->get_ok("/p/test1/j/$jid")
		->status_is(200)
		->content_like(qr{DPN\s*667});
		}
		else {
		$t->get_ok("/p/test1/j/$jid")->status_is(404)
		$t->get_ok("/p/test1/j/$jid")
		->status_is(404)
		->content_like(qr{Fahrt nicht gefunden.});
		}

		# 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)
		$t->get_ok("/p/test1/j/$jid$token")
		->status_is(200)
		->content_like(qr{DPN\s*667});
		}
		else {
		$t->get_ok("/p/test1/j/$jid$token")->status_is(404)
		$t->get_ok("/p/test1/j/$jid$token")
		->status_is(404)
		->content_like(qr{Fahrt nicht gefunden.});
		}

t/24-past-visibility.t

+16 −8

Original line number	Diff line number	Diff line
		@@ -117,11 +117,13 @@ sub test_history_visibility {
		= "history vis=$opt{set_past_visibility} journey=$jid vis=$journey->{effective_visibility_str}";

		if ( $opt{public} ) {
		$t->get_ok('/p/test1')->status_is(200)
		$t->get_ok('/p/test1')
		->status_is(200)
		->content_like( qr{DPN\s*667}, "public $desc" );
		}
		else {
		$t->get_ok('/p/test1')->status_is(200)
		$t->get_ok('/p/test1')
		->status_is(200)
		->content_unlike( qr{DPN\s*667}, "public $desc" );
		}

		@@ -131,11 +133,13 @@ sub test_history_visibility {
		);

		if ( $opt{self} ) {
		$t->get_ok('/p/test1')->status_is(200)
		$t->get_ok('/p/test1')
		->status_is(200)
		->content_like( qr{DPN\s*667}, "self $desc" );
		}
		else {
		$t->get_ok('/p/test1')->status_is(200)
		$t->get_ok('/p/test1')
		->status_is(200)
		->content_unlike( qr{DPN\s*667}, "self $desc" );
		}

		@@ -146,11 +150,13 @@ sub test_history_visibility {
		);

		if ( $opt{followers} ) {
		$t->get_ok('/p/test1')->status_is(200)
		$t->get_ok('/p/test1')
		->status_is(200)
		->content_like( qr{DPN\s*667}, "follower $desc" );
		}
		else {
		$t->get_ok('/p/test1')->status_is(200)
		$t->get_ok('/p/test1')
		->status_is(200)
		->content_unlike( qr{DPN\s*667}, "follower $desc" );
		}

		@@ -161,11 +167,13 @@ sub test_history_visibility {
		);

		if ( $opt{travelynx} ) {
		$t->get_ok('/p/test1')->status_is(200)
		$t->get_ok('/p/test1')
		->status_is(200)
		->content_like( qr{DPN\s*667}, "travelynx $desc" );
		}
		else {
		$t->get_ok('/p/test1')->status_is(200)
		$t->get_ok('/p/test1')
		->status_is(200)
		->content_unlike( qr{DPN\s*667}, "travelynx $desc" );
		}

Admin message