@@ -, +, @@ $ kshell k$ prove t/db_dependent/api/v1/acquisitions_orders.t \ t/db_dependent/api/v1/libraries.t \ t/db_dependent/api/v1/patrons.t --- t/db_dependent/api/v1/acquisitions_orders.t | 4 ++-- t/db_dependent/api/v1/libraries.t | 4 ++-- t/db_dependent/api/v1/patrons.t | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) --- a/t/db_dependent/api/v1/acquisitions_orders.t +++ a/t/db_dependent/api/v1/acquisitions_orders.t @@ -211,8 +211,8 @@ subtest 'add() tests' => sub { $t->post_ok( "//$auth_userid:$password@/api/v1/acquisitions/orders" => json => $order ) ->status_is(409) ->json_has( '/error' => "Fails when trying to add an existing order_id") - ->json_is( '/conflict', 'PRIMARY' ); } # WTF - qr/^DBD::mysql::st execute failed: Duplicate entry '(.*)' for key 'PRIMARY'/; + ->json_like( '/conflict' => qr/(aqorders\.)?PRIMARY/ ); } + qr/^DBD::mysql::st execute failed: Duplicate entry '(.*)' for key '(aqorders\.)?PRIMARY'/; $schema->storage->txn_rollback; }; --- a/t/db_dependent/api/v1/libraries.t +++ a/t/db_dependent/api/v1/libraries.t @@ -199,8 +199,8 @@ subtest 'add() tests' => sub { $t->post_ok( "//$auth_userid:$password@/api/v1/libraries" => json => $library ) ->status_is(409) ->json_has( '/error' => "Fails when trying to add an existing library_id") - ->json_is( '/conflict', 'PRIMARY' ); } # WTF - qr/^DBD::mysql::st execute failed: Duplicate entry '(.*)' for key 'PRIMARY'/; + ->json_like( '/conflict' => qr/(branches\.)?PRIMARY/ ); } + qr/^DBD::mysql::st execute failed: Duplicate entry '(.*)' for key '(branches\.)?PRIMARY'/; $schema->storage->txn_rollback; }; --- a/t/db_dependent/api/v1/patrons.t +++ a/t/db_dependent/api/v1/patrons.t @@ -207,8 +207,8 @@ subtest 'add() tests' => sub { $t->post_ok("//$userid:$password@/api/v1/patrons" => json => $newpatron) ->status_is(409) ->json_has( '/error', 'Fails when trying to POST duplicate cardnumber' ) - ->json_has( '/conflict', 'cardnumber' ); } - qr/^DBD::mysql::st execute failed: Duplicate entry '(.*?)' for key 'cardnumber'/; + ->json_like( '/conflict' => qr/(borrowers\.)?cardnumber/ ); } + qr/^DBD::mysql::st execute failed: Duplicate entry '(.*?)' for key '(borrowers\.)?cardnumber'/; $schema->storage->txn_rollback; }; @@ -311,8 +311,8 @@ subtest 'update() tests' => sub { $t->put_ok( "//$userid:$password@/api/v1/patrons/" . $patron_2->borrowernumber => json => $newpatron ) ->status_is(409) ->json_has( '/error' => "Fails when trying to update to an existing cardnumber or userid") - ->json_is( '/conflict', 'cardnumber' ); } - qr/^DBD::mysql::st execute failed: Duplicate entry '(.*?)' for key 'cardnumber'/; + ->json_like( '/conflict' => qr/(borrowers\.)?cardnumber/ ); } + qr/^DBD::mysql::st execute failed: Duplicate entry '(.*?)' for key '(borrowers\.)?cardnumber'/; $newpatron->{ cardnumber } = $patron_1->id . $patron_2->id; $newpatron->{ userid } = "user" . $patron_1->id.$patron_2->id; --