Bug 25482: Explicitly set macros as not shard during tests
authorNick Clemens <nick@bywatersolutions.com>
Thu, 14 May 2020 10:42:06 +0000 (10:42 +0000)
committerMartin Renvoize <martin.renvoize@ptfs-europe.com>
Fri, 15 May 2020 11:47:08 +0000 (12:47 +0100)
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Koha/REST/V1/AdvancedEditorMacro.pm
t/db_dependent/api/v1/advanced_editor_macros.t

index 9207771..e941062 100644 (file)
@@ -75,8 +75,6 @@ sub get {
             error => "This macro is shared, you must access it via advanced_editor/macros/shared"
         });
     }
-    warn $macro->borrowernumber;
-    warn $patron->borrowernumber;
     if( $macro->borrowernumber != $patron->borrowernumber ){
         return $c->render( status => 403, openapi => {
             error => "You do not have permission to access this macro"
index e4a0625..72fb177 100644 (file)
@@ -56,6 +56,7 @@ subtest 'list() tests' => sub {
             name => 'Test1',
             macro => 'delete 100',
             borrowernumber => $patron_1->borrowernumber,
+            shared => 0,
         }
     });
     my $macro_2 = $builder->build_object({ class => 'Koha::AdvancedEditorMacros', value =>
@@ -63,7 +64,7 @@ subtest 'list() tests' => sub {
             name => 'Test2',
             macro => 'delete 100',
             borrowernumber => $patron_1->borrowernumber,
-            shared=> 1,
+            shared => 1,
         }
     });
     my $macro_3 = $builder->build_object({ class => 'Koha::AdvancedEditorMacros', value =>
@@ -71,6 +72,7 @@ subtest 'list() tests' => sub {
             name => 'Test3',
             macro => 'delete 100',
             borrowernumber => $patron_2->borrowernumber,
+            shared => 0,
         }
     });
     my $macro_4 = $builder->build_object({ class => 'Koha::AdvancedEditorMacros', value =>