Attachment 82171 Details for Bug 20600 – Bug 20600: (follow-up) Fix unit tests

[patch] Bug 20600: (follow-up) Fix unit tests

Bug-20600-follow-up-Fix-unit-tests.patch (text/plain), 2.96 KB, created by Andrew Isherwood on 2018-11-09 14:39:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Isherwood

Created: 2018-11-09 14:39:13 UTC

Size: 2.96 KB

patch

obsolete

>From 5594bc1152355426f790d1eb62c6bd995ce41427 Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Fri, 9 Nov 2018 14:36:48 +0000
>Subject: [PATCH] Bug 20600: (follow-up) Fix unit tests
>
>The unit tests now need to be aware of the calculated placed_formatted
>and updated_formatted properties in the API response object
>---
> t/db_dependent/api/v1/illrequests.t | 30 ++++++++++++++++++++++++++++--
> 1 file changed, 28 insertions(+), 2 deletions(-)
>
>diff --git a/t/db_dependent/api/v1/illrequests.t b/t/db_dependent/api/v1/illrequests.t
>index 44fcd9a292..b00470860b 100644
>--- a/t/db_dependent/api/v1/illrequests.t
>+++ b/t/db_dependent/api/v1/illrequests.t
>@@ -28,6 +28,7 @@ use t::lib::Mocks;
> 
> use C4::Auth;
> use Koha::Illrequests;
>+use Koha::DateUtils qw( format_sqldatetime );
> 
> my $schema  = Koha::Database->new->schema;
> my $builder = t::lib::TestBuilder->new;
>@@ -94,11 +95,13 @@ subtest 'list() tests' => sub {
>         }
>     );
> 
>+    my $req_formatted = add_formatted($illrequest);
>+
>     # One illrequest created, should get returned
>     $tx = $t->ua->build_tx( GET => '/api/v1/illrequests' );
>     $tx->req->cookies( { name => 'CGISESSID', value => $session_id } );
>     $tx->req->env( { REMOTE_ADDR => $remote_address } );
>-    $t->request_ok($tx)->status_is(200)->json_is( [ $illrequest->unblessed ] );
>+    $t->request_ok($tx)->status_is(200)->json_is( [ $req_formatted ] );
> 
>     # One illrequest created, returned with augmented data
>     $tx = $t->ua->build_tx( GET =>
>@@ -123,12 +126,14 @@ subtest 'list() tests' => sub {
>         }
>     );
> 
>+    my $req2_formatted = add_formatted($illrequest2);
>+
>     # Two illrequest created, should get returned
>     $tx = $t->ua->build_tx( GET => '/api/v1/illrequests' );
>     $tx->req->cookies( { name => 'CGISESSID', value => $session_id } );
>     $tx->req->env( { REMOTE_ADDR => $remote_address } );
>     $t->request_ok($tx)->status_is(200)
>-      ->json_is( [ $illrequest->unblessed, $illrequest2->unblessed ] );
>+      ->json_is( [ $req_formatted, $req2_formatted ] );
> 
>     # Warn on unsupported query parameter
>     $tx = $t->ua->build_tx( GET => '/api/v1/illrequests?request_blah=blah' );
>@@ -141,6 +146,27 @@ subtest 'list() tests' => sub {
>     $schema->storage->txn_rollback;
> };
> 
>+sub add_formatted {
>+    my $req = shift;
>+    my @format_dates = ( 'placed', 'updated' );
>+    # We need to embellish the request with properties that the API
>+    # controller calculates on the fly
>+    my $req_unblessed = $req->unblessed;
>+    # Create new "formatted" columns for each date column
>+    # that needs formatting
>+    foreach my $field(@format_dates) {
>+        if (defined $req_unblessed->{$field}) {
>+            $req_unblessed->{$field . "_formatted"} = format_sqldatetime(
>+                $req_unblessed->{$field},
>+                undef,
>+                undef,
>+                1
>+            );
>+        }
>+    }
>+    return $req_unblessed;
>+}
>+
> sub create_user_and_session {
> 
>     my $args = shift;
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 20600: 74640 | 74641 | 75202 | 75276 | 75734 | 75735 | 75753 | 75755 | 75844 | 75845 | 75848 | 75849 | 75850 | 75851 | 75852 | 75853 | 75854 | 75871 | 77691 | 77692 | 77693 | 77694 | 77695 | 77696 | 77697 | 78439 | 78440 | 78441 | 78442 | 78443 | 78444 | 78445 | 78446 | 78463 | 78464 | 78465 | 78466 | 78467 | 78468 | 78469 | 78470 | 79183 | 80468 | 81992 | 81993 | 82032 | 82033 | 82034 | 82035 | 82036 | 82037 | 82038 | 82039 | 82062 | 82170 | 82171 | 82432 | 82433 | 82434 | 82435 | 82436 | 82437 | 82438 | 82439 | 82440 | 82441 | 82442 | 83882 | 83887 | 84736 | 84737 | 84738 | 84739 | 84740 | 84741 | 84742 | 84743 | 84744 | 84745 | 84746 | 84747 | 84748 | 84749 | 85037 | 85038 | 85039 | 85040 | 85041 | 85042 | 85043 | 85044 | 85045 | 85046 | 85047 | 85048 | 85049 | 85050