From 6ee192b6bede86205333b9a46740ab687870372f Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Mon, 30 Oct 2017 03:04:11 +0000 Subject: [PATCH] Bug 18974: Change to use ENV variables and fix login bug The kohadevbox has admin/admin set, so for testing when creating the initial superuser, if you wish to minimize effort, use admin/admin. Otherwise, make sure to: export KOHA_USER={whatever your user is} export KOHA_PASS={whatever your password is} before attempting to run the test. Signed-off-by: Mark Tompsett --- t/db_dependent/selenium/cataloging_workflow.t | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/t/db_dependent/selenium/cataloging_workflow.t b/t/db_dependent/selenium/cataloging_workflow.t index 5b868a3..b302619 100644 --- a/t/db_dependent/selenium/cataloging_workflow.t +++ b/t/db_dependent/selenium/cataloging_workflow.t @@ -32,10 +32,12 @@ use MARC::Record; use MARC::Field; my $dbh = C4::Context->dbh; -my $login = 'koha'; -my $password = 'koha'; -my $base_url= 'http://'.C4::Context->preference("staffClientBaseURL")."/cgi-bin/koha/"; -my $opac_url= C4::Context->preference("OPACBaseURL"); +my $login = $ENV{KOHA_USER} || 'koha'; +my $password = $ENV{KOHA_PASS} || 'koha'; +my $staff_client_base_url = + $ENV{KOHA_INTRANET_URL} || C4::Context->preference("staffClientBaseUrl") || q{}; +my $base_url= $staff_client_base_url . "/cgi-bin/koha/"; +my $opac_url = $ENV{KOHA_OPAC_URL} || C4::Context->preference("OPACBaseURL") || q{}; my $number_of_biblios_to_insert = 3; our $sample_data = { @@ -120,7 +122,7 @@ END { sub auth { my ( $driver, $login, $password) = @_; - fill_form( $driver, { userid => 'koha', password => 'koha' } ); + fill_form( $driver, { userid => $login, password => $password } ); my $login_button = $driver->find_element('//input[@id="submit"]'); $login_button->submit(); } -- 2.1.4