Attachment 83875 Details for Bug 17047 – Bug 17047: Fix unit tests Replace MANA_IP variable with subroutine Fix QA script warnings

[patch] Bug 17047: Fix unit tests Replace MANA_IP variable with subroutine Fix QA script warnings

Bug-17047-Fix-unit-tests-Replace-MANAIP-variable-w.patch (text/plain), 4.77 KB, created by Alex Arnaud on 2019-01-14 10:01:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Arnaud

Created: 2019-01-14 10:01:26 UTC

Size: 4.77 KB

patch

obsolete

>From da6d4e8afe3046c45f2f661ec388ef34690c0c4f Mon Sep 17 00:00:00 2001
>From: Alex Arnaud <alex.arnaud@biblibre.com>
>Date: Thu, 23 Aug 2018 07:47:47 +0000
>Subject: [PATCH] Bug 17047: Fix unit tests Replace MANA_IP variable with
> subroutine Fix QA script warnings
>
>Signed-off-by: Michal Denar <black23@gmail.com>
>
>Signed-off-by: Michal Denar <black23@gmail.com>
>---
> C4/Serials.pm                       |  1 +
> Koha/SharedContent.pm               | 19 +++++++++++++------
> t/db_dependent/Koha/SharedContent.t |  7 +++++--
> t/db_dependent/Koha/Subscription.t  |  4 ++--
> 4 files changed, 21 insertions(+), 10 deletions(-)
>
>diff --git a/C4/Serials.pm b/C4/Serials.pm
>index 24c1eca..23b67d8 100644
>--- a/C4/Serials.pm
>+++ b/C4/Serials.pm
>@@ -35,6 +35,7 @@ use Koha::DateUtils;
> use Koha::Serial;
> use Koha::Subscriptions;
> use Koha::Subscription::Histories;
>+use Koha::SharedContent;
> 
> use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
> 
>diff --git a/Koha/SharedContent.pm b/Koha/SharedContent.pm
>index a6b8584..1e98add 100644
>--- a/Koha/SharedContent.pm
>+++ b/Koha/SharedContent.pm
>@@ -26,8 +26,6 @@ use Koha::Serials;
> use Koha::Reports;
> use C4::Context;
> 
>-our $MANA_IP = C4::Context->config('mana_config');
>-
> =head1 DESCRIPTION
> 
> Package for accessing shared content via Mana
>@@ -151,13 +149,14 @@ sub manaGetRequest {
> sub buildRequest {
>     my $type = shift;
>     my $resource = shift;
>+    my $mana_url = manaUrl();
> 
>     if ( $type eq 'get' ) {
>         my $params = shift;
>         $params = join '&',
>             map { defined $params->{$_} ? $_ . "=" . $params->{$_} : () }
>             keys %$params;
>-        my $url = "$MANA_IP/$resource.json?$params";
>+        my $url = "$mana_url/$resource.json?$params";
>         return HTTP::Request->new( GET => $url );
>     }
> 
>@@ -168,14 +167,14 @@ sub buildRequest {
>             map { defined $params->{$_} ? $_ . "=" . $params->{$_} : () }
>             keys %$params;
> 
>-        my $url = "$MANA_IP/$resource/$id.json?$params";
>+        my $url = "$mana_url/$resource/$id.json?$params";
>         return HTTP::Request->new( GET => $url );
>     }
> 
>     if ( $type eq 'post' ) {
>         my $content  = shift;
> 
>-        my $url = "$MANA_IP/$resource.json";
>+        my $url = "$mana_url/$resource.json";
>         my $request = HTTP::Request->new( POST => $url );
> 
>         my $json = to_json( $content, { utf8 => 1 } );
>@@ -196,10 +195,18 @@ sub buildRequest {
>         $param = join '&',
>            map { defined $param->{$_} ? $_ . "=" . $param->{$_} : () }
>                keys %$param;
>-        my $url = "$MANA_IP/$resource/$id.json/increment/$field?$param";
>+        my $url = "$mana_url/$resource/$id.json/increment/$field?$param";
>         my $request = HTTP::Request->new( POST => $url );
> 
>     }
> }
> 
>+=head3 manaUrl
>+
>+=cut
>+
>+sub manaUrl {
>+    return C4::Context->config('mana_config');
>+}
>+
> 1;
>diff --git a/t/db_dependent/Koha/SharedContent.t b/t/db_dependent/Koha/SharedContent.t
>index 3925b30..5e41814 100644
>--- a/t/db_dependent/Koha/SharedContent.t
>+++ b/t/db_dependent/Koha/SharedContent.t
>@@ -23,7 +23,7 @@ use t::lib::TestBuilder;
> use t::lib::Mocks;
> use Test::MockModule;
> use Test::MockObject;
>-use Test::More tests => 43;
>+use Test::More tests => 44;
> use Koha::Database;
> use Koha::Patrons;
> use Koha::Subscriptions;
>@@ -41,7 +41,10 @@ my $want_error = 0;
> my $post_request = 0;
> my $query = {};
> 
>-$Koha::SharedContent::MANA_IP = 'https://foo.bar';
>+t::lib::Mocks::mock_config( 'mana_config', 'https://foo.bar');
>+
>+is(Koha::SharedContent::manaUrl(), 'https://foo.bar', 'Mana URL');
>+
> my $result = Koha::SharedContent::manaGetRequest('report', $query);
> ok($result->{msg} =~ /Can\'t connect to foo.bar:443$/, 'Unable to connect');
> is($result->{code}, 500, 'Code is 500');
>diff --git a/t/db_dependent/Koha/Subscription.t b/t/db_dependent/Koha/Subscription.t
>index c378917..fadaae7 100644
>--- a/t/db_dependent/Koha/Subscription.t
>+++ b/t/db_dependent/Koha/Subscription.t
>@@ -31,7 +31,6 @@ use t::lib::TestBuilder;
> 
> my $schema = Koha::Database->new->schema;
> $schema->storage->txn_begin;
>-my $builder = t::lib::TestBuilder->new;
> 
> use_ok('Koha::Subscription');
> 
>@@ -150,6 +149,7 @@ my $ref = {
>     'unit'            => $sub_freq_1->{unit},
>     'unitsperissue'   => $sub_freq_1->{unitsperissue},
>     'issuesperunit'   => $sub_freq_1->{issuesperunit},
>+    'label'           => $sub_np_1->{label},
>     'sndescription'   => $sub_np_1->{description},
>     'numberingmethod' => $sub_np_1->{numberingmethod},
>     'label'           => $sub_np_1->{label},
>@@ -176,7 +176,7 @@ my $ref = {
>     'publishercode'   => $bi_1->{publishercode}
> };
> 
>-is_deeply( Koha::Subscription::get_sharable_info( $sub_1->{subscriptionid} ),
>+is_deeply( Koha::Subscription->get_sharable_info( $sub_1->{subscriptionid} ),
>     $ref, "get_sharable_info function is ok" );
> 
> $schema->storage->txn_rollback;
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 17047: 56175 | 56176 | 56177 | 56178 | 56179 | 56180 | 56181 | 59728 | 59729 | 59931 | 61905 | 62045 | 62046 | 62047 | 62048 | 62049 | 62050 | 62051 | 62052 | 62053 | 62054 | 62075 | 62465 | 62475 | 62485 | 62540 | 62542 | 62543 | 62544 | 62545 | 62546 | 62547 | 62548 | 62549 | 62550 | 62551 | 62552 | 62553 | 62589 | 62591 | 62592 | 62593 | 62594 | 62595 | 62596 | 62597 | 62598 | 62599 | 62603 | 62604 | 62605 | 62606 | 62607 | 62768 | 63476 | 63601 | 63618 | 63619 | 63620 | 63621 | 63622 | 63623 | 64484 | 64530 | 64618 | 64619 | 64620 | 64621 | 64622 | 64623 | 64624 | 64625 | 64626 | 64627 | 64628 | 64629 | 64630 | 64631 | 64632 | 64633 | 64634 | 64635 | 64636 | 64637 | 64638 | 64639 | 64640 | 64641 | 64642 | 64643 | 64648 | 64649 | 64650 | 64651 | 64652 | 64653 | 64654 | 64706 | 64962 | 65058 | 65059 | 65060 | 65061 | 65062 | 65063 | 65064 | 65065 | 65773 | 66667 | 66668 | 66987 | 67003 | 67004 | 67005 | 67006 | 67009 | 67010 | 67011 | 67012 | 67013 | 67014 | 67015 | 67016 | 67017 | 67018 | 67019 | 67020 | 67021 | 67022 | 67023 | 69034 | 69035 | 69036 | 69037 | 69038 | 69039 | 69040 | 69041 | 69091 | 70203 | 70204 | 70205 | 70206 | 70208 | 70209 | 70210 | 70211 | 70561 | 70874 | 72660 | 72661 | 72662 | 72663 | 72664 | 72665 | 72666 | 72667 | 72668 | 72669 | 72670 | 73699 | 73737 | 73738 | 73739 | 73740 | 73741 | 73742 | 73743 | 73744 | 73745 | 73746 | 73747 | 73748 | 73975 | 73976 | 73977 | 73978 | 73979 | 73980 | 73981 | 73982 | 73983 | 73984 | 73985 | 73986 | 76673 | 76674 | 76675 | 76676 | 76677 | 76678 | 76679 | 76680 | 76681 | 76682 | 76683 | 76684 | 78215 | 78216 | 78217 | 78218 | 78219 | 78220 | 78221 | 78222 | 78223 | 78224 | 78225 | 78226 | 78227 | 78228 | 78229 | 79868 | 79869 | 79870 | 79871 | 79872 | 79874 | 79877 | 79878 | 79879 | 79880 | 79881 | 79882 | 79883 | 79884 | 79885 | 79886 | 79887 | 79888 | 79922 | 79923 | 79924 | 79925 | 79926 | 79927 | 79928 | 79929 | 79930 | 79931 | 79932 | 79933 | 79934 | 79935 | 79936 | 79937 | 79938 | 79939 | 80183 | 80184 | 80185 | 80186 | 80187 | 80188 | 80189 | 80190 | 80191 | 80192 | 80193 | 80194 | 80195 | 80196 | 80197 | 80198 | 80199 | 80200 | 80471 | 80472 | 80473 | 80907 | 80908 | 80909 | 80910 | 80911 | 80912 | 80913 | 80914 | 80915 | 80916 | 80917 | 80918 | 80919 | 80920 | 80921 | 80922 | 80923 | 80924 | 81935 | 81936 | 81937 | 81938 | 81939 | 81940 | 81941 | 81942 | 81943 | 81944 | 81945 | 81946 | 81947 | 81948 | 81949 | 81950 | 81951 | 81952 | 81968 | 83863 | 83864 | 83865 | 83866 | 83867 | 83868 | 83869 | 83870 | 83871 | 83872 | 83873 | 83874 | 83875 | 83876 | 83877 | 83878 | 83879 | 83880 | 83881 | 83892 | 83893 | 83894 | 83895 | 83896 | 83897 | 83898 | 83899 | 83900 | 83901 | 83902 | 83903 | 83904 | 83905 | 83906 | 83907 | 83908 | 83909 | 83910 | 83911 | 83912 | 84142 | 84145 | 84210 | 84260 | 84261 | 84262 | 84263 | 84264 | 84265 | 84323 | 84324 | 84325 | 84326 | 84327 | 84328 | 84329 | 84332