From 031f0412641eaabaafd135293d77f4d4f7eb4e97 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 21 Mar 2024 08:45:11 +0100 Subject: [PATCH] Bug 36374: flag JS files to keep tidy --- .../intranet-tmpl/prog/js/modals/add_catalog_concern.js | 1 + koha-tmpl/intranet-tmpl/prog/js/modals/display_ticket.js | 1 + koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js | 1 + xt/js_tidy.t | 6 +++--- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/modals/add_catalog_concern.js b/koha-tmpl/intranet-tmpl/prog/js/modals/add_catalog_concern.js index 10c0b3b2e99..7683f898873 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/modals/add_catalog_concern.js +++ b/koha-tmpl/intranet-tmpl/prog/js/modals/add_catalog_concern.js @@ -1,3 +1,4 @@ +/* keep tidy */ $(document).ready(function() { // Pre-populate empty message with template diff --git a/koha-tmpl/intranet-tmpl/prog/js/modals/display_ticket.js b/koha-tmpl/intranet-tmpl/prog/js/modals/display_ticket.js index b35a3a7557e..0812d7fccb0 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/modals/display_ticket.js +++ b/koha-tmpl/intranet-tmpl/prog/js/modals/display_ticket.js @@ -1,3 +1,4 @@ +/* keep tidy */ $(document).ready(function() { $('#ticketDetailsModal').on('show.bs.modal', function(event) { let modal = $(this); diff --git a/koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js b/koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js index 363dedf5926..20f493873b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js +++ b/koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js @@ -1,3 +1,4 @@ +/* keep tidy */ let dataFetched = false; let bookable_items, bookings, diff --git a/xt/js_tidy.t b/xt/js_tidy.t index d9a4555279b..2667a18f732 100755 --- a/xt/js_tidy.t +++ b/xt/js_tidy.t @@ -22,8 +22,8 @@ use FindBin(); use Data::Dumper qw( Dumper ); use Test::More tests => 1; -my @js_files; -push @js_files, `git ls-files 'koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js'`; +my $cmd = q{git grep -l '/\* keep tidy \*/' -- '*.js'}; +my @js_files = qx{$cmd}; my @not_tidy; foreach my $filepath (@js_files) { @@ -35,4 +35,4 @@ foreach my $filepath (@js_files) { } } -is(scalar(@not_tidy), 0, 'No .js file should be messy') or diag Dumper \@not_tidy; +is(scalar(@not_tidy), 0, sprintf('No .js file should be messy %s/%s', scalar(@not_tidy), scalar(@js_files))) or diag Dumper \@not_tidy; -- 2.34.1