From 363d8bcbb80aac1022f22abfcff657a9307499b3 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 6 Jul 2016 16:57:05 +0100 Subject: [PATCH] Bug 9259: Use is instead of is_deeply MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit df57c8e864aefe0e90b49aa15fc95b6dcaafda7b) Signed-off-by: Frédéric Demians --- .../prog/en/modules/tools/manage-marc-import.tt | 3 ++- t/db_dependent/ImportBatch.t | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt index e6bf9501f5..e1119d13f1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt @@ -454,7 +454,8 @@ Page [% batch_lis.upload_timestamp %] [% batch_lis.num_records %] [% batch_lis.num_items %][% IF ( batch_lis.num_items ) %] (Create label batch)[% END %] - [% IF ( batch_lis.can_clean ) %] + + [% IF ( batch_lis.can_clean ) %]
diff --git a/t/db_dependent/ImportBatch.t b/t/db_dependent/ImportBatch.t index 8cb84cedd3..156b505597 100644 --- a/t/db_dependent/ImportBatch.t +++ b/t/db_dependent/ImportBatch.t @@ -138,11 +138,9 @@ my $id_import_batch3 = C4::ImportBatch::AddImportBatch($sample_import_batch3); # Test CleanBatch C4::ImportBatch::CleanBatch( $id_import_batch3 ); my $batch3_clean = $dbh->do('SELECT * FROM import_records WHERE import_batch_id = "$id_import_batch3"'); -is_deeply( $batch3_clean, "0E0", - "Batch 3 has been cleaned" ); +is( $batch3_clean, "0E0", "Batch 3 has been cleaned" ); # Test DeleteBatch C4::ImportBatch::DeleteBatch( $id_import_batch3 ); my $batch3_results = $dbh->do('SELECT * FROM import_batches WHERE import_batch_id = "$id_import_batch3"'); -is_deeply( $batch3_results, "0E0", # 0E0 == 0 - "Batch 3 has been deleted"); +is( $batch3_results, "0E0", "Batch 3 has been deleted"); -- 2.39.5