Attachment 107126 Details for Bug 22844 – Bug 22844: Fix yaml_valid.t - don't pick .json files

[patch] Bug 22844: Fix yaml_valid.t - don't pick .json files

Bug-22844-Fix-yamlvalidt---dont-pick-json-files.patch (text/plain), 1.38 KB, created by Jonathan Druart on 2020-07-21 07:48:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2020-07-21 07:48:25 UTC

Size: 1.38 KB

patch

obsolete

>From aba498c20cebd6b7484a3cc8fc80dcdf1dbfb236 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Tue, 21 Jul 2020 09:47:11 +0200
>Subject: [PATCH] Bug 22844: Fix yaml_valid.t - don't pick .json files
>
>Only .pref are considered yaml files.
>
>kohadev-koha@kohadevbox:/kohadevbox/koha$ time prove xt/yaml_valid.t
>xt/yaml_valid.t .. 1/19
> #   Failed test 'borrowers.json is YAML'
> #   at xt/yaml_valid.t line 39.
>
> #   Failed test 'items.json is YAML'
> #   at xt/yaml_valid.t line 39.
> # Looks like you failed 2 tests of 19.
>---
> xt/yaml_valid.t | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
>diff --git a/xt/yaml_valid.t b/xt/yaml_valid.t
>index 4f38321802..b6f3c600d8 100755
>--- a/xt/yaml_valid.t
>+++ b/xt/yaml_valid.t
>@@ -19,7 +19,7 @@
> 
> use Modern::Perl;
> use Test::YAML::Valid;
>-use Data::Dumper;
>+use File::Find;
> 
> use Test::More;
> 
>@@ -30,13 +30,19 @@ BEGIN {
> 
> my $filebase = "$FindBin::Bin/../koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences";
> 
>-my @files = `ls -1 $filebase`;
>+my @files;
>+sub wanted {
>+    my $name = $File::Find::name;
>+    push @files, $name
>+        if $name =~ /\.pref/;
>+}
>+find({ wanted => \&wanted, no_chdir => 1 }, $filebase);
> 
> plan tests => scalar @files;
> 
> foreach my $f (@files) {
>     chomp $f;
>-    yaml_file_ok( "$filebase/$f", "$f is YAML" );
>+    yaml_file_ok( $f, "$f is YAML" );
> }
> 
> 
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 22844: 89322 | 89323 | 89389 | 89403 | 89530 | 89531 | 89749 | 89903 | 89904 | 89905 | 90407 | 96007 | 98145 | 98146 | 98147 | 98148 | 98149 | 98150 | 98151 | 98297 | 98298 | 100440 | 100441 | 100442 | 100443 | 100444 | 100445 | 100446 | 100447 | 101198 | 101199 | 101200 | 101201 | 101202 | 101203 | 101204 | 101205 | 101302 | 101480 | 101481 | 101482 | 101483 | 101484 | 101485 | 101486 | 101487 | 101488 | 101617 | 101618 | 101619 | 101620 | 101621 | 101622 | 101623 | 101624 | 103842 | 103843 | 103844 | 103845 | 103846 | 103847 | 103848 | 103849 | 103850 | 103904 | 103960 | 103961 | 103962 | 103963 | 103964 | 103965 | 103966 | 103967 | 103968 | 103969 | 106545 | 106546 | 106547 | 106548 | 106549 | 106550 | 106551 | 106552 | 106553 | 106554 | 107126