[Bug 12653] New: PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in tests
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 Bug ID: 12653 Summary: PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in tests Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: NEW Severity: normal Priority: P5 - low Component: Test Suite Assignee: chris@bigballofwax.co.nz Reporter: oleonard@myacpl.org QA Contact: gmcharlt@gmail.com The following tests contain references to opac-tmpl/prog: xt/single_quotes.t xt/author/valid-templates.t xt/author/icondirectories.t xt/author/translatable-templates.t xt/tt_valid.t -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 --- Comment #1 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- Created attachment 30679 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=30679&action=edit Bug 12653: PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in tests This patch removes explicit references of themes from xt/single_quotes.t xt/author/valid-templates.t xt/author/icondirectories.t xt/author/translatable-templates.t xt/tt_valid.t To test: 1. Apply the patch 2. Run each test, all must pass Some have been slightly rewritten, check that intended or similar test is performed. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff CC| |bgkriegel@gmail.com Patch complexity|--- |Small patch Assignee|chris@bigballofwax.co.nz |bgkriegel@gmail.com -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #30679|0 |1 is obsolete| | --- Comment #2 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- Created attachment 30706 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=30706&action=edit Bug 12653: PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in tests This patch removes explicit references of themes from xt/single_quotes.t xt/author/valid-templates.t xt/author/icondirectories.t xt/author/translatable-templates.t xt/tt_valid.t To test: 1. Apply the patch 2. Run each test, all must pass Some have been slightly rewritten, check that intended or similar test is performed. xt/author/valid-templates.t has been touched to only test files and not dirs -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 --- Comment #3 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- To test more: 1) Edit some TT file (opac/staff) and add somewhere something like <span [% IF ( value ) %]name="name"[% ELSE %] js="_('">TEST [% INCLUDE 'fail.inc' %]</span> Save and run the tests xt/single_quotes.t xt/author/valid-templates.t xt/tt_valid.t must fail 2) To fail icondirectories.t the only way I found is ranaming/removing itemtypeimg dir, $ mv koha-tmpl/opac-tmpl/bootstrap/itemtypeimg koha-tmpl/opac-tmpl/bootstrap/item If the directory exists, even if empty, the test pass. Before patch it pass even deleting the icon dir... 3) To fail translatable-templates.t, simply change the name of 'en' template dir for your current staff (prog) or opac (bootstrap/prog/ccsr) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |ASSIGNED --- Comment #4 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- Need to think this again I was told that this tests should not depend on DB values. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #30706|0 |1 is obsolete| | --- Comment #5 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- Created attachment 32477 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32477&action=edit Bug 12653: PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in tests This patch removes explicit references of themes from xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t For xt/author/icondirectories.t it fixes a small difference on two bootstrap files, previously unchecked, crystal-clear/_COPYING.txt and crystal-clear/_README.txt Some updates to license information To test: 1. Apply the patch 2. Run each test, all must pass prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t 3. Try to fail each test a) xt/author/icondirectories.t create a new file on any of icon dirs, e.g. touch koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/newfile.png test must fail b) xt/author/translatable-templates.t change the name of 'en' dir on any theme opac or staff test must fail Add following line to any template file <span [% IF ( value ) %]name="name"[% ELSE %] js="_('">TEST [% INCLUDE 'fail.inc' %]</span> c) xt/author/valid-templates.t must fail d) xt/single_quotes.t must fail e) xt/tt_valid.t must fail -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 --- Comment #6 from M. Tompsett <mtompset@hotmail.com> --- Comment on attachment 32477 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32477 Bug 12653: PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in tests Review of attachment 32477: --> (http://bugs.koha-community.org/bugzilla3/page.cgi?id=splinter.html&bug=12653&attachment=32477) ----------------------------------------------------------------- ::: xt/author/translatable-templates.t @@ +27,4 @@
=cut
+use Test::More tests => 4; # FIXME: this must be set to total number of themes opac+staff
We should not be adding "FIXME" when modifying it to this should not be difficult. The number of themes (opac+staff) in known by line 49. Just add a calculation to set $number_of_tests_run. use Test::More; ... run your tests ... done_testing( $number_of_tests_run ); -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 --- Comment #7 from M. Tompsett <mtompset@hotmail.com> --- Comment on attachment 32477 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32477 Bug 12653: PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in tests Review of attachment 32477: --> (http://bugs.koha-community.org/bugzilla3/page.cgi?id=splinter.html&bug=12653&attachment=32477) ----------------------------------------------------------------- ::: xt/author/valid-templates.t @@ +87,2 @@
done_testing();
And this is how you do it, when you don't feel like counting. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 --- Comment #8 from M. Tompsett <mtompset@hotmail.com> --- Comment on attachment 32477 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32477 Bug 12653: PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in tests Review of attachment 32477: --> (http://bugs.koha-community.org/bugzilla3/page.cgi?id=splinter.html&bug=12653&attachment=32477) ----------------------------------------------------------------- ::: xt/single_quotes.t @@ +43,4 @@
my @files; find( sub { open my $fh, $_ or die "Could not open $_: $!";
Since @themes has no /en, I would have expected something here. @@ +46,5 @@
open my $fh, $_ or die "Could not open $_: $!"; my @lines = sort grep /\_\(\'/, <$fh>; push @files, { name => "$_", lines => \@lines } if @lines; + }, + @themes
Note: @themes does not have /en on the values in the array. Not that it should only be en, but this likely tests the wrong directory level. @@ -31,5 @@
- },qw# - ./koha-tmpl/opac-tmpl/prog/en - ./koha-tmpl/opac-tmpl/bootstrap/en - ./koha-tmpl/intranet-tmpl/prog/en - #
Note: all these have /en on them. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mtompset@hotmail.com --- Comment #9 from M. Tompsett <mtompset@hotmail.com> --- (In reply to M. Tompsett from comment #8)
Comment on attachment 32477 [details] [review] Bug 12653: PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in tests
Review of attachment 32477 [details] [review]: -----------------------------------------------------------------
Well, my eyeball failed me. A simple print statement confirmed it is good. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 --- Comment #10 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- Hi Mark, thanks for testing About Comment #6 and #7, I'll add a 'done_testing()' About Comment #8, it's one level up, I'll fix that -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #32477|0 |1 is obsolete| | --- Comment #11 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- Created attachment 32528 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32528&action=edit Bug 12653: PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in tests This patch removes explicit references of themes from xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t For xt/author/icondirectories.t it fixes a small difference on two bootstrap files, previously unchecked, crystal-clear/_COPYING.txt and crystal-clear/_README.txt Some updates to license information To test: 1. Apply the patch 2. Run each test, all must pass prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t 3. Try to fail each test a) xt/author/icondirectories.t create a new file on any of icon dirs, e.g. touch koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/newfile.png test must fail b) xt/author/translatable-templates.t change the name of 'en' dir on any theme opac or staff test must fail Add following line to any template file <span [% IF ( value ) %]name="name"[% ELSE %] js="_('">TEST [% INCLUDE 'fail.inc' %]</span> c) xt/author/valid-templates.t must fail d) xt/single_quotes.t must fail e) xt/tt_valid.t must fail -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #32528|0 |1 is obsolete| | --- Comment #12 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- Created attachment 32529 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32529&action=edit Bug 12653: PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in tests This patch removes explicit references of themes from xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t For xt/author/icondirectories.t it fixes a small difference on two bootstrap files, previously unchecked, crystal-clear/_COPYING.txt and crystal-clear/_README.txt Some updates to license information To test: 1. Apply the patch 2. Run each test, all must pass prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t 3. Try to fail each test a) xt/author/icondirectories.t create a new file on any of icon dirs, e.g. touch koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/newfile.png test must fail b) xt/author/translatable-templates.t change the name of 'en' dir on any theme opac or staff test must fail Add following line to any template file <span [% IF ( value ) %]name="name"[% ELSE %] js="_('">TEST [% INCLUDE 'fail.inc' %]</span> c) xt/author/valid-templates.t must fail d) xt/single_quotes.t must fail e) xt/tt_valid.t must fail -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 --- Comment #13 from M. Tompsett <mtompset@hotmail.com> --- Comment on attachment 32529 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32529 Bug 12653: PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in tests Review of attachment 32529: --> (http://bugs.koha-community.org/bugzilla3/page.cgi?id=splinter.html&bug=12653&attachment=32529) ----------------------------------------------------------------- ::: xt/tt_valid.t @@ +29,5 @@
+# OPAC themes +my $opac_dir = 'koha-tmpl/opac-tmpl'; +opendir ( my $dh, $opac_dir ) or die "can't opendir $opac_dir: $!"; +for my $theme ( grep { not /^\.|lib|js/ } readdir($dh) ) { + push @themes, "$opac_dir/$theme";
/en is missing. @@ +37,5 @@
+# STAFF themes +my $staff_dir = 'koha-tmpl/intranet-tmpl'; +opendir ( $dh, $staff_dir ) or die "can't opendir $staff_dir: $!"; +for my $theme ( grep { not /^\.|lib|js/ } readdir($dh) ) { + push @themes, "$staff_dir/$theme";
/en is missing. @@ +59,4 @@
} ($dir) = $dir =~ /koha-tmpl\/(.*)$/; push @files, { name => "$dir/$name", lines => \@lines } if @lines; + }, @themes
However, since this is a find, it still works without the /en. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 --- Comment #14 from M. Tompsett <mtompset@hotmail.com> --- ./opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt ./opac-tmpl/ccsr/itemtypeimg/crystal-clear/_COPYING.txt -- these lack two empty lines at the end of the file ./intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt ./opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt -- which these two files have Can someone else confirm their files differ this way? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 --- Comment #15 from M. Tompsett <mtompset@hotmail.com> --- (In reply to M. Tompsett from comment #14)
./opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt ./opac-tmpl/ccsr/itemtypeimg/crystal-clear/_COPYING.txt -- these lack two empty lines at the end of the file
./intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt ./opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt -- which these two files have
Can someone else confirm their files differ this way?
Also had issues with _README.txt, but not the same differences. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 --- Comment #16 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- (In reply to M. Tompsett from comment #14)
./opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt ./opac-tmpl/ccsr/itemtypeimg/crystal-clear/_COPYING.txt -- these lack two empty lines at the end of the file
./intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt ./opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt -- which these two files have
Can someone else confirm their files differ this way?
On current master (not my patch), ~/kohaclone/koha-tmpl$ diff ./intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt ./opac-tmpl/ccsr/itemtypeimg/crystal-clear/_COPYING.txt 121,122d120 < < CCSR is not fixed, differs in more than that file. But because is about to be removed soon, I skipped the test there. There is no point to update/fix itemtypeimg for ccsr (perhaps yes for <= 3.16 versions) About your next comment, I fix only files needed to make test pass. I'll resubmit because I forgot to add a later fix (a missing '/en' on tt_valid.t, it checks more than necessary) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #32529|0 |1 is obsolete| | --- Comment #17 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- Created attachment 32537 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32537&action=edit Bug 12653: PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in tests This patch removes explicit references of themes from xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t For xt/author/icondirectories.t it fixes a small difference on two bootstrap files, previously unchecked, crystal-clear/_COPYING.txt and crystal-clear/_README.txt Some updates to license information To test: 1. Apply the patch 2. Run each test, all must pass prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t 3. Try to fail each test a) xt/author/icondirectories.t create a new file on any of icon dirs, e.g. touch koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/newfile.png test must fail b) xt/author/translatable-templates.t change the name of 'en' dir on any theme opac or staff test must fail Add following line to any template file <span [% IF ( value ) %]name="name"[% ELSE %] js="_('">TEST [% INCLUDE 'fail.inc' %]</span> c) xt/author/valid-templates.t must fail d) xt/single_quotes.t must fail e) xt/tt_valid.t must fail -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 --- Comment #18 from M. Tompsett <mtompset@hotmail.com> --- Created attachment 32540 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32540&action=edit Bug 12653: Text file clean up _README.txt has 4 newlines removed. _COPYING.txt has 2 empty lines at the end of the file removed. This was done by copying the smallest file in an existing theme directory. TEST PLAN --------- 1) Compare files. diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_README.txt -- there will be differences. 2) Apply patch 3) Compare files again. diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_README.txt -- there will be no differences. 4) git reset --hard origin/master 5) Apply the patch affecting the .t files. 6) Prove things. prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t -- expecting xt/author/icondirectories.t to fail 7) Apply this patch. 8) Prove things. prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t -- expecting success. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 --- Comment #19 from M. Tompsett <mtompset@hotmail.com> --- Remove the file clean up in your patch, and I'll sign off. Then you sign off on my Text file clean up. :) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #32540|0 |1 is obsolete| | --- Comment #20 from M. Tompsett <mtompset@hotmail.com> --- Comment on attachment 32540 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32540 Bug 12653: Text file clean up Wasn't needed. :) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #32540|1 |0 is obsolete| | --- Comment #21 from M. Tompsett <mtompset@hotmail.com> --- Comment on attachment 32540 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32540 Bug 12653: Text file clean up Oops. Poor testing. Is needed. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #32537|0 |1 is obsolete| | --- Comment #22 from M. Tompsett <mtompset@hotmail.com> --- Created attachment 32541 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32541&action=edit [SIGNED OFF] Bug 12653: PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in tests This patch removes explicit references of themes from xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t For xt/author/icondirectories.t it fixes a small difference on two bootstrap files, previously unchecked, crystal-clear/_COPYING.txt and crystal-clear/_README.txt Some updates to license information To test: 1. Apply the patch 2. Run each test, all must pass prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t 3. Try to fail each test a) xt/author/icondirectories.t create a new file on any of icon dirs, e.g. touch koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/newfile.png test must fail b) xt/author/translatable-templates.t change the name of 'en' dir on any theme opac or staff test must fail Add following line to any template file <span [% IF ( value ) %]name="name"[% ELSE %] js="_('">TEST [% INCLUDE 'fail.inc' %]</span> c) xt/author/valid-templates.t must fail d) xt/single_quotes.t must fail e) xt/tt_valid.t must fail Signed-off-by: Mark Tompsett <mtompset@hotmail.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #32540|0 |1 is obsolete| | --- Comment #23 from M. Tompsett <mtompset@hotmail.com> --- Created attachment 32542 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32542&action=edit Bug 12653: Text file clean up _README.txt has 4 newlines removed. _COPYING.txt has 2 empty lines at the end of the file removed. This was done by copying the smallest file in an existing theme directory. TEST PLAN --------- 1) Compare files. diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_README.txt -- there will be differences. 2) Apply patch 3) Compare files again. diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_README.txt -- there will be no differences. 4) git reset --hard origin/master 5) Apply the patch affecting the .t files. 6) Prove things. prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t -- expecting xt/author/icondirectories.t to fail 7) Apply this patch. 8) Prove things. prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t -- expecting success. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 --- Comment #24 from M. Tompsett <mtompset@hotmail.com> --- I ran the test plan as given in comment #22, but I needed to have my patch applied to get it to pass. Bernardo Gonzalez Kriegel, please test my patch, sign off, and change the status of this bug to signed off. :) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #32542|0 |1 is obsolete| | --- Comment #25 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- Created attachment 32561 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32561&action=edit [SIGNED-OFF] Bug 12653: Text file clean up _README.txt has 4 newlines removed. _COPYING.txt has 2 empty lines at the end of the file removed. This was done by copying the smallest file in an existing theme directory. TEST PLAN --------- 1) Compare files. diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_README.txt -- there will be differences. 2) Apply patch 3) Compare files again. diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_README.txt -- there will be no differences. 4) git reset --hard origin/master 5) Apply the patch affecting the .t files. 6) Prove things. prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t -- expecting xt/author/icondirectories.t to fail 7) Apply this patch. 8) Prove things. prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t -- expecting success. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> This patch fixes some issues with files on itemtypes dirs. No koha-qa erros. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 --- Comment #26 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 32743 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32743&action=edit k -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #32541|0 |1 is obsolete| | Attachment #32561|0 |1 is obsolete| | Attachment #32743|0 |1 is obsolete| | --- Comment #27 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 32744 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32744&action=edit [PASSED QA] Bug 12653: PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in tests This patch removes explicit references of themes from xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t For xt/author/icondirectories.t it fixes a small difference on two bootstrap files, previously unchecked, crystal-clear/_COPYING.txt and crystal-clear/_README.txt Some updates to license information To test: 1. Apply the patch 2. Run each test, all must pass prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t 3. Try to fail each test a) xt/author/icondirectories.t create a new file on any of icon dirs, e.g. touch koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/newfile.png test must fail b) xt/author/translatable-templates.t change the name of 'en' dir on any theme opac or staff test must fail Add following line to any template file <span [% IF ( value ) %]name="name"[% ELSE %] js="_('">TEST [% INCLUDE 'fail.inc' %]</span> c) xt/author/valid-templates.t must fail d) xt/single_quotes.t must fail e) xt/tt_valid.t must fail Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 --- Comment #28 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 32745 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32745&action=edit [PASSED QA] Bug 12653: Text file clean up _README.txt has 4 newlines removed. _COPYING.txt has 2 empty lines at the end of the file removed. This was done by copying the smallest file in an existing theme directory. TEST PLAN --------- 1) Compare files. diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_README.txt -- there will be differences. 2) Apply patch 3) Compare files again. diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_README.txt -- there will be no differences. 4) git reset --hard origin/master 5) Apply the patch affecting the .t files. 6) Prove things. prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t -- expecting xt/author/icondirectories.t to fail 7) Apply this patch. 8) Prove things. prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t -- expecting success. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> This patch fixes some issues with files on itemtypes dirs. No koha-qa erros. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed by Module Maintainer CC| |chris@bigballofwax.co.nz --- Comment #29 from Chris Cormack <chris@bigballofwax.co.nz> --- Pushed to MM-OPAC/theme_dep -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 --- Comment #30 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Created attachment 32953 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32953&action=edit Bug 12653: (RM followup) Fix the test count Bug 12233 removed the prog and CCSR theme directories, so the number of tests needs to be fixed. Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed by Module Maintainer |Pushed to Master CC| |tomascohen@gmail.com --- Comment #31 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Patches merged into master. Thansk Bernardo and Mark! -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |11346 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12653 --- Comment #32 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Created attachment 32959 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32959&action=edit Bug 12653: remaining prog reference in t/db_dependent/SuggestionEngine_ExplodedTerms.t Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org