@@ -, +, @@ --- t/db_dependent/Koha/Object.t | 51 ++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 23 deletions(-) --- a/t/db_dependent/Koha/Object.t +++ a/t/db_dependent/Koha/Object.t @@ -30,7 +30,7 @@ use Koha::Database; use Koha::DateUtils qw( dt_from_string ); use Koha::Libraries; use Koha::Patrons; -use Koha::ApiKeys; +use Koha::Library::Groups; use Scalar::Util qw( isvstring ); use Try::Tiny; @@ -563,22 +563,27 @@ subtest 'store() tests' => sub { plan tests => 16; - # Using Koha::ApiKey to test Koha::Object>-store + # Using Koha::Library::Groups to test Koha::Object>-store # Simple object with foreign keys and unique key $schema->storage->txn_begin; - # Create a patron to make sure its ID doesn't exist on the DB - my $patron = $builder->build_object({ class => 'Koha::Patrons' }); - my $patron_id = $patron->id; - $patron->delete; + # Create a library to make sure its ID doesn't exist on the DB + my $library = $builder->build_object({ class => 'Koha::Libraries' }); + my $branchcode = $library->branchcode; + $library->delete; - my $api_key = Koha::ApiKey->new({ patron_id => $patron_id, secret => 'a secret', description => 'a description' }); + my $library_group = Koha::Library::Group->new( + { + branchcode => $library->branchcode, + title => 'a title', + } + ); my $print_error = $schema->storage->dbh->{PrintError}; $schema->storage->dbh->{PrintError} = 0; throws_ok - { $api_key->store } + { $library_group->store } 'Koha::Exceptions::Object::FKConstraint', 'Exception is thrown correctly'; is( @@ -588,21 +593,21 @@ subtest 'store() tests' => sub { ); is( $@->broken_fk, - 'patron_id', + 'branchcode', 'Exception field is correct' ); - $patron = $builder->build_object({ class => 'Koha::Patrons' }); - $api_key = $builder->build_object({ class => 'Koha::ApiKeys' }); + $library_group = $builder->build_object({ class => 'Koha::Library::Groups' }); - my $new_api_key = Koha::ApiKey->new({ - patron_id => $patron_id, - secret => $api_key->secret, - description => 'a description', - }); + my $new_library_group = Koha::Library::Group->new( + { + branchcode => $library_group->branchcode, + title => $library_group->title, + } + ); throws_ok - { $new_api_key->store } + { $new_library_group->store } 'Koha::Exceptions::Object::DuplicateID', 'Exception is thrown correctly'; @@ -614,18 +619,18 @@ subtest 'store() tests' => sub { like( $@->duplicate_id, - qr/(api_keys\.)?secret/, + qr/(library_groups\.)?title/, 'Exception field is correct (note that MySQL 8 is displaying the tablename)' ); $schema->storage->dbh->{PrintError} = $print_error; # Successful test - $api_key->set({ secret => 'Manuel' }); - my $ret = $api_key->store; - is( ref($ret), 'Koha::ApiKey', 'store() returns the object on success' ); + $library_group->set({ title => 'Manuel' }); + my $ret = $library_group->store; + is( ref($ret), 'Koha::Library::Group', 'store() returns the object on success' ); - my $library = $builder->build_object( { class => 'Koha::Libraries' } ); + $library = $builder->build_object( { class => 'Koha::Libraries' } ); my $patron_category = $builder->build_object( { class => 'Koha::Patron::Categories', @@ -633,7 +638,7 @@ subtest 'store() tests' => sub { } ); - $patron = eval { + my $patron = eval { Koha::Patron->new( { categorycode => $patron_category->categorycode, --