Bugzilla – Attachment 151456 Details for
Bug 33778
Move t/Auth_with_shibboleth.t to db_dependent
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33778: Fix indentation of last subtest
Bug-33778-Fix-indentation-of-last-subtest.patch (text/plain), 5.33 KB, created by
Marcel de Rooy
on 2023-05-19 08:53:24 UTC
(
hide
)
Description:
Bug 33778: Fix indentation of last subtest
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2023-05-19 08:53:24 UTC
Size:
5.33 KB
patch
obsolete
>From c4ed74da4d1354b0084490fe26b810f143a6468e Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Fri, 19 May 2023 08:38:20 +0000 >Subject: [PATCH] Bug 33778: Fix indentation of last subtest >Content-Type: text/plain; charset=utf-8 > >Only whitespace. > >Test plan: >git diff -w HEAD~1.. t/Auth_with_shibboleth.t >No differences. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > t/Auth_with_shibboleth.t | 88 ++++++++++++++++++++-------------------- > 1 file changed, 44 insertions(+), 44 deletions(-) > >diff --git a/t/Auth_with_shibboleth.t b/t/Auth_with_shibboleth.t >index 8b464da682..89494a6a72 100755 >--- a/t/Auth_with_shibboleth.t >+++ b/t/Auth_with_shibboleth.t >@@ -270,57 +270,57 @@ subtest "checkpw_shib tests" => sub { > }; > > subtest 'get_uri' => sub { >-plan tests => 13; >-# Tests for OPAC >-t::lib::Mocks::mock_preference('OPACBaseURL', 'testopac.com' ); >-is( C4::Auth_with_shibboleth::_get_uri(), >- "https://testopac.com", "https opac uri returned" ); >+ plan tests => 13; >+ # Tests for OPAC >+ t::lib::Mocks::mock_preference('OPACBaseURL', 'testopac.com' ); >+ is( C4::Auth_with_shibboleth::_get_uri(), >+ "https://testopac.com", "https opac uri returned" ); >+ >+ $logger->clear; >+ >+ t::lib::Mocks::mock_preference('OPACBaseURL', 'http://testopac.com' ); >+ my $result = C4::Auth_with_shibboleth::_get_uri(); >+ is( $result, "https://testopac.com", "https opac uri returned" ); >+ $logger->warn_is("Shibboleth requires OPACBaseURL/staffClientBaseURL to use the https protocol!", "Improper protocol logged to warn") >+ ->clear(); > >-$logger->clear; >+ t::lib::Mocks::mock_preference('OPACBaseURL', 'https://testopac.com' ); >+ is( C4::Auth_with_shibboleth::_get_uri(), >+ "https://testopac.com", "https opac uri returned" ); > >-t::lib::Mocks::mock_preference('OPACBaseURL', 'http://testopac.com' ); >-my $result = C4::Auth_with_shibboleth::_get_uri(); >-is( $result, "https://testopac.com", "https opac uri returned" ); >-$logger->warn_is("Shibboleth requires OPACBaseURL/staffClientBaseURL to use the https protocol!", "Improper protocol logged to warn") >- ->clear(); >+ $logger->clear(); > >-t::lib::Mocks::mock_preference('OPACBaseURL', 'https://testopac.com' ); >-is( C4::Auth_with_shibboleth::_get_uri(), >- "https://testopac.com", "https opac uri returned" ); >+ t::lib::Mocks::mock_preference('OPACBaseURL', undef ); >+ $result = C4::Auth_with_shibboleth::_get_uri(); >+ is( $result, "https://", "https $interface uri returned" ); > >-$logger->clear(); >+ $logger->warn_is("Syspref staffClientBaseURL or OPACBaseURL not set!", "undefined OPACBaseURL - received expected warning") >+ ->clear(); > >-t::lib::Mocks::mock_preference('OPACBaseURL', undef ); >-$result = C4::Auth_with_shibboleth::_get_uri(); >-is( $result, "https://", "https $interface uri returned" ); >+ # Tests for staff client >+ $interface = 'intranet'; >+ t::lib::Mocks::mock_preference('StaffClientBaseURL', 'teststaff.com' ); >+ is( C4::Auth_with_shibboleth::_get_uri(), >+ "https://teststaff.com", "https $interface uri returned" ); > >-$logger->warn_is("Syspref staffClientBaseURL or OPACBaseURL not set!", "undefined OPACBaseURL - received expected warning") >- ->clear(); >+ $logger->clear; > >-# Tests for staff client >-$interface = 'intranet'; >-t::lib::Mocks::mock_preference('StaffClientBaseURL', 'teststaff.com' ); >-is( C4::Auth_with_shibboleth::_get_uri(), >- "https://teststaff.com", "https $interface uri returned" ); >- >-$logger->clear; >- >-t::lib::Mocks::mock_preference('StaffClientBaseURL', 'http://teststaff.com' ); >-$result = C4::Auth_with_shibboleth::_get_uri(); >-is( $result, "https://teststaff.com", "https $interface uri returned" ); >-$logger->warn_is("Shibboleth requires OPACBaseURL/staffClientBaseURL to use the https protocol!", 'check protocol warn') >- ->clear; >- >-t::lib::Mocks::mock_preference('StaffClientBaseURL', 'https://teststaff.com' ); >-is( C4::Auth_with_shibboleth::_get_uri(), >- "https://teststaff.com", "https $interface uri returned" ); >-is( $logger->count(), 0, 'No logging' ); >- >-t::lib::Mocks::mock_preference('StaffClientBaseURL', undef ); >-$result = C4::Auth_with_shibboleth::_get_uri(); >-is( $result, "https://", "https $interface uri returned" ); >-$logger->warn_is("Syspref staffClientBaseURL or OPACBaseURL not set!", "undefined staffClientBaseURL - received expected warning") >- ->clear; >+ t::lib::Mocks::mock_preference('StaffClientBaseURL', 'http://teststaff.com' ); >+ $result = C4::Auth_with_shibboleth::_get_uri(); >+ is( $result, "https://teststaff.com", "https $interface uri returned" ); >+ $logger->warn_is("Shibboleth requires OPACBaseURL/staffClientBaseURL to use the https protocol!", 'check protocol warn') >+ ->clear; >+ >+ t::lib::Mocks::mock_preference('StaffClientBaseURL', 'https://teststaff.com' ); >+ is( C4::Auth_with_shibboleth::_get_uri(), >+ "https://teststaff.com", "https $interface uri returned" ); >+ is( $logger->count(), 0, 'No logging' ); >+ >+ t::lib::Mocks::mock_preference('StaffClientBaseURL', undef ); >+ $result = C4::Auth_with_shibboleth::_get_uri(); >+ is( $result, "https://", "https $interface uri returned" ); >+ $logger->warn_is("Syspref staffClientBaseURL or OPACBaseURL not set!", "undefined staffClientBaseURL - received expected warning") >+ ->clear; > }; > $schema->storage->txn_rollback; > >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 33778
:
151454
|
151455
|
151456
|
151457
|
151494
|
151495
|
151496
|
151497
|
152672
|
152673
|
152674
|
152675
|
152676