X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=t%2Fdb_dependent%2FAuth_with_cas.t;h=b6d9e21f962ef603c28774754c34de1fe226fd49;hb=96cc447045f3f1d3702a3c69b36f596d88f38eda;hp=5389d2ed966be6962ce96ca4005d6b76528034c9;hpb=36c3d454262d814c2174483bec2a6a181c3fd3b0;p=koha-ffzg.git diff --git a/t/db_dependent/Auth_with_cas.t b/t/db_dependent/Auth_with_cas.t index 5389d2ed96..b6d9e21f96 100755 --- a/t/db_dependent/Auth_with_cas.t +++ b/t/db_dependent/Auth_with_cas.t @@ -22,6 +22,7 @@ use CGI; use t::lib::Mocks; use C4::Context; +use Koha::Database; BEGIN { use_ok('C4::Auth_with_cas'); @@ -34,10 +35,8 @@ BEGIN { /); } -my $dbh = C4::Context->dbh; -# Start transaction -$dbh->{ AutoCommit } = 0; -$dbh->{ RaiseError } = 1; +my $schema = Koha::Database->new->schema; +$schema->storage->txn_begin; C4::Context->disable_syspref_cache(); t::lib::Mocks::mock_preference('OPACBaseURL','http://localhost'); @@ -50,7 +49,7 @@ my $query_string = 'ticket=foo&bar=baz'; $ENV{QUERY_STRING} = $query_string; $ENV{SCRIPT_NAME} = '/cgi-bin/koha/opac-user.pl'; -my $cgi = new CGI($query_string); +my $cgi = CGI->new($query_string); $cgi->delete('ticket'); # _url_with_get_params tests @@ -58,12 +57,8 @@ is(C4::Auth_with_cas::_url_with_get_params($cgi, 'opac'), "$opac_base_url/cgi-bin/koha/opac-user.pl?bar=baz", "_url_with_get_params should return URL without deleted parameters (Bug 12398)"); +$ENV{SCRIPT_NAME} = '/cgi-bin/koha/circ/circulation-home.pl'; # intranet url test is(C4::Auth_with_cas::_url_with_get_params($cgi, 'intranet'), - "$staff_base_url?bar=baz", + "$staff_base_url/cgi-bin/koha/circ/circulation-home.pl?bar=baz", "Intranet URL should be returned when using intranet login (Bug 13507)"); - - - -$dbh->rollback; -