t: fix login/logout url

diff --git a/src/newslash_web/lib/Newslash/Util/TestMan.pm b/src/newslash_web/lib/Newslash/Util/TestMan.pm
index ccbeea2..8f5ee5b 100644 (file)
--- a/src/newslash_web/lib/Newslash/Util/TestMan.pm
+++ b/src/newslash_web/lib/Newslash/Util/TestMan.pm
@@ -69,7 +69,7 @@ sub create_user {
 sub login {
     my ($self, $user, $passwd) = @_;
     $passwd //= $user->{_passwd};
-    $self->t->post_ok('/login'
+    $self->t->post_ok('/my/login'
                       => {Accept => '*/*'}
                       => form
                       => {nickname => $user->{nickname}, passwd => $passwd})
@@ -78,7 +78,7 @@ sub login {
 
 sub logout {
     my ($self) = @_;
-    $self->t->get_ok('/logout')->status_is(302);
+    $self->t->get_ok('/my/logout')->status_is(302);
 }
 
 sub create_admin {

diff --git a/src/newslash_web/t/admin_submissions.t b/src/newslash_web/t/admin_submissions.t
index 046c99e..823223c 100644 (file)
--- a/src/newslash_web/t/admin_submissions.t
+++ b/src/newslash_web/t/admin_submissions.t
@@ -16,13 +16,13 @@ if ($t->app->mode eq 'test') {
 }
 
 subtest 'login/logout test' => sub {
-    $t->post_ok('/login' => {Accept => '*/*'} => form => {nickname => 'test01', passwd => 'foobar'})
+    $t->post_ok('/my/login' => {Accept => '*/*'} => form => {nickname => 'test01', passwd => 'foobar'})
       ->status_is(302);
 
     $t->get_ok('/admin/submissions')->status_is(200);
     $t->get_ok('/api/v1/submissions')->status_is(200);
 
-    $t->get_ok('/logout')->status_is(302);
+    $t->get_ok('/my/logout')->status_is(302);
 };
 
 if ($t->app->mode eq 'test') {

diff --git a/src/newslash_web/t/api/ad_code.t b/src/newslash_web/t/api/ad_code.t
index daf8563..2777417 100644 (file)
--- a/src/newslash_web/t/api/ad_code.t
+++ b/src/newslash_web/t/api/ad_code.t
@@ -23,7 +23,7 @@ subtest 'create/select/update/delete/exports AD codes' => sub {
     plan skip_all => "mode is not 'test'" if ($t->app->mode ne 'test');
 
     # login
-    $t->post_ok('/login' => {Accept => '*/*'} => form => {nickname => $admin->{nickname}, passwd => $test_passwd})
+    $t->post_ok('/my/login' => {Accept => '*/*'} => form => {nickname => $admin->{nickname}, passwd => $test_passwd})
       ->status_is(302);
 
     my $ad_codes = $t->app->model('ad_codes');
@@ -105,7 +105,7 @@ subtest 'create/select/update/delete/exports AD codes' => sub {
       ->status_is(200);
 
     # finish
-    $t->get_ok('/logout')->status_is(302);
+    $t->get_ok('/my/logout')->status_is(302);
 };
 
 $test_man->cleanup;

diff --git a/src/newslash_web/t/api/box.t b/src/newslash_web/t/api/box.t
index 9029b6f..411d3e3 100644 (file)
--- a/src/newslash_web/t/api/box.t
+++ b/src/newslash_web/t/api/box.t
@@ -25,7 +25,7 @@ subtest 'create/select/update/delete/exports boxes' => sub {
     plan skip_all => "mode is not 'test'" if ($t->app->mode ne 'test');
 
     # login
-    $t->post_ok('/login' => {Accept => '*/*'} => form => {nickname => $admin->{nickname}, passwd => $test_passwd})
+    $t->post_ok('/my/login' => {Accept => '*/*'} => form => {nickname => $admin->{nickname}, passwd => $test_passwd})
       ->status_is(302);
 
     my $boxes = $t->app->model('boxes');
@@ -119,7 +119,7 @@ subtest 'create/select/update/delete/exports boxes' => sub {
     #$t->get_ok('/admin/sidebar')->status_is(200);
 
     # finish
-    $t->get_ok('/logout')->status_is(302);
+    $t->get_ok('/my/logout')->status_is(302);
 };
 
 $test_man->cleanup;

diff --git a/src/newslash_web/t/api/feeds.t b/src/newslash_web/t/api/feeds.t
index 415d5e4..1bc4d19 100644 (file)
--- a/src/newslash_web/t/api/feeds.t
+++ b/src/newslash_web/t/api/feeds.t
@@ -32,7 +32,7 @@ subtest 'create/select/update/delete/exports feeds and items' => sub {
     my $rs = $feeds->select(url => $test_url);
     $feeds->delete(feed_id => $rs->{feed_id}) if $rs;
 
-    $t->post_ok('/login' => {Accept => '*/*'} => form => {nickname => $admin->{nickname}, passwd => $test_passwd})
+    $t->post_ok('/my/login' => {Accept => '*/*'} => form => {nickname => $admin->{nickname}, passwd => $test_passwd})
       ->status_is(302);
 
     # fetch_url
@@ -121,7 +121,7 @@ subtest 'create/select/update/delete/exports feeds and items' => sub {
       ->status_is(404);
 
     # finish
-    $t->get_ok('/logout')->status_is(302);
+    $t->get_ok('/my/logout')->status_is(302);
 };
 
 $test_man->cleanup;

diff --git a/src/newslash_web/t/api/journal.t b/src/newslash_web/t/api/journal.t
index f0707ea..8f14322 100644 (file)
--- a/src/newslash_web/t/api/journal.t
+++ b/src/newslash_web/t/api/journal.t
@@ -46,7 +46,7 @@ EOT
           ->status_isnt(200);
 
         # login
-        $t->post_ok('/login' => {Accept => '*/*'} => form => {nickname => 'test01', passwd => 'foobar'})
+        $t->post_ok('/my/login' => {Accept => '*/*'} => form => {nickname => 'test01', passwd => 'foobar'})
           ->status_is(302);
 
         # login user can create journals
@@ -81,7 +81,7 @@ EOT
           ->or(sub {diag "message: " . $t->tx->res->json->{message}});
 
         # logout
-        $t->get_ok('/logout')->status_is(302);
+        $t->get_ok('/my/logout')->status_is(302);
 
     };
 
@@ -100,7 +100,7 @@ EOT
           ->status_isnt(200);
 
         # login
-        $t->post_ok('/login' => {Accept => '*/*'} => form => {nickname => 'test01', passwd => 'foobar'})
+        $t->post_ok('/my/login' => {Accept => '*/*'} => form => {nickname => 'test01', passwd => 'foobar'})
           ->status_is(302);
 
         # login user can create journals
@@ -111,14 +111,14 @@ EOT
           ->or(sub {diag "message: " . $t->tx->res->json->{message}});
 
         # logout
-        $t->get_ok('/logout')->status_is(302);
+        $t->get_ok('/my/logout')->status_is(302);
     };
 
 };
 
 subtest 'get journal' => sub {
     # login
-    #$t->post_ok('/login' => {Accept => '*/*'} => form => {nickname => 'test01', passwd => 'foobar'})
+    #$t->post_ok('/my/login' => {Accept => '*/*'} => form => {nickname => 'test01', passwd => 'foobar'})
     #  ->status_is(302);
 
     my $url;
@@ -136,7 +136,7 @@ subtest 'get journal' => sub {
       ->or(sub {diag "message: " . dumper($t->tx->res->json);});
 
     # logout
-    #$t->get_ok('/logout')->status_is(302);
+    #$t->get_ok('/my/logout')->status_is(302);
 };
 
 if ($t->app->mode eq 'test') {

diff --git a/src/newslash_web/t/api/poll.t b/src/newslash_web/t/api/poll.t
index dfe2d8f..1a68e79 100644 (file)
--- a/src/newslash_web/t/api/poll.t
+++ b/src/newslash_web/t/api/poll.t
@@ -24,7 +24,7 @@ if ($t->app->mode eq 'test') {
 SKIP: {
     skip "mode is not 'test'", 4 if ($t->app->mode ne 'test');
 
-    $t->post_ok('/login' => {Accept => '*/*'} => form => {nickname => $admin->{nickname}, passwd => $test_passwd})
+    $t->post_ok('/my/login' => {Accept => '*/*'} => form => {nickname => $admin->{nickname}, passwd => $test_passwd})
       ->status_is(302);
 
     subtest 'create / post poll' => sub {
@@ -62,7 +62,7 @@ SKIP: {
 
     };
 
-    $t->get_ok('/logout')->status_is(302);
+    $t->get_ok('/my/logout')->status_is(302);
 }
 
 $test_man->cleanup;

diff --git a/src/newslash_web/t/api/relation.t b/src/newslash_web/t/api/relation.t
index e37c880..44fda30 100644 (file)
--- a/src/newslash_web/t/api/relation.t
+++ b/src/newslash_web/t/api/relation.t
@@ -23,7 +23,7 @@ subtest 'update relation' => sub {
     ok($user02, "create test user 02");
 
     # login
-    $t->post_ok('/login' => {Accept => '*/*'} => form => {nickname => 'people1', passwd => "foobar"})
+    $t->post_ok('/my/login' => {Accept => '*/*'} => form => {nickname => 'people1', passwd => "foobar"})
       ->status_is(302);
 
     # get csrf_token
@@ -61,7 +61,7 @@ subtest 'update relation' => sub {
 
 
     # logout
-    $t->get_ok('/logout')->status_is(302);
+    $t->get_ok('/my/logout')->status_is(302);
 
     # finished. do cleanup...
     delete_user($t->app, "people1");

diff --git a/src/newslash_web/t/api/submission.t b/src/newslash_web/t/api/submission.t
index 7991da3..d3eb2a7 100644 (file)
--- a/src/newslash_web/t/api/submission.t
+++ b/src/newslash_web/t/api/submission.t
@@ -68,7 +68,7 @@ subtest 'create/preview/get submission' => sub {
     is($t->tx->res->json->{item}->{submission_id}, $sub_id, "valid submission id");
 
     # login as admin
-    $t->post_ok('/login' => {Accept => '*/*'} => form => {nickname => $admin->{nickname}, passwd => $test_passwd})
+    $t->post_ok('/my/login' => {Accept => '*/*'} => form => {nickname => $admin->{nickname}, passwd => $test_passwd})
       ->status_is(302);
 
     # get blocked items

diff --git a/src/newslash_web/t/basic.t b/src/newslash_web/t/basic.t
index b4a1007..d6f874c 100644 (file)
--- a/src/newslash_web/t/basic.t
+++ b/src/newslash_web/t/basic.t
@@ -12,7 +12,7 @@ my $t = Test::Mojo->new('Newslash::Web');
 
 $t->get_ok('/')->status_is(200);
 $t->get_ok('/journals')->status_is(200);
-$t->get_ok('/login')->status_is(200);
+$t->get_ok('/my/login')->status_is(200);
 
 $t->get_ok('/my/newuser')->status_is(200);
 $t->get_ok('/journal/0/')->status_is(404);
@@ -53,10 +53,10 @@ if ($t->app->mode eq 'test') {
 }
 
 subtest 'login/logout test' => sub {
-    $t->post_ok('/login' => {Accept => '*/*'} => form => {nickname => 'test01', passwd => 'foobar'})
+    $t->post_ok('/my/login' => {Accept => '*/*'} => form => {nickname => 'test01', passwd => 'foobar'})
       ->status_is(302);
     $t->get_ok('/')->element_exists('li#user-menu');
-    $t->get_ok('/logout')->status_is(302);
+    $t->get_ok('/my/logout')->status_is(302);
     $t->get_ok('/')->element_exists_not('li#user-menu');
 };