From 83d189785264290fcbf80ff5ac5dd7ef384ab9c2 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 4 Apr 2011 16:31:44 -0700
Subject: [PATCH] Update tests for bad macros to check template attachments. 
 Fixes bug #12087

---
 docs/changelog/7.x.x.txt                         |   1 +
 .../packages-7.10.13/default_search2.wgpkg       | Bin 0 -> 1811 bytes
 t/badExtrasMacros.t                              |   5 ++++-
 t/badGatewayMacros.t                             |   3 +++
 t/hardcodedExtras.t                              |  10 ++++++++++
 t/rawHrefUrls.t                                  |   7 ++++++-
 6 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 docs/upgrades/packages-7.10.13/default_search2.wgpkg

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index c79fa0eec..813e3fe41 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -9,6 +9,7 @@
  - fixed #12089: Cannot refund item in transaction if the sku no longer exists.
  - rfe   #12085: Export Related Story Topics
  - fixed #12076: Paginator shows no results with cached page index
+ - fixed #12087: Extend WebGUI tests to check template attachments
 
 7.10.12
  - fixed #12072: Product, related and accessory assets
diff --git a/docs/upgrades/packages-7.10.13/default_search2.wgpkg b/docs/upgrades/packages-7.10.13/default_search2.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..faee2be099ff232a056c2e7d1eba72dcd0fec0bb
GIT binary patch
literal 1811
zcmV+u2kiJCiwFP!00000|Ls_9Q`<%m_UHTx)nAg#1Y7b8#E$BjBn^cYQW{9<G)|bq
zI@?#|JB{vyaWnbv-Cez%WJAdW(tL<Mfamt@x!t|JM`|_h|8ZS+XQ$t2xURR;ck#dL
z^?HqlQ#@|N^ZLE*Ucb}nb{dZ7xgEFRfXV$oi8d?-ND~zbd2xNbMDti*FUC#5Lz|=j
zH>iF~B0}wzf4jZ(ck6Gh<Q)M8kK5Z&@6Gl1I{kjHR{vht>oy$7=KVkSRsYugL%)j%
zA0NOWY-*!oHseia=)8OXgqEUMMLafwYg{EY)SSee86Lb?;cBznBxMwYOq*9%k%~e3
zoNQzghJ`qbuphj-Vv8uGP&EbcOHQNYJQRA)gVMR=%Tpl(wIl_%6zG*ykrwOm_?3y-
z9%sP`o9QDqxd3;7xDrw=C6C|2x!xz4y_<^pnjzDgo6P9wg@OIhp~?SrTnk|mhXgv{
zQ<jA0Omh}b=ACj2Lhp$n;Ih6op^su^lvzb-S}dQlSS1mpG7yHWJj<Qo04GnSABamw
z1V4_OX;>ezo?Wuo$+ob^uSVmhGlA;qLTlU{jpbPS%#m!tVOa!ghG<2OH_JwTo25=D
zqL@0GYb}&)LGTs}7DE0eK_R~ZO8*ljO{_u<Lcg6ES3Lzn!wy#`!i1b$`19_lbYN)R
zZ^PpCF1Vh=A~FC7eH+SCo`j$jrkOCHP$bThrlvn^ZMCh%t*vyq4XIxTFjeuwVG|4t
zdHv9S^x+83-6Lp{$Il)=gPd|X!HR=$0o@`Z7MnI2Z3WCQkT1BID=cWFv>|vE?5O$@
zGRURTB*g^#LPm*kGQV@`HgJ^{H&6l`IhQO<Fsui^oi-r1EUC~Je6>_@pwBSIegJBj
zLj#AUbeF4HF3aTQO@J<1xhA%f7XM)It_!~x>?-7PX6CQ}cLS`{@nnH@a=xfwPn#SJ
z@=`*aC5wX>i7`sTI_}FaDuXDnSTY4@H7Vi4#N>I%yEx_=%7QsaWRM9dQFzeusF~6(
z=fOElo}vz@h>x!$CPyFkp-i!4*b6Lt^sr|2@X2$WGH1s$FCISwD>xT&W_9}JZ2Ik7
zu}yKxLsrBtkVepaFJUX#Np(CZTL)2`0}zW8d<!*SCyR3)kDR&}HNCwLLIRVc2HS@d
z=G3y|wA*yhD4&?ptf;g_!pK9NPKQ**pZBcHNp+Svgm56qy1g=Qa4Lkkgj|M7MHvtn
z<JcQx91VdP!Kj?ad<qQ<N4jixIMyRP)mG$uIxz?ghPjKtQpxW$)W9Bt5GgQ>p95+W
zwhVXPowb@!K3hT`(j>`-CFCjz?FPuI=qzVjLIMZom45X@Q7Xs$Qm6z6OSwloW+p#^
zegN>H$iS9Gp$ys<pm_khY9-N$@?1-wY(i0-Ov?zz=Ow2g1+;W++$^t*nlJKKRB0o8
ztk!i~!x;x#!aFVPr}S@qlWTR#wo%}eG%Gi!4`ub#`R%0W!Af_Q8>In;m(UGYypsv(
z%;aaqq9Ah4V`1LL;cl!JM=XZxqfSSdF>Eql;KlL_yc&@B-N$hgvNmoGsqvTme3ppT
zL~CsNC*vm0X%cF)3OP_Z4uj^?`!X=Rdl~+6&g5((rG#dL21$`1x!UlaQu?Cl`x*!f
z>7VlRpWp5ehcrZo!;_p96@(P|>Y)n6RHV$X>2+Oi&>uYQT11OZEBX5=rEg9;j?1VS
z75hW*l$-99BB7C>vGbJdHoa1!FGTcO8Hhch@lO#fIb=CGK^k*oXiQ#0%(uxRpzD`5
zV<vug47Vz|=((Qd9!Ld{UJ_iBrr~h!<nUlUX+j?;q|zz<uaIe>vlP`gW7n8ugTc;V
z(BJ7;dB(wk?C__YxNa&25MsDZi-xe$IakYlxeK>>nhk5K@YbG^|NK>e5Ll6s1i^hX
zN%K^%Zce6CA7uLll==<`buka~yT3}O%ei(9jV|nKB>I*Vx->62GK|Cu1+};^-6SO@
zOM*t5h;u%h?D6I!8*{!UY5r`&OuRB>+5b0JwxHZCO)hGmx1LRs3t>j93W8i|jT(td
z+v6*fVItp7PSt@{e7gkrCgNKh6r1e+7s;)hDk6|+-PVci7m`{Zh--Q7>x4Fgk<nS$
z2~wP*gDj?3RHsT}Z$)6gl(<@%sUfNoR*16+`mIT7`RY(6%nEo*QkoIbT4pWo{yD@m
zBb}9QvB)P4?$0Be<y{TmH{w-9Jhy%o8#c?nsa>7EdGpHMkHp~cf+gKBo*!KO^?T_=
z=;M`!ySeUxXhhCVY{CUpj6O|nB4hMLv%)>R-p+Qf)9YAV4k!~a-wfXL%*es+R2@%$
zJ^i!S-F@1<JnJq?cm?Um@ZtB=PY*slxQp+#-+g?~!1oM%&%j+};9p^61#SQy0073R
Bdd&a;

literal 0
HcmV?d00001

diff --git a/t/badExtrasMacros.t b/t/badExtrasMacros.t
index f6af6186c..c7434cc4b 100644
--- a/t/badExtrasMacros.t
+++ b/t/badExtrasMacros.t
@@ -52,10 +52,13 @@ my @templateLabels;
 while (my $templateAsset = $getATemplate->()) {
     my $template = $templateAsset->get('template');
     my $header   = $templateAsset->get('extraHeadTags');
-    my $match =  ($template =~ $macro);
+    my $match    = ($template =~ $macro);
     if ($header) {
         $match ||= ($header =~ $macro);
     }
+    foreach my $attachment (@{ $templateAsset->getAttachments }) {
+        $match ||= ($attachment->{url} =~ $macro);
+    }
     ok(!$match, sprintf "%s: %s (%s) has no bad extras macros", $templateAsset->getTitle, $templateAsset->getId, $templateAsset->getUrl);
 }
 
diff --git a/t/badGatewayMacros.t b/t/badGatewayMacros.t
index 4fbbbeaf6..2d74ec74c 100644
--- a/t/badGatewayMacros.t
+++ b/t/badGatewayMacros.t
@@ -55,6 +55,9 @@ while (my $templateAsset = $getATemplate->()) {
     if ($header) {
         $match ||= ($header =~ $macro);
     }
+    foreach my $attachment (@{ $templateAsset->getAttachments }) {
+        $match ||= ($attachment->{url} =~ $macro);
+    }
     ok(!$match, sprintf "%s: %s (%s) has no bad gateway macros", $templateAsset->getTitle, $templateAsset->getId, $templateAsset->getUrl);
 }
 
diff --git a/t/hardcodedExtras.t b/t/hardcodedExtras.t
index a4c6788e2..ca30a269d 100644
--- a/t/hardcodedExtras.t
+++ b/t/hardcodedExtras.t
@@ -45,6 +45,16 @@ TEMPLATE: while (my $templateAsset = $getATemplate->()) {
             type       => 'Template',
         }
     }
+    foreach my $attachment (@{ $templateAsset->getAttachments }) {
+        if ($attachment->{url} =~ m!$hardcodedExtras! ) {
+            push @hardcodedExtras, {
+                url        => $templateAsset->getUrl,
+                id         => $templateAsset->getId,
+                title      => $templateAsset->getTitle,
+                type       => 'Template',
+            }
+        }
+    }
 }
 
 my $getASnippet = WebGUI::Asset::Snippet->getIsa($session);
diff --git a/t/rawHrefUrls.t b/t/rawHrefUrls.t
index 8d9011818..ec0dc6537 100644
--- a/t/rawHrefUrls.t
+++ b/t/rawHrefUrls.t
@@ -38,7 +38,7 @@ my $macro     = qr{
 
 $numTests = $session->db->quickScalar('select count(distinct(assetId)) from template');
 
-plan tests => 2*$numTests;
+plan tests => 3*$numTests;
 
 my $validLinks = 0;
 
@@ -91,4 +91,9 @@ TEMPLATE: while (my $templateAsset = $getATemplate->()) {
         $parser->parse($template);
         ok($validLinks, sprintf "%s: %s (%s) has no rooted link urls in the template", $templateAsset->getTitle, $templateAsset->getId, $templateAsset->getUrl);
     }
+    my $bad_attachments = 0;
+    foreach my $attachment (@{ $templateAsset->getAttachments }) {
+        ++$bad_attachments if $attachment->{url} !~ $nonRootLink;
+    }
+    ok $bad_attachments == 0, sprintf "%s: %s (%s) has no rooted link urls in the template attachments", $templateAsset->getTitle, $templateAsset->getId, $templateAsset->getUrl;
 }