From b01114152f6538899d9ced983678bc4588edee69 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 20 Jan 2025 13:54:42 -0300 Subject: [PATCH] Bug 38929: (follow-up) Replace SWAGGER -> REST in the tests The wiki now uses `REST*` for the rule names instead of `SWAGGER*` some tests have their descriptions correct, but most don't. This is a follow-up to an editorial decision made on the Wiki (probably at a dev meeting too, I don't remember). QA tests will probably not pass, but I refrain from tidying it because there's a major tidy on its way to main. Signed-off-by: Tomas Cohen Arazi Signed-off-by: David Nind Signed-off-by: Matt Blenkinsop --- t/db_dependent/api/v1/acquisitions_orders.t | 20 +++++++------- t/db_dependent/api/v1/acquisitions_vendors.t | 16 ++++++------ .../api/v1/advanced_editor_macros.t | 4 +-- t/db_dependent/api/v1/article_requests.t | 6 ++--- t/db_dependent/api/v1/authorities.t | 4 +-- t/db_dependent/api/v1/bookings.t | 8 +++--- t/db_dependent/api/v1/cities.t | 8 +++--- t/db_dependent/api/v1/erm_agreements.t | 6 ++--- t/db_dependent/api/v1/erm_counter_files.t | 4 +-- .../api/v1/erm_eholdings_packages.t | 6 ++--- t/db_dependent/api/v1/erm_eholdings_titles.t | 6 ++--- t/db_dependent/api/v1/erm_licenses.t | 6 ++--- .../api/v1/erm_usage_data_providers.t | 6 ++--- t/db_dependent/api/v1/item_groups.t | 24 ++++++++--------- t/db_dependent/api/v1/items.t | 26 +++++++++---------- t/db_dependent/api/v1/items/bundled_items.t | 2 +- t/db_dependent/api/v1/libraries.t | 20 +++++++------- t/db_dependent/api/v1/patrons.t | 6 ++--- .../api/v1/patrons_extended_attributes.t | 12 ++++----- t/db_dependent/api/v1/patrons_holds.t | 12 ++++----- t/db_dependent/api/v1/patrons_recalls.t | 8 +++--- .../api/v1/preservation_Processings.t | 6 ++--- t/db_dependent/api/v1/preservation_Trains.t | 12 ++++----- t/db_dependent/api/v1/record_sources.t | 10 +++---- t/db_dependent/api/v1/return_claims.t | 6 ++--- t/db_dependent/api/v1/search_filters.t | 4 +-- t/db_dependent/api/v1/smtp_servers.t | 6 ++--- t/db_dependent/api/v1/stockrotation_rotas.t | 8 +++--- t/db_dependent/api/v1/suggestions.t | 16 ++++++------ t/db_dependent/api/v1/ticket_updates.t | 20 +++++++------- t/db_dependent/api/v1/tickets.t | 10 +++---- 31 files changed, 154 insertions(+), 154 deletions(-) diff --git a/t/db_dependent/api/v1/acquisitions_orders.t b/t/db_dependent/api/v1/acquisitions_orders.t index 53b9cab12cd..b02cb891ff8 100755 --- a/t/db_dependent/api/v1/acquisitions_orders.t +++ b/t/db_dependent/api/v1/acquisitions_orders.t @@ -77,7 +77,7 @@ subtest 'list() tests' => sub { my $count_of_orders = Koha::Acquisition::Orders->search( { orderstatus => 'new' } )->count; # Make sure we are returned with the correct amount of orders $t->get_ok( "//$userid:$password@/api/v1/acquisitions/orders?status=new&_per_page=-1" ) - ->status_is( 200, 'SWAGGER3.2.2' ) + ->status_is( 200, 'REST3.2.2' ) ->json_has('/'.($count_of_orders-1).'/order_id') ->json_hasnt('/'.($count_of_orders).'/order_id'); @@ -247,8 +247,8 @@ subtest 'get() tests' => sub { my $userid = $patron->userid; $t->get_ok( "//$userid:$password@/api/v1/acquisitions/orders/" . $order->ordernumber ) - ->status_is( 200, 'SWAGGER3.2.2' ) - ->json_is( '' => $order->to_api, 'SWAGGER3.3.2' ); + ->status_is( 200, 'REST3.2.2' ) + ->json_is( '' => $order->to_api, 'REST3.3.2' ); my $non_existent_order_id = $order->ordernumber; $order->delete; @@ -339,9 +339,9 @@ subtest 'add() tests' => sub { # Authorized attempt to write $t->post_ok( "//$auth_userid:$password@/api/v1/acquisitions/orders" => json => $order ) - ->status_is( 201, 'SWAGGER3.2.1' ) - ->json_is( '/internal_note' => $order->{internal_note}, 'SWAGGER3.3.1' ) - ->header_like( Location => qr/\/api\/v1\/acquisitions\/orders\/\d*/, 'SWAGGER3.4.1' ); + ->status_is( 201, 'REST3.2.1' ) + ->json_is( '/internal_note' => $order->{internal_note}, 'REST3.3.1' ) + ->header_like( Location => qr/\/api\/v1\/acquisitions\/orders\/\d*/, 'REST3.4.1' ); # save the order_id my $order_id = $order->{order_id}; @@ -425,8 +425,8 @@ subtest 'update() tests' => sub { $deleted_library->delete; $t->put_ok( "//$auth_userid:$password@/api/v1/libraries/$library_id" => json => $library_with_updated_field ) - ->status_is(200, 'SWAGGER3.2.1') - ->json_is( '' => $library_with_updated_field, 'SWAGGER3.3.3' ); + ->status_is(200, 'REST3.2.1') + ->json_is( '' => $library_with_updated_field, 'REST3.3.3' ); # Authorized attempt to write invalid data my $library_with_invalid_field = { %$library_with_updated_field }; @@ -481,8 +481,8 @@ subtest 'delete() tests' => sub { $t->delete_ok( "//$auth_userid:$password@/api/v1/acquisitions/orders/" . $order->ordernumber )->status_is(409); $order->orderstatus('cancelled')->store; $t->delete_ok( "//$auth_userid:$password@/api/v1/acquisitions/orders/" . $order->ordernumber ) - ->status_is(204, 'SWAGGER3.2.4') - ->content_is('', 'SWAGGER3.3.4'); + ->status_is(204, 'REST3.2.4') + ->content_is('', 'REST3.3.4'); $t->delete_ok( "//$auth_userid:$password@/api/v1/acquisitions/orders/" . $order->ordernumber ) ->status_is(404); diff --git a/t/db_dependent/api/v1/acquisitions_vendors.t b/t/db_dependent/api/v1/acquisitions_vendors.t index c5b27203874..6adc66dfcd5 100755 --- a/t/db_dependent/api/v1/acquisitions_vendors.t +++ b/t/db_dependent/api/v1/acquisitions_vendors.t @@ -108,8 +108,8 @@ subtest 'list() and delete() tests | authorized user' => sub { ->json_is( '/0/subscriptions_count' => '2', 'subscription count is 2' ); $t->delete_ok( "//$userid:$password@/api/v1/acquisitions/vendors/" . $vendor->id ) - ->status_is(204, 'SWAGGER3.2.4') - ->content_is('', 'SWAGGER3.3.4'); + ->status_is(204, 'REST3.2.4') + ->content_is('', 'REST3.3.4'); $t->get_ok( "//$userid:$password@/api/v1/acquisitions/vendors" ) ->status_is(200) @@ -117,8 +117,8 @@ subtest 'list() and delete() tests | authorized user' => sub { ->json_hasnt( '/1', 'Only one vendor' ); $t->delete_ok( "//$userid:$password@/api/v1/acquisitions/vendors/" . $other_vendor->id ) - ->status_is(204, 'SWAGGER3.2.4') - ->content_is('', 'SWAGGER3.3.4'); + ->status_is(204, 'REST3.2.4') + ->content_is('', 'REST3.3.4'); $t->get_ok( "//$userid:$password@/api/v1/acquisitions/vendors" ) ->status_is(200) @@ -209,8 +209,8 @@ subtest 'add() tests' => sub { # Authorized attempt to write $t->post_ok( "//$auth_userid:$password@/api/v1/acquisitions/vendors" => json => $vendor ) - ->status_is( 201, 'SWAGGER3 .2.1' ) - ->header_like( Location => qr|^\/api\/v1\/acquisitions\/vendors/\d*|, 'SWAGGER3.4.1') + ->status_is( 201, 'REST3 .2.1' ) + ->header_like( Location => qr|^\/api\/v1\/acquisitions\/vendors/\d*|, 'REST3.4.1') ->json_is( '/name' => $vendor->{name} ) ->json_is( '/address1' => $vendor->{address1} ); @@ -346,8 +346,8 @@ subtest 'delete() tests' => sub { ->status_is(403); $t->delete_ok( "//$auth_userid:$password@/api/v1/acquisitions/vendors/" . $vendor->id ) - ->status_is(204, 'SWAGGER3.2.4') - ->content_is('', 'SWAGGER3.3.4'); + ->status_is(204, 'REST3.2.4') + ->content_is('', 'REST3.3.4'); $t->delete_ok( "//$auth_userid:$password@/api/v1/acquisitions/vendors/" . $vendor->id ) ->status_is(404); diff --git a/t/db_dependent/api/v1/advanced_editor_macros.t b/t/db_dependent/api/v1/advanced_editor_macros.t index b95eeb2cb54..00d6d8a6f67 100755 --- a/t/db_dependent/api/v1/advanced_editor_macros.t +++ b/t/db_dependent/api/v1/advanced_editor_macros.t @@ -88,7 +88,7 @@ subtest 'list() tests' => sub { ## Authorized user tests # Make sure we are returned with the correct amount of macros $t->get_ok( "//$userid:$password@/api/v1/advanced_editor/macros" ) - ->status_is( 200, 'SWAGGER3.2.2' ) + ->status_is( 200, 'REST3.2.2' ) ->json_has('/' . $macros_index . '/macro_id') ->json_hasnt('/' . ($macros_index + 1) . '/macro_id'); @@ -227,7 +227,7 @@ subtest 'add() tests' => sub { # Authorized attempt to write $t->post_ok( "//$auth_userid:$password@/api/v1/advanced_editor/macros" => json => $macro_values ) - ->status_is( 201, 'SWAGGER3.2.1' ) + ->status_is( 201, 'REST3.2.1' ) ->json_has( '/macro_id', 'We generated a new id' ) ->json_is( '/name' => $macro_values->{name}, 'The name matches what we supplied' ) ->json_is( '/macro_text' => $macro_values->{macro_text}, 'The text matches what we supplied' ) diff --git a/t/db_dependent/api/v1/article_requests.t b/t/db_dependent/api/v1/article_requests.t index 6e43ffd6257..9ba0ffb060c 100755 --- a/t/db_dependent/api/v1/article_requests.t +++ b/t/db_dependent/api/v1/article_requests.t @@ -70,7 +70,7 @@ subtest 'cancel() tests' => sub { $t->delete_ok( "//$userid:$password@/api/v1/article_requests/" . $article_request->id . "?cancellation_reason=$reason¬es=$notes" ) - ->status_is( 204, 'SWAGGER3.2.4' )->content_is( q{}, 'SWAGGER3.2.4' ); + ->status_is( 204, 'REST3.2.4' )->content_is( q{}, 'REST3.2.4' ); # refresh object $article_request->discard_changes; @@ -146,8 +146,8 @@ subtest 'patron_cancel() tests' => sub { "//$userid:$password@/api/v1/public/patrons/$patron_id/article_requests/" . $article_request->id . "?cancellation_reason=$reason¬es=$notes" ) - ->status_is( 204, 'SWAGGER3.2.4' ) - ->content_is( q{}, 'SWAGGER3.2.4' ); + ->status_is( 204, 'REST3.2.4' ) + ->content_is( q{}, 'REST3.2.4' ); # refresh object $article_request->discard_changes; diff --git a/t/db_dependent/api/v1/authorities.t b/t/db_dependent/api/v1/authorities.t index 19d1a75cb3b..aa548fc4600 100755 --- a/t/db_dependent/api/v1/authorities.t +++ b/t/db_dependent/api/v1/authorities.t @@ -146,8 +146,8 @@ subtest 'delete() tests' => sub { $patron->flags( 2 ** 14 )->store; # 14 => editauthorities userflag $t->delete_ok("//$userid:$password@/api/v1/authorities/".$authority->id) - ->status_is(204, 'SWAGGER3.2.4') - ->content_is('', 'SWAGGER3.3.4'); + ->status_is(204, 'REST3.2.4') + ->content_is('', 'REST3.3.4'); $t->delete_ok("//$userid:$password@/api/v1/authorities/".$authority->id) ->status_is(404); diff --git a/t/db_dependent/api/v1/bookings.t b/t/db_dependent/api/v1/bookings.t index 349e488c961..17fcb0a6c06 100755 --- a/t/db_dependent/api/v1/bookings.t +++ b/t/db_dependent/api/v1/bookings.t @@ -255,8 +255,8 @@ subtest 'add() tests' => sub { # Authorized attempt to write my $booking_id = - $t->post_ok( "//$userid:$password@/api/v1/bookings" => json => $booking )->status_is( 201, 'SWAGGER3.2.1' ) - ->header_like( Location => qr|^\/api\/v1\/bookings/\d*|, 'SWAGGER3.4.1' ) + $t->post_ok( "//$userid:$password@/api/v1/bookings" => json => $booking )->status_is( 201, 'REST3.2.1' ) + ->header_like( Location => qr|^\/api\/v1\/bookings/\d*|, 'REST3.4.1' ) ->json_is( '/biblio_id' => $biblio->id )->tx->res->json->{booking_id}; # Authorized attempt to create with null id @@ -430,8 +430,8 @@ subtest 'delete() tests' => sub { # Unauthorized attempt to delete $t->delete_ok("//$unauth_userid:$password@/api/v1/bookings/$booking_id")->status_is(403); - $t->delete_ok("//$userid:$password@/api/v1/bookings/$booking_id")->status_is( 204, 'SWAGGER3.2.4' ) - ->content_is( '', 'SWAGGER3.3.4' ); + $t->delete_ok("//$userid:$password@/api/v1/bookings/$booking_id")->status_is( 204, 'REST3.2.4' ) + ->content_is( '', 'REST3.3.4' ); $t->delete_ok("//$userid:$password@/api/v1/bookings/$booking_id")->status_is(404); diff --git a/t/db_dependent/api/v1/cities.t b/t/db_dependent/api/v1/cities.t index 720e6434a15..b381b93a9bb 100755 --- a/t/db_dependent/api/v1/cities.t +++ b/t/db_dependent/api/v1/cities.t @@ -212,10 +212,10 @@ subtest 'add() tests' => sub { # Authorized attempt to write my $city_id = $t->post_ok( "//$userid:$password@/api/v1/cities" => json => $city ) - ->status_is( 201, 'SWAGGER3.2.1' ) + ->status_is( 201, 'REST3.2.1' ) ->header_like( Location => qr|^\/api\/v1\/cities/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' ) ->json_is( '/name' => $city->{name} ) ->json_is( '/state' => $city->{state} ) @@ -370,8 +370,8 @@ subtest 'delete() tests' => sub { ->status_is(403); $t->delete_ok("//$userid:$password@/api/v1/cities/$city_id") - ->status_is(204, 'SWAGGER3.2.4') - ->content_is('', 'SWAGGER3.3.4'); + ->status_is(204, 'REST3.2.4') + ->content_is('', 'REST3.3.4'); $t->delete_ok("//$userid:$password@/api/v1/cities/$city_id") ->status_is(404); diff --git a/t/db_dependent/api/v1/erm_agreements.t b/t/db_dependent/api/v1/erm_agreements.t index 5dc0517a677..b965d88821a 100755 --- a/t/db_dependent/api/v1/erm_agreements.t +++ b/t/db_dependent/api/v1/erm_agreements.t @@ -303,9 +303,9 @@ subtest 'add() tests' => sub { my $agreement_id = $t->post_ok( "//$userid:$password@/api/v1/erm/agreements" => json => $agreement ) - ->status_is( 201, 'SWAGGER3.2.1' )->header_like( + ->status_is( 201, 'REST3.2.1' )->header_like( Location => qr|^/api/v1/erm/agreements/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' )->json_is( '/vendor_id' => $agreement->{vendor_id} ) ->json_is( '/name' => $agreement->{name} ) ->json_is( '/description' => $agreement->{description} ) @@ -483,7 +483,7 @@ subtest 'delete() tests' => sub { # Delete existing agreement $t->delete_ok("//$userid:$password@/api/v1/erm/agreements/$agreement_id") - ->status_is( 204, 'SWAGGER3.2.4' )->content_is( '', 'SWAGGER3.3.4' ); + ->status_is( 204, 'REST3.2.4' )->content_is( '', 'REST3.3.4' ); # Attempt to delete non-existent agreement $t->delete_ok("//$userid:$password@/api/v1/erm/agreements/$agreement_id") diff --git a/t/db_dependent/api/v1/erm_counter_files.t b/t/db_dependent/api/v1/erm_counter_files.t index 3aba4138822..7a627aee65c 100755 --- a/t/db_dependent/api/v1/erm_counter_files.t +++ b/t/db_dependent/api/v1/erm_counter_files.t @@ -191,8 +191,8 @@ subtest 'delete() tests' => sub { $t->delete_ok("//$unauth_userid:$password@/api/v1/erm/counter_files/$counter_file_id")->status_is(403); # Delete existing counter_file - $t->delete_ok("//$userid:$password@/api/v1/erm/counter_files/$counter_file_id")->status_is( 204, 'SWAGGER3.2.4' ) - ->content_is( '', 'SWAGGER3.3.4' ); + $t->delete_ok("//$userid:$password@/api/v1/erm/counter_files/$counter_file_id")->status_is( 204, 'REST3.2.4' ) + ->content_is( '', 'REST3.3.4' ); # Attempt to delete non-existent counter_file $t->delete_ok("//$userid:$password@/api/v1/erm/counter_files/$counter_file_id")->status_is(404); diff --git a/t/db_dependent/api/v1/erm_eholdings_packages.t b/t/db_dependent/api/v1/erm_eholdings_packages.t index 090ba879a88..93a5c8240af 100755 --- a/t/db_dependent/api/v1/erm_eholdings_packages.t +++ b/t/db_dependent/api/v1/erm_eholdings_packages.t @@ -262,9 +262,9 @@ subtest 'add() tests' => sub { my $ehpackage_id = $t->post_ok( "//$userid:$password@/api/v1/erm/eholdings/local/packages" => json => - $ehpackage )->status_is( 201, 'SWAGGER3.2.1' )->header_like( + $ehpackage )->status_is( 201, 'REST3.2.1' )->header_like( Location => qr|^/api/v1/erm/eholdings/local/packages/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' )->json_is( '/name' => $ehpackage->{name} ) ->json_is( '/print_identifier' => $ehpackage->{print_identifier} ) ->json_is( '/notes' => $ehpackage->{notes} ) @@ -426,7 +426,7 @@ subtest 'delete() tests' => sub { # Delete existing EHolding package $t->delete_ok( "//$userid:$password@/api/v1/erm/eholdings/local/packages/$ehpackage_id" - )->status_is( 204, 'SWAGGER3.2.4' )->content_is( '', 'SWAGGER3.3.4' ); + )->status_is( 204, 'REST3.2.4' )->content_is( '', 'REST3.3.4' ); # Attempt to delete non-existent EHolding package $t->delete_ok( diff --git a/t/db_dependent/api/v1/erm_eholdings_titles.t b/t/db_dependent/api/v1/erm_eholdings_titles.t index 866310bfd33..0ed9f19d896 100755 --- a/t/db_dependent/api/v1/erm_eholdings_titles.t +++ b/t/db_dependent/api/v1/erm_eholdings_titles.t @@ -275,9 +275,9 @@ subtest 'add() tests' => sub { my $ehtitle_id = $t->post_ok( "//$userid:$password@/api/v1/erm/eholdings/local/titles" => json => - $ehtitle )->status_is( 201, 'SWAGGER3.2.1' )->header_like( + $ehtitle )->status_is( 201, 'REST3.2.1' )->header_like( Location => qr|^/api/v1/erm/eholdings/local/titles/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' )->json_is( '/publication_title' => $ehtitle->{publication_title} ) ->json_is( '/print_identifier' => $ehtitle->{print_identifier} ) ->json_is( '/notes' => $ehtitle->{notes} ) @@ -550,7 +550,7 @@ subtest 'delete() tests' => sub { # Delete existing EHolding title $t->delete_ok( "//$userid:$password@/api/v1/erm/eholdings/local/titles/$ehtitle_id") - ->status_is( 204, 'SWAGGER3.2.4' )->content_is( '', 'SWAGGER3.3.4' ); + ->status_is( 204, 'REST3.2.4' )->content_is( '', 'REST3.3.4' ); # Attempt to delete non-existent EHolding title $t->delete_ok( diff --git a/t/db_dependent/api/v1/erm_licenses.t b/t/db_dependent/api/v1/erm_licenses.t index e53555cb4e7..51f1fcd87fb 100755 --- a/t/db_dependent/api/v1/erm_licenses.t +++ b/t/db_dependent/api/v1/erm_licenses.t @@ -249,9 +249,9 @@ subtest 'add() tests' => sub { my $license_id = $t->post_ok( "//$userid:$password@/api/v1/erm/licenses" => json => $license ) - ->status_is( 201, 'SWAGGER3.2.1' )->header_like( + ->status_is( 201, 'REST3.2.1' )->header_like( Location => qr|^/api/v1/erm/licenses/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' )->json_is( '/name' => $license->{name} ) ->json_is( '/description' => $license->{description} ) ->json_is( '/type' => $license->{type} ) @@ -421,7 +421,7 @@ subtest 'delete() tests' => sub { # Delete existing license $t->delete_ok("//$userid:$password@/api/v1/erm/licenses/$license_id") - ->status_is( 204, 'SWAGGER3.2.4' )->content_is( '', 'SWAGGER3.3.4' ); + ->status_is( 204, 'REST3.2.4' )->content_is( '', 'REST3.3.4' ); # Attempt to delete non-existent license $t->delete_ok("//$userid:$password@/api/v1/erm/licenses/$license_id") diff --git a/t/db_dependent/api/v1/erm_usage_data_providers.t b/t/db_dependent/api/v1/erm_usage_data_providers.t index 273b52f246f..24edcb21375 100755 --- a/t/db_dependent/api/v1/erm_usage_data_providers.t +++ b/t/db_dependent/api/v1/erm_usage_data_providers.t @@ -240,9 +240,9 @@ subtest 'add() tests' => sub { # Authorized attempt to write my $usage_data_provider_id = $t->post_ok( "//$userid:$password@/api/v1/erm/usage_data_providers" => json => $usage_data_provider ) - ->status_is( 201, 'SWAGGER3.2.1' )->header_like( + ->status_is( 201, 'REST3.2.1' )->header_like( Location => qr|^/api/v1/erm/usage_data_providers/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' )->json_is( '/name' => $usage_data_provider->{name} ) ->json_is( '/customer_id' => $usage_data_provider->{customer_id} ) ->json_is( '/requestor_id' => $usage_data_provider->{requestor_id} ) @@ -401,7 +401,7 @@ subtest 'delete() tests' => sub { # Delete existing usage_data_provider $t->delete_ok("//$userid:$password@/api/v1/erm/usage_data_providers/$usage_data_provider_id") - ->status_is( 204, 'SWAGGER3.2.4' )->content_is( '', 'SWAGGER3.3.4' ); + ->status_is( 204, 'REST3.2.4' )->content_is( '', 'REST3.3.4' ); # Attempt to delete non-existent usage_data_provider $t->delete_ok("//$userid:$password@/api/v1/erm/usage_data_providers/$usage_data_provider_id")->status_is(404); diff --git a/t/db_dependent/api/v1/item_groups.t b/t/db_dependent/api/v1/item_groups.t index 3506eae582d..1b3a1bdffac 100755 --- a/t/db_dependent/api/v1/item_groups.t +++ b/t/db_dependent/api/v1/item_groups.t @@ -55,21 +55,21 @@ subtest 'list() tests' => sub { my $biblio_id = $biblio->id; $t->get_ok( "//$userid:$password@/api/v1/biblios/$biblio_id/item_groups" ) - ->status_is( 200, 'SWAGGER3.2.2' ); + ->status_is( 200, 'REST3.2.2' ); my $response_count = scalar @{ $t->tx->res->json }; is( $response_count, 0, 'Results count is 2'); my $item_group_1 = Koha::Biblio::ItemGroup->new( { biblio_id => $biblio->id, display_order => 1, description => "Vol 1" } )->store(); $t->get_ok( "//$userid:$password@/api/v1/biblios/$biblio_id/item_groups" ) - ->status_is( 200, 'SWAGGER3.2.2' ); + ->status_is( 200, 'REST3.2.2' ); $response_count = scalar @{ $t->tx->res->json }; is( $response_count, 1, 'Results count is 2'); my $item_group_2 = Koha::Biblio::ItemGroup->new( { biblio_id => $biblio->id, display_order => 2, description => "Vol 2" } )->store(); $t->get_ok( "//$userid:$password@/api/v1/biblios/$biblio_id/item_groups" ) - ->status_is( 200, 'SWAGGER3.2.2' ); + ->status_is( 200, 'REST3.2.2' ); $response_count = scalar @{ $t->tx->res->json }; is( $response_count, 2, 'Results count is 2'); @@ -108,7 +108,7 @@ subtest 'add() tests' => sub { # Authorized attempt $t->post_ok( "//$auth_userid:$password@/api/v1/biblios/$biblio_id/item_groups" => json => $item_group ) - ->status_is( 201, 'SWAGGER3.2.1' ); + ->status_is( 201, 'REST3.2.1' ); # Invalid biblio id { # hide useless warnings @@ -154,8 +154,8 @@ subtest 'update() tests' => sub { # Authorized attempt $t->put_ok( "//$auth_userid:$password@/api/v1/biblios/$biblio_id/item_groups/$item_group_id" => json => { description => "Vol A" } ) - ->status_is(200, 'SWAGGER3.2.1') - ->json_has( '/description' => "Vol A", 'SWAGGER3.3.3' ); + ->status_is(200, 'REST3.2.1') + ->json_has( '/description' => "Vol A", 'REST3.3.3' ); # Invalid biblio id $t->put_ok( "//$auth_userid:$password@/api/v1/biblios/XXX/item_groups/$item_group_id" => json => { description => "Vol A" } ) @@ -194,8 +194,8 @@ subtest 'delete() tests' => sub { my $item_groupid = $item_group->id; $t->delete_ok( "//$auth_userid:$password@/api/v1/biblios/$biblio_id/item_groups/$item_groupid" ) - ->status_is(204, 'SWAGGER3.2.4') - ->content_is('', 'SWAGGER3.3.4'); + ->status_is(204, 'REST3.2.4') + ->content_is('', 'REST3.3.4'); # Unauthorized attempt to delete $t->delete_ok( "//$unauth_userid:$password@/api/v1/biblios/$biblio_id/item_groups/$item_groupid" ) @@ -240,7 +240,7 @@ subtest 'volume items add() + delete() tests' => sub { ->json_is( { error => 'Item group does not belong to passed biblio_id' } ); $t->post_ok( "//$userid:$password@/api/v1/biblios/$biblio_id/item_groups/$item_groupid/items" => json => { item_id => $item_1->id } ) - ->status_is( 201, 'SWAGGER3.2.1' ); + ->status_is( 201, 'REST3.2.1' ); @items = $item_group->items; is( scalar(@items), 1, 'Item group now has one item'); @@ -249,14 +249,14 @@ subtest 'volume items add() + delete() tests' => sub { my $item_2_id = $item_2->id; $t->post_ok( "//$userid:$password@/api/v1/biblios/$biblio_id/item_groups/$item_groupid/items" => json => { item_id => $item_2->id } ) - ->status_is( 201, 'SWAGGER3.2.1' ); + ->status_is( 201, 'REST3.2.1' ); @items = $item_group->items->as_list; is( scalar(@items), 2, 'Item group now has two items'); $t->delete_ok( "//$userid:$password@/api/v1/biblios/$biblio_id/item_groups/$item_groupid/items/$item_1_id" ) - ->status_is(204, 'SWAGGER3.2.4') - ->content_is('', 'SWAGGER3.3.4'); + ->status_is(204, 'REST3.2.4') + ->content_is('', 'REST3.3.4'); @items = $item_group->items; is( scalar(@items), 1, 'Item group now has one item'); diff --git a/t/db_dependent/api/v1/items.t b/t/db_dependent/api/v1/items.t index 63ca5f73dbd..2d5592d0911 100755 --- a/t/db_dependent/api/v1/items.t +++ b/t/db_dependent/api/v1/items.t @@ -81,7 +81,7 @@ subtest 'list() tests' => sub { $userid = $patron->userid; $t->get_ok( "//$userid:$password@/api/v1/items?_per_page=10" ) - ->status_is( 200, 'SWAGGER3.2.2' ); + ->status_is( 200, 'REST3.2.2' ); my $response_count = scalar @{ $t->tx->res->json }; @@ -89,11 +89,11 @@ subtest 'list() tests' => sub { $t->get_ok( "//$userid:$password@/api/v1/items?external_id=" . $item->barcode ) ->status_is(200) - ->json_is( '' => [ $item->to_api ], 'SWAGGER3.3.2'); + ->json_is( '' => [ $item->to_api ], 'REST3.3.2'); $t->get_ok( "//$userid:$password@/api/v1/items?external_id=" . $item->barcode => {'x-koha-embed' => 'biblio'} ) ->status_is(200) - ->json_is( '' => [ { %{$item->to_api}, biblio => $item->biblio->to_api } ], 'SWAGGER3.3.2'); + ->json_is( '' => [ { %{$item->to_api}, biblio => $item->biblio->to_api } ], 'REST3.3.2'); my $barcode = $item->barcode; @@ -284,8 +284,8 @@ subtest 'get() tests' => sub { $userid = $patron->userid; $t->get_ok( "//$userid:$password@/api/v1/items/" . $item->itemnumber ) - ->status_is( 200, 'SWAGGER3.2.2' ) - ->json_is( '' => $item->to_api, 'SWAGGER3.3.2' ); + ->status_is( 200, 'REST3.2.2' ) + ->json_is( '' => $item->to_api, 'REST3.3.2' ); my $non_existent_code = $item->itemnumber; $item->delete; @@ -305,14 +305,14 @@ subtest 'get() tests' => sub { isnt( $biblio->itemtype, $itype->itemtype, "Test biblio level itemtype and item level itemtype do not match"); $t->get_ok( "//$userid:$password@/api/v1/items/" . $item->itemnumber ) - ->status_is( 200, 'SWAGGER3.2.2' ) + ->status_is( 200, 'REST3.2.2' ) ->json_is( '/item_type_id' => $itype->itemtype, 'item-level_itypes:0' ) ->json_is( '/effective_item_type_id' => $biblio->itemtype, 'item-level_itypes:0' ); t::lib::Mocks::mock_preference( 'item-level_itypes', 1 ); $t->get_ok( "//$userid:$password@/api/v1/items/" . $item->itemnumber ) - ->status_is( 200, 'SWAGGER3.2.2' ) + ->status_is( 200, 'REST3.2.2' ) ->json_is( '/item_type_id' => $itype->itemtype, 'item-level_itype:1' ) ->json_is( '/effective_item_type_id' => $itype->itemtype, 'item-level_itypes:1' ); @@ -323,18 +323,18 @@ subtest 'get() tests' => sub { $item->notforloan(1)->store(); $t->get_ok( "//$userid:$password@/api/v1/items/" . $item->itemnumber ) - ->status_is( 200, 'SWAGGER3.2.2' ) + ->status_is( 200, 'REST3.2.2' ) ->json_is( '/not_for_loan_status' => 1, 'not_for_loan_status is 1' ) ->json_is( '/effective_not_for_loan_status' => 1, 'effective_not_for_loan_status picks up item level' ); $item->notforloan(0)->store(); $t->get_ok( "//$userid:$password@/api/v1/items/" . $item->itemnumber ) - ->status_is( 200, 'SWAGGER3.2.2' ) + ->status_is( 200, 'REST3.2.2' ) ->json_is( '/not_for_loan_status' => 0, 'not_for_loan_status is 0' ) ->json_is( '/effective_not_for_loan_status' => 2, 'effective_not_for_loan_status now picks up itemtype level - item-level_itypes:1' ); $itype->notforloan(0)->store(); - $t->get_ok( "//$userid:$password@/api/v1/items/" . $item->itemnumber )->status_is( 200, 'SWAGGER3.2.2' ) + $t->get_ok( "//$userid:$password@/api/v1/items/" . $item->itemnumber )->status_is( 200, 'REST3.2.2' ) ->json_is( '/not_for_loan_status' => 0, 'not_for_loan_status is 0' )->json_is( '/effective_not_for_loan_status' => 0, 'effective_not_for_loan_status now picks up itemtype level and falls back to 0 because undef' @@ -342,7 +342,7 @@ subtest 'get() tests' => sub { t::lib::Mocks::mock_preference( 'item-level_itypes', 0 ); $t->get_ok( "//$userid:$password@/api/v1/items/" . $item->itemnumber ) - ->status_is( 200, 'SWAGGER3.2.2' ) + ->status_is( 200, 'REST3.2.2' ) ->json_is( '/not_for_loan_status' => 0, 'not_for_loan_status is 0' ) ->json_is( '/effective_not_for_loan_status' => 3, 'effective_not_for_loan_status now picks up itemtype level - item-level_itypes:0' ); @@ -416,8 +416,8 @@ subtest 'delete() tests' => sub { $fail = 0; $t->delete_ok("//$userid:$password@/api/v1/items/" . $item->id) - ->status_is(204, 'SWAGGER3.2.4') - ->content_is('', 'SWAGGER3.3.4'); + ->status_is(204, 'REST3.2.4') + ->content_is('', 'REST3.3.4'); $t->delete_ok("//$userid:$password@/api/v1/items/" . $item->id) ->status_is(404); diff --git a/t/db_dependent/api/v1/items/bundled_items.t b/t/db_dependent/api/v1/items/bundled_items.t index 4689dd820e7..fea46e265ff 100755 --- a/t/db_dependent/api/v1/items/bundled_items.t +++ b/t/db_dependent/api/v1/items/bundled_items.t @@ -56,7 +56,7 @@ subtest 'bundled_items()' => sub { $patron->set_password( { password => $password, skip_validation => 1 } ); $userid = $patron->userid; - $t->get_ok("//$userid:$password@/api/v1/items/$itemnumber/bundled_items")->status_is( 200, 'SWAGGER3.2.2' ); + $t->get_ok("//$userid:$password@/api/v1/items/$itemnumber/bundled_items")->status_is( 200, 'REST3.2.2' ); my $response_count = scalar @{ $t->tx->res->json }; diff --git a/t/db_dependent/api/v1/libraries.t b/t/db_dependent/api/v1/libraries.t index 4ecb26c2436..da4e1728623 100755 --- a/t/db_dependent/api/v1/libraries.t +++ b/t/db_dependent/api/v1/libraries.t @@ -58,7 +58,7 @@ subtest 'list() tests' => sub { ## Authorized user tests # Make sure we are returned with the correct amount of libraries $t->get_ok( "//$userid:$password@/api/v1/libraries" ) - ->status_is( 200, 'SWAGGER3.2.2' ); + ->status_is( 200, 'REST3.2.2' ); my $response_count = scalar @{ $t->tx->res->json }; my $expected_count = min( Koha::Libraries->count, C4::Context->preference('RESTdefaultPageSize') ); @@ -125,8 +125,8 @@ subtest 'get() tests' => sub { my $userid = $patron->userid; $t->get_ok( "//$userid:$password@/api/v1/libraries/" . $library->branchcode ) - ->status_is( 200, 'SWAGGER3.2.2' ) - ->json_is( '' => $library->to_api, 'SWAGGER3.3.2' ); + ->status_is( 200, 'REST3.2.2' ) + ->json_is( '' => $library->to_api, 'REST3.3.2' ); $t->get_ok( "//$userid:$password@/api/v1/libraries/" . $library->branchcode => { 'x-koha-embed' => 'cash_registers,desks' } )->status_is(200) @@ -197,9 +197,9 @@ subtest 'add() tests' => sub { # Authorized attempt to write $t->post_ok( "//$auth_userid:$password@/api/v1/libraries" => json => $library ) - ->status_is( 201, 'SWAGGER3.2.1' ) - ->json_is( '' => $library, 'SWAGGER3.3.1' ) - ->header_is( Location => '/api/v1/libraries/' . $library->{library_id}, 'SWAGGER3.4.1' ); + ->status_is( 201, 'REST3.2.1' ) + ->json_is( '' => $library, 'REST3.3.1' ) + ->header_is( Location => '/api/v1/libraries/' . $library->{library_id}, 'REST3.4.1' ); # save the library_id my $library_id = $library->{library_id}; @@ -268,8 +268,8 @@ subtest 'update() tests' => sub { $deleted_library->delete; $t->put_ok( "//$auth_userid:$password@/api/v1/libraries/$library_id" => json => $library_with_updated_field ) - ->status_is(200, 'SWAGGER3.2.1') - ->json_is( '' => $library_with_updated_field, 'SWAGGER3.3.3' ); + ->status_is(200, 'REST3.2.1') + ->json_is( '' => $library_with_updated_field, 'REST3.3.3' ); # Authorized attempt to write invalid data my $library_with_invalid_field = { %$library_with_updated_field }; @@ -320,8 +320,8 @@ subtest 'delete() tests' => sub { ->status_is(403); $t->delete_ok( "//$auth_userid:$password@/api/v1/libraries/$library_id" ) - ->status_is(204, 'SWAGGER3.2.4') - ->content_is('', 'SWAGGER3.3.4'); + ->status_is(204, 'REST3.2.4') + ->content_is('', 'REST3.3.4'); $t->delete_ok( "//$auth_userid:$password@/api/v1/libraries/$library_id" ) ->status_is(404); diff --git a/t/db_dependent/api/v1/patrons.t b/t/db_dependent/api/v1/patrons.t index b3116116709..4fb5836df44 100755 --- a/t/db_dependent/api/v1/patrons.t +++ b/t/db_dependent/api/v1/patrons.t @@ -519,7 +519,7 @@ subtest 'add() tests' => sub { ->status_is(201, 'Patron created successfully') ->header_like( Location => qr|^\/api\/v1\/patrons/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' ) ->json_has('/patron_id', 'got a patron_id') ->json_is( '/cardnumber' => $newpatron->{cardnumber}) @@ -1148,8 +1148,8 @@ subtest 'delete() tests' => sub { $patron->protected(0)->store(); $t->delete_ok("//$userid:$password@/api/v1/patrons/" . $patron->borrowernumber) - ->status_is(204, 'SWAGGER3.2.4') - ->content_is('', 'SWAGGER3.3.4'); + ->status_is(204, 'REST3.2.4') + ->content_is('', 'REST3.3.4'); my $deleted_patrons = Koha::Old::Patrons->search({ borrowernumber => $patron->borrowernumber }); is( $deleted_patrons->count, 1, 'The patron has been moved to the vault' ); diff --git a/t/db_dependent/api/v1/patrons_extended_attributes.t b/t/db_dependent/api/v1/patrons_extended_attributes.t index 278631fb339..d7bf3def849 100755 --- a/t/db_dependent/api/v1/patrons_extended_attributes.t +++ b/t/db_dependent/api/v1/patrons_extended_attributes.t @@ -47,7 +47,7 @@ subtest 'list_patron_attributes() tests' => sub { my $userid = $patron->userid; $t->get_ok("//$userid:$password@/api/v1/patrons/" . $patron->id . '/extended_attributes') - ->status_is( 200, 'SWAGGER3.2.2' ) + ->status_is( 200, 'REST3.2.2' ) ->json_is( [] ); # Let's add 3 attributes @@ -56,7 +56,7 @@ subtest 'list_patron_attributes() tests' => sub { } $t->get_ok("//$userid:$password@/api/v1/patrons/" . $patron->id . '/extended_attributes') - ->status_is( 200, 'SWAGGER3.2.2' ) + ->status_is( 200, 'REST3.2.2' ) ->json_is( '' => $patron->extended_attributes->to_api, 'Extended attributes retrieved correctly' ); my $non_existent_patron = $builder->build_object({ class => 'Koha::Patrons' }); @@ -84,7 +84,7 @@ subtest 'list_patron_attributes() tests' => sub { $t->get_ok( "//$userid:$password@/api/v1/patrons/" . $user->id - . '/extended_attributes' )->status_is( 200, 'SWAGGER3.2.2' ) + . '/extended_attributes' )->status_is( 200, 'REST3.2.2' ) ->json_is( '' => $user->extended_attributes->to_api, 'Extended attributes retrieved correctly' @@ -333,7 +333,7 @@ subtest 'overwrite() tests' => sub { $patron->add_extended_attribute({ code => $unique_attr_type->code, attribute => 'unique' }); $t->get_ok("//$userid:$password@/api/v1/patrons/" . $patron->id . '/extended_attributes') - ->status_is( 200, 'SWAGGER3.2.2' ) + ->status_is( 200, 'REST3.2.2' ) ->json_is( '' => $patron->extended_attributes->to_api, 'Extended attributes retrieved correctly' ); my $updated_attributes = [ @@ -403,8 +403,8 @@ subtest 'delete() tests' => sub { my $attr = $dummy_patron->add_extended_attribute({ code => $attr_type->code, attribute => 'blah' }); $t->delete_ok("//$userid:$password@/api/v1/patrons/" . $dummy_patron->id . '/extended_attributes/' . $attr->id ) - ->status_is(204, 'SWAGGER3.2.4') - ->content_is('', 'SWAGGER3.3.4'); + ->status_is(204, 'REST3.2.4') + ->content_is('', 'REST3.3.4'); $t->delete_ok("//$userid:$password@/api/v1/patrons/" . $dummy_patron->id . '/extended_attributes/' . $attr->id ) ->status_is(404) diff --git a/t/db_dependent/api/v1/patrons_holds.t b/t/db_dependent/api/v1/patrons_holds.t index ffe6f56f0d6..c7a494c681d 100755 --- a/t/db_dependent/api/v1/patrons_holds.t +++ b/t/db_dependent/api/v1/patrons_holds.t @@ -48,7 +48,7 @@ subtest 'list() tests' => sub { my $userid = $patron->userid; $t->get_ok("//$userid:$password@/api/v1/patrons/" . $patron->id . '/holds') - ->status_is( 200, 'SWAGGER3.2.2' ) + ->status_is( 200, 'REST3.2.2' ) ->json_is( [] ); my $hold_1 = $builder->build_object( { class => 'Koha::Holds', value => { borrowernumber => $patron->id } } ); @@ -56,17 +56,17 @@ subtest 'list() tests' => sub { my $hold_3 = $builder->build_object( { class => 'Koha::Holds', value => { borrowernumber => $patron->id } } ); $t->get_ok( "//$userid:$password@/api/v1/patrons/" . $patron->id . '/holds?_order_by=+me.hold_id' ) - ->status_is( 200, 'SWAGGER3.2.2' ) + ->status_is( 200, 'REST3.2.2' ) ->json_is( '' => [ $hold_1->to_api, $hold_2->to_api, $hold_3->to_api ], 'Holds retrieved' ); $hold_1->fill; $hold_3->fill; $t->get_ok( "//$userid:$password@/api/v1/patrons/" . $patron->id . '/holds?_order_by=+me.hold_id' ) - ->status_is( 200, 'SWAGGER3.2.2' )->json_is( '' => [ $hold_2->to_api ], 'Only current holds retrieved' ); + ->status_is( 200, 'REST3.2.2' )->json_is( '' => [ $hold_2->to_api ], 'Only current holds retrieved' ); $t->get_ok( "//$userid:$password@/api/v1/patrons/" . $patron->id . '/holds?old=1&_order_by=+me.hold_id' ) - ->status_is( 200, 'SWAGGER3.2.2' ) + ->status_is( 200, 'REST3.2.2' ) ->json_is( '' => [ $hold_1->to_api, $hold_3->to_api ], 'Only old holds retrieved' ); my $old_hold_1 = Koha::Old::Holds->find( $hold_1->id ); @@ -74,7 +74,7 @@ subtest 'list() tests' => sub { $old_hold_1->pickup_library->delete; $t->get_ok( "//$userid:$password@/api/v1/patrons/" . $patron->id . '/holds?old=1&_order_by=+me.hold_id' ) - ->status_is( 200, 'SWAGGER3.2.2' )->json_is( + ->status_is( 200, 'REST3.2.2' )->json_is( '' => [ $old_hold_1->get_from_storage->to_api, $hold_3->to_api ], 'Old holds even after item and library removed' ); @@ -133,7 +133,7 @@ subtest 'delete_public() tests' => sub { ); $t->delete_ok( "//$userid:$password@/api/v1/public/patrons/" . $patron->id . '/holds/' . $non_waiting_hold->id ) - ->status_is( 204, 'SWAGGER3.2.4' )->content_is( '', 'SWAGGER3.3.4' ); + ->status_is( 204, 'REST3.2.4' )->content_is( '', 'REST3.3.4' ); my $cancellation_requestable; diff --git a/t/db_dependent/api/v1/patrons_recalls.t b/t/db_dependent/api/v1/patrons_recalls.t index 5943af95282..96843a6f413 100755 --- a/t/db_dependent/api/v1/patrons_recalls.t +++ b/t/db_dependent/api/v1/patrons_recalls.t @@ -48,7 +48,7 @@ subtest 'list() tests' => sub { $patron->set_password( { password => $password, skip_validation => 1 } ); my $userid = $patron->userid; - $t->get_ok( "//$userid:$password@/api/v1/patrons/" . $patron->id . '/recalls' )->status_is( 200, 'SWAGGER3.2.2' ) + $t->get_ok( "//$userid:$password@/api/v1/patrons/" . $patron->id . '/recalls' )->status_is( 200, 'REST3.2.2' ) ->json_is( [] ); my $recall_1 = $builder->build_object( { class => 'Koha::Recalls', value => { patron_id => $patron->id } } ); @@ -59,16 +59,16 @@ subtest 'list() tests' => sub { my $recall_3 = $builder->build_object( { class => 'Koha::Recalls', value => { patron_id => $patron_2->id } } ); $t->get_ok( "//$userid:$password@/api/v1/patrons/" . $patron->id . '/recalls?_order_by=+me.recall_id' ) - ->status_is( 200, 'SWAGGER3.2.2' ) + ->status_is( 200, 'REST3.2.2' ) ->json_is( '' => [ $recall_1->to_api, $recall_2->to_api ], 'Recalls retrieved' ); $t->get_ok( "//$userid:$password@/api/v1/patrons/" . $patron_2->id . '/recalls?_order_by=+me.recall_id' ) - ->status_is( 200, 'SWAGGER3.2.2' )->json_is( '' => [ $recall_3->to_api ], 'Recalls retrieved' ); + ->status_is( 200, 'REST3.2.2' )->json_is( '' => [ $recall_3->to_api ], 'Recalls retrieved' ); $recall_3->delete; $t->get_ok( "//$userid:$password@/api/v1/patrons/" . $patron_2->id . '/recalls?_order_by=+me.recall_id' ) - ->status_is( 200, 'SWAGGER3.2.2' )->json_is( [] ); + ->status_is( 200, 'REST3.2.2' )->json_is( [] ); my $non_existent_patron = $builder->build_object( { class => 'Koha::Patrons' } ); my $non_existent_patron_id = $non_existent_patron->id; diff --git a/t/db_dependent/api/v1/preservation_Processings.t b/t/db_dependent/api/v1/preservation_Processings.t index 6a5533fc5f7..b34bf42af4a 100755 --- a/t/db_dependent/api/v1/preservation_Processings.t +++ b/t/db_dependent/api/v1/preservation_Processings.t @@ -197,9 +197,9 @@ subtest 'add() tests' => sub { # Authorized attempt to write my $processing_id = $t->post_ok( "//$userid:$password@/api/v1/preservation/processings" => json => $processing ) - ->status_is( 201, 'SWAGGER3.2.1' )->header_like( + ->status_is( 201, 'REST3.2.1' )->header_like( Location => qr|^/api/v1/preservation/processings/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' )->json_is( '/name' => $processing->{name} )->tx->res->json->{processing_id}; # Authorized attempt to create with null id @@ -337,7 +337,7 @@ subtest 'delete() tests' => sub { # Delete existing processing $t->delete_ok("//$userid:$password@/api/v1/preservation/processings/$processing_id") - ->status_is( 204, 'SWAGGER3.2.4' )->content_is( '', 'SWAGGER3.3.4' ); + ->status_is( 204, 'REST3.2.4' )->content_is( '', 'REST3.3.4' ); # Attempt to delete non-existent processing $t->delete_ok("//$userid:$password@/api/v1/preservation/processings/$processing_id")->status_is(404); diff --git a/t/db_dependent/api/v1/preservation_Trains.t b/t/db_dependent/api/v1/preservation_Trains.t index 3d7d0775420..4f055fcf9d3 100755 --- a/t/db_dependent/api/v1/preservation_Trains.t +++ b/t/db_dependent/api/v1/preservation_Trains.t @@ -201,9 +201,9 @@ subtest 'add() tests' => sub { # Authorized attempt to write my $train_id = $t->post_ok( "//$userid:$password@/api/v1/preservation/trains" => json => $train ) - ->status_is( 201, 'SWAGGER3.2.1' )->header_like( + ->status_is( 201, 'REST3.2.1' )->header_like( Location => qr|^/api/v1/preservation/trains/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' )->json_is( '/name' => $train->{name} )->json_is( '/description' => $train->{description} ) ->json_is( '/default_processing_id' => $train->{default_processing_id} ) ->json_is( '/not_for_loan' => $train->{not_for_loan} )->tx->res->json->{train_id}; @@ -344,8 +344,8 @@ subtest 'delete() tests' => sub { $t->delete_ok("//$unauth_userid:$password@/api/v1/preservation/trains/$train_id")->status_is(403); # Delete existing train - $t->delete_ok("//$userid:$password@/api/v1/preservation/trains/$train_id")->status_is( 204, 'SWAGGER3.2.4' ) - ->content_is( '', 'SWAGGER3.3.4' ); + $t->delete_ok("//$userid:$password@/api/v1/preservation/trains/$train_id")->status_is( 204, 'REST3.2.4' ) + ->content_is( '', 'REST3.3.4' ); # Attempt to delete non-existent train $t->delete_ok("//$userid:$password@/api/v1/preservation/trains/$train_id")->status_is(404); @@ -435,7 +435,7 @@ subtest '*_item() tests' => sub { ]; my $train_item_id = $t->post_ok( "//$userid:$password@/api/v1/preservation/trains/$train_id/items" => json => - { item_id => $item_1->itemnumber, attributes => $item_attributes } )->status_is( 201, 'SWAGGER3.2.1' ) + { item_id => $item_1->itemnumber, attributes => $item_attributes } )->status_is( 201, 'REST3.2.1' ) ->json_is( '/item_id' => $item_1->itemnumber )->json_is( '/processing_id' => $train->default_processing_id ) ->json_has('/added_on')->tx->res->json->{train_item_id}; my $train_item = Koha::Preservation::Train::Items->find($train_item_id); @@ -501,7 +501,7 @@ subtest '*_item() tests' => sub { # Delete existing item $t->delete_ok("//$userid:$password@/api/v1/preservation/trains/$train_id/items/$train_item_id") - ->status_is( 204, 'SWAGGER3.2.4' )->content_is( '', 'SWAGGER3.3.4' ); + ->status_is( 204, 'REST3.2.4' )->content_is( '', 'REST3.3.4' ); # Delete non existing item $t->delete_ok("//$userid:$password@/api/v1/preservation/trains/$train_id/items/$train_item_id")->status_is(404) diff --git a/t/db_dependent/api/v1/record_sources.t b/t/db_dependent/api/v1/record_sources.t index 2ab1e5f1f43..edf11ee7090 100755 --- a/t/db_dependent/api/v1/record_sources.t +++ b/t/db_dependent/api/v1/record_sources.t @@ -71,7 +71,7 @@ subtest 'list() tests' => sub { $patron->set_password( { password => $password, skip_validation => 1 } ); $userid = $patron->userid; - $t->get_ok("//$userid:$password@/api/v1/record_sources?_per_page=10")->status_is( 200, 'SWAGGER3.2.2' ); + $t->get_ok("//$userid:$password@/api/v1/record_sources?_per_page=10")->status_is( 200, 'REST3.2.2' ); my $response_count = scalar @{ $t->tx->res->json }; @@ -79,7 +79,7 @@ subtest 'list() tests' => sub { my $id = $source->record_source_id; $t->get_ok("//$userid:$password@/api/v1/record_sources?q={\"record_source_id\": $id}")->status_is(200) - ->json_is( '' => [ $source->to_api ], 'SWAGGER3.3.2' ); + ->json_is( '' => [ $source->to_api ], 'REST3.3.2' ); $source->delete; @@ -123,8 +123,8 @@ subtest 'get() tests' => sub { $patron->set_password( { password => $password, skip_validation => 1 } ); $userid = $patron->userid; - $t->get_ok("//$userid:$password@/api/v1/record_sources/$id")->status_is( 200, 'SWAGGER3.2.2' ) - ->json_is( '' => $source->to_api, 'SWAGGER3.3.2' ); + $t->get_ok("//$userid:$password@/api/v1/record_sources/$id")->status_is( 200, 'REST3.2.2' ) + ->json_is( '' => $source->to_api, 'REST3.3.2' ); $source->delete; @@ -227,7 +227,7 @@ subtest 'add() tests' => sub { my $source_id = $t->post_ok( "//$userid:$password@/api/v1/record_sources" => json => { name => 'test1' } ) - ->status_is( 201, 'SWAGGER3.2.2' )->json_is( '/name', 'test1' )->json_is( '/can_be_edited', 0 ) + ->status_is( 201, 'REST3.2.2' )->json_is( '/name', 'test1' )->json_is( '/can_be_edited', 0 ) ->tx->res->json->{record_source_id}; my $created_source = Koha::RecordSources->find($source_id); diff --git a/t/db_dependent/api/v1/return_claims.t b/t/db_dependent/api/v1/return_claims.t index a151cee26d6..c43557adbef 100755 --- a/t/db_dependent/api/v1/return_claims.t +++ b/t/db_dependent/api/v1/return_claims.t @@ -78,7 +78,7 @@ subtest 'claim_returned() tests' => sub { } )->status_is(201)->header_like( Location => qr|^\/api\/v1\/return_claims/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' ); my $claim_id = $t->tx->res->json->{claim_id}; @@ -293,8 +293,8 @@ subtest 'delete() tests' => sub { # Test deleting a return claim $t->delete_ok("//$userid:$password@/api/v1/return_claims/" . $claim->id) - ->status_is( 204, 'SWAGGER3.2.4' ) - ->content_is( '', 'SWAGGER3.3.4' ); + ->status_is( 204, 'REST3.2.4' ) + ->content_is( '', 'REST3.3.4' ); my $THE_claim = Koha::Checkouts::ReturnClaims->find($claim->id); isnt( $THE_claim, "Return claim was deleted" ); diff --git a/t/db_dependent/api/v1/search_filters.t b/t/db_dependent/api/v1/search_filters.t index f442f07edd3..6b16603b609 100755 --- a/t/db_dependent/api/v1/search_filters.t +++ b/t/db_dependent/api/v1/search_filters.t @@ -89,7 +89,7 @@ subtest 'list() tests' => sub { # Make sure we are returned with the correct amount of macros $t->get_ok( "//$userid:$password@/api/v1/search_filters" ) - ->status_is( 200, 'SWAGGER3.2.2' ) + ->status_is( 200, 'REST3.2.2' ) ->json_has('/0/search_filter_id') ->json_has('/1/search_filter_id') ->json_has('/2/search_filter_id') @@ -191,7 +191,7 @@ subtest 'add() tests' => sub { # Authorized attempt to write $t->post_ok( "//$auth_userid:$password@/api/v1/search_filters" => json => $search_filter_values ) - ->status_is( 201, 'SWAGGER3.2.1' ) + ->status_is( 201, 'REST3.2.1' ) ->json_has( '/search_filter_id', 'We generated a new id' ) ->json_is( '/name' => $search_filter_values->{name}, 'The name matches what we supplied' ) ->json_is( '/query' => $search_filter_values->{query}, 'The query matches what we supplied' ) diff --git a/t/db_dependent/api/v1/smtp_servers.t b/t/db_dependent/api/v1/smtp_servers.t index 0852ddc0629..d509d0f8f8c 100755 --- a/t/db_dependent/api/v1/smtp_servers.t +++ b/t/db_dependent/api/v1/smtp_servers.t @@ -192,9 +192,9 @@ subtest 'add() tests' => sub { # Authorized attempt to write my $smtp_server_id = $t->post_ok( "//$userid:$password@/api/v1/config/smtp_servers" => json => - $smtp_server_data )->status_is( 201, 'SWAGGER3.2.1' )->header_like( + $smtp_server_data )->status_is( 201, 'REST3.2.1' )->header_like( Location => qr|^\/api\/v1\/config\/smtp_servers\/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' )->json_is( '/name' => $smtp_server_data->{name} ) ->json_is( '/state' => $smtp_server_data->{state} ) ->json_is( '/postal_code' => $smtp_server_data->{postal_code} ) @@ -348,7 +348,7 @@ subtest 'delete() tests' => sub { $t->delete_ok( "//$userid:$password@/api/v1/config/smtp_servers/$smtp_server_id") - ->status_is( 204, 'SWAGGER3.2.4' )->content_is( '', 'SWAGGER3.3.4' ); + ->status_is( 204, 'REST3.2.4' )->content_is( '', 'REST3.3.4' ); $t->delete_ok( "//$userid:$password@/api/v1/config/smtp_servers/$smtp_server_id") diff --git a/t/db_dependent/api/v1/stockrotation_rotas.t b/t/db_dependent/api/v1/stockrotation_rotas.t index 3544d83d813..017380c843b 100755 --- a/t/db_dependent/api/v1/stockrotation_rotas.t +++ b/t/db_dependent/api/v1/stockrotation_rotas.t @@ -197,10 +197,10 @@ subtest 'add() tests' => sub { # Authorized attempt to write my $rota_id = - $t->post_ok( "//$userid:$password@/api/v1/rotas" => json => $rota )->status_is( 201, 'SWAGGER3.2.1' ) + $t->post_ok( "//$userid:$password@/api/v1/rotas" => json => $rota )->status_is( 201, 'REST3.2.1' ) ->header_like( Location => qr|^\/api\/v1\/rotas/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' )->json_is( '/title' => $rota->{title} )->json_is( '/description' => $rota->{description} ) ->json_is( '/active' => $rota->{active} )->json_is( '/cyclical' => $rota->{cyclical} ) ->tx->res->json->{rota_id}; @@ -341,8 +341,8 @@ subtest 'delete() tests' => sub { # Unauthorized attempt to delete $t->delete_ok("//$unauth_userid:$password@/api/v1/rotas/$rota_id")->status_is(403); - $t->delete_ok("//$userid:$password@/api/v1/rotas/$rota_id")->status_is( 204, 'SWAGGER3.2.4' ) - ->content_is( '', 'SWAGGER3.3.4' ); + $t->delete_ok("//$userid:$password@/api/v1/rotas/$rota_id")->status_is( 204, 'REST3.2.4' ) + ->content_is( '', 'REST3.3.4' ); $t->delete_ok("//$userid:$password@/api/v1/rotas/$rota_id")->status_is(404); diff --git a/t/db_dependent/api/v1/suggestions.t b/t/db_dependent/api/v1/suggestions.t index 0ddd1cc4284..cac5172acbc 100755 --- a/t/db_dependent/api/v1/suggestions.t +++ b/t/db_dependent/api/v1/suggestions.t @@ -219,9 +219,9 @@ subtest 'add() tests' => sub { # Authorized attempt to write my $generated_suggestion = $t->post_ok( "//$userid:$password@/api/v1/suggestions" => json => - $suggestion_data )->status_is( 201, 'SWAGGER3.2.1' )->header_like( + $suggestion_data )->status_is( 201, 'REST3.2.1' )->header_like( Location => qr|^\/api\/v1\/suggestions\/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' )->tx->res->json; my $suggestion_id = $generated_suggestion->{suggestion_id}; @@ -412,7 +412,7 @@ subtest 'delete() tests' => sub { $t->delete_ok( "//$userid:$password@/api/v1/suggestions/$suggestion_id") - ->status_is( 204, 'SWAGGER3.2.4' )->content_is( q{}, 'SWAGGER3.3.4' ); + ->status_is( 204, 'REST3.2.4' )->content_is( q{}, 'REST3.3.4' ); $t->delete_ok( "//$userid:$password@/api/v1/suggestions/$suggestion_id") @@ -457,7 +457,7 @@ subtest 'Permissions tests' => sub { # Unauthorized attempt to write $t->post_ok( "//$userid:$password@/api/v1/suggestions" => json => $suggestion_data ) - ->status_is( 403, 'SWAGGER3.2.1' ); + ->status_is( 403, 'REST3.2.1' ); $builder->build( { @@ -473,9 +473,9 @@ subtest 'Permissions tests' => sub { # Authorized attempt to write my $generated_suggestion = $t->post_ok( "//$userid:$password@/api/v1/suggestions" => json => $suggestion_data ) - ->status_is( 201, 'SWAGGER3.2.1' )->header_like( + ->status_is( 201, 'REST3.2.1' )->header_like( Location => qr|^\/api\/v1\/suggestions\/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' )->tx->res->json; my $suggestion_id = $generated_suggestion->{suggestion_id}; @@ -498,8 +498,8 @@ subtest 'Permissions tests' => sub { } ); - $t->delete_ok("//$userid:$password@/api/v1/suggestions/$suggestion_id")->status_is( 204, 'SWAGGER3.2.4' ) - ->content_is( q{}, 'SWAGGER3.3.4' ); + $t->delete_ok("//$userid:$password@/api/v1/suggestions/$suggestion_id")->status_is( 204, 'REST3.2.4' ) + ->content_is( q{}, 'REST3.3.4' ); $schema->storage->txn_rollback; }; diff --git a/t/db_dependent/api/v1/ticket_updates.t b/t/db_dependent/api/v1/ticket_updates.t index 94f5b7caed5..5f7c7c0df3f 100755 --- a/t/db_dependent/api/v1/ticket_updates.t +++ b/t/db_dependent/api/v1/ticket_updates.t @@ -169,9 +169,9 @@ subtest 'add_update() tests' => sub { my $update_id = $t->post_ok( "//$userid:$password@/api/v1/tickets/$ticket_id/updates" => json => - $update )->status_is( 201, 'SWAGGER3.2.1' )->header_like( + $update )->status_is( 201, 'REST3.2.1' )->header_like( Location => qr|^\/api\/v1\/tickets/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' )->json_is( '/message' => $update->{message} ) ->json_is( '/public' => $update->{public} ) ->json_is( '/status' => undef ) @@ -223,9 +223,9 @@ subtest 'add_update() tests' => sub { $update_id = $t->post_ok( "//$userid:$password@/api/v1/tickets/$ticket_id/updates" => json => - $update )->status_is( 201, 'SWAGGER3.2.1' )->header_like( + $update )->status_is( 201, 'REST3.2.1' )->header_like( Location => qr|^\/api\/v1\/tickets/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' )->json_is( '/message' => $update->{message} ) ->json_is( '/public' => $update->{public} ) ->json_is( '/status' => undef ) @@ -247,9 +247,9 @@ subtest 'add_update() tests' => sub { $update_id = $t->post_ok( "//$userid:$password@/api/v1/tickets/$ticket_id/updates" => json => - $update )->status_is( 201, 'SWAGGER3.2.1' )->header_like( + $update )->status_is( 201, 'REST3.2.1' )->header_like( Location => qr|^\/api\/v1\/tickets/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' )->json_is( '/message' => $update->{message} ) ->json_is( '/public' => $update->{public} ) ->json_is( '/status' => undef ) @@ -281,9 +281,9 @@ subtest 'add_update() tests' => sub { $update_id = $t->post_ok( "//$userid:$password@/api/v1/tickets/$ticket_id/updates" => json => - $update )->status_is( 201, 'SWAGGER3.2.1' )->header_like( + $update )->status_is( 201, 'REST3.2.1' )->header_like( Location => qr|^\/api\/v1\/tickets/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' )->json_is( '/message' => $update->{message} ) ->json_is( '/public' => $update->{public} ) ->json_is( '/status' => $update->{status} ) @@ -303,9 +303,9 @@ subtest 'add_update() tests' => sub { $update_id = $t->post_ok( "//$userid:$password@/api/v1/tickets/$ticket_id/updates" => json => - $update )->status_is( 201, 'SWAGGER3.2.1' )->header_like( + $update )->status_is( 201, 'REST3.2.1' )->header_like( Location => qr|^\/api\/v1\/tickets/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' )->json_is( '/message' => $update->{message} ) ->json_is( '/public' => $update->{public} ) ->json_is( '/status' => $update->{status} ) diff --git a/t/db_dependent/api/v1/tickets.t b/t/db_dependent/api/v1/tickets.t index 302657172f2..2519256d91a 100755 --- a/t/db_dependent/api/v1/tickets.t +++ b/t/db_dependent/api/v1/tickets.t @@ -205,9 +205,9 @@ subtest 'add() tests' => sub { # Authorized attempt to write my $ticket_id = $t->post_ok( "//$userid:$password@/api/v1/tickets" => json => $ticket ) - ->status_is( 201, 'SWAGGER3.2.1' )->header_like( + ->status_is( 201, 'REST3.2.1' )->header_like( Location => qr|^\/api\/v1\/tickets/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' )->json_is( '/biblio_id' => $ticket->{biblio_id} ) ->json_is( '/title' => $ticket->{title} ) ->json_is( '/body' => $ticket->{body} ) @@ -257,9 +257,9 @@ subtest 'add() tests' => sub { $ticket_id = $t->post_ok( "//$useridp:$password@/api/v1/public/tickets" => json => $ticket ) - ->status_is( 201, 'SWAGGER3.2.1' )->header_like( + ->status_is( 201, 'REST3.2.1' )->header_like( Location => qr|^\/api\/v1\/public\/tickets/\d*|, - 'SWAGGER3.4.1' + 'REST3.4.1' )->json_is( '/biblio_id' => $ticket->{biblio_id} )->json_is( '/title' => $ticket->{title} ) ->json_is( '/body' => $ticket->{body} )->json_is( '/reporter_id' => $patron->id ) ->tx->res->json->{ticket_id}; @@ -404,7 +404,7 @@ subtest 'delete() tests' => sub { ->status_is(403); $t->delete_ok("//$userid:$password@/api/v1/tickets/$ticket_id") - ->status_is( 204, 'SWAGGER3.2.4' )->content_is( '', 'SWAGGER3.3.4' ); + ->status_is( 204, 'REST3.2.4' )->content_is( '', 'REST3.3.4' ); $t->delete_ok("//$userid:$password@/api/v1/tickets/$ticket_id") ->status_is(404); -- 2.48.1