X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=t%2F000setup_database.t;h=53b5ffe44bc8925bb9af0ebbb9ab72746a0413f5;hb=201c9038c6c64d91b9be59991b6b6449c33a0d4f;hp=b4ebd13e767b568269de40258cc7c13413740cef;hpb=8317b7aa1407238c9fa8d609a1795b4ee20cb2dd;p=kivitendo-erp.git diff --git a/t/000setup_database.t b/t/000setup_database.t index b4ebd13e7..53b5ffe44 100755 --- a/t/000setup_database.t +++ b/t/000setup_database.t @@ -10,6 +10,7 @@ use Test::More; use SL::Auth; use SL::DBConnect; use SL::Form; +use SL::InstanceConfiguration; use SL::LXDebug; use SL::Layout::None; use SL::LxOfficeConf; @@ -53,6 +54,7 @@ sub setup { $::form = Form->new; $::auth = SL::Auth->new(unit_tests_database => 1); $::locale = Locale->new('de'); + $::instance_conf = SL::InstanceConfiguration->new; $db_cfg = $::lx_office_conf{'testing/database'}; } @@ -64,7 +66,6 @@ sub drop_and_create_database { SL::DBConnect->get_options, ); - $::auth->reset; my $dbh_template = SL::DBConnect->connect(@dbi_options) || BAIL_OUT("No database connection to the template database: " . $DBI::errstr); my $auth_dbh = $::auth->dbconnect(1); @@ -73,8 +74,6 @@ sub drop_and_create_database { $auth_dbh->disconnect; dbh_do($dbh_template, "DROP DATABASE \"" . $db_cfg->{db} . "\"", message => "Database could not be dropped"); - - $::auth->reset; } dbg("Creating database"); @@ -177,7 +176,7 @@ sub create_client_user_and_employee { dbh_do($dbh, $sth, bind => [ $_, $config{$_} ]) for sort keys %config; $sth->finish; - my $sth = $dbh->prepare(qq|INSERT INTO auth.group_rights (group_id, "right", granted) VALUES (1, ?, TRUE)|) || BAIL_OUT($dbh->errstr); + $sth = $dbh->prepare(qq|INSERT INTO auth.group_rights (group_id, "right", granted) VALUES (1, ?, TRUE)|) || BAIL_OUT($dbh->errstr); dbh_do($dbh, $sth, bind => [ $_ ]) for sort $::auth->all_rights; $sth->finish;