Always use good macro form when using the Extras macro. Fixes bug #11455.
This commit is contained in:
parent
e66be2a5b3
commit
fd153b80e9
11 changed files with 63 additions and 0 deletions
|
|
@ -10,6 +10,7 @@
|
|||
- fixed #11708: Activity DeleteExpiredSessions is too slow
|
||||
- fixed #11621: Documentation Error: Methods that accept URLs should indicate whether or not to include Gateway
|
||||
- fixed #11457: Carousel broken
|
||||
- fixed #11455: Wrong use of Extras macro?
|
||||
|
||||
7.9.8
|
||||
- fixed #11651: First Day of Week is a string...
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
docs/upgrades/packages-7.9.9/stockdatatmpl000000001.wgpkg
Normal file
BIN
docs/upgrades/packages-7.9.9/stockdatatmpl000000001.wgpkg
Normal file
Binary file not shown.
62
t/badExtrasMacros.t
Normal file
62
t/badExtrasMacros.t
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
#-------------------------------------------------------------------
|
||||
# WebGUI is Copyright 2001-2009 Plain Black Corporation.
|
||||
#-------------------------------------------------------------------
|
||||
# Please read the legal notices (docs/legal.txt) and the license
|
||||
# (docs/license.txt) that came with this distribution before using
|
||||
# this software.
|
||||
#-------------------------------------------------------------------
|
||||
# http://www.plainblack.com info@plainblack.com
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
use FindBin;
|
||||
use strict;
|
||||
use warnings;
|
||||
use lib "$FindBin::Bin/lib"; ##t/lib
|
||||
|
||||
use WebGUI::Test;
|
||||
use WebGUI::Session;
|
||||
use Data::Dumper;
|
||||
use WebGUI::Asset::Template;
|
||||
|
||||
#The goal of this test is to locate poorly used macros in the default
|
||||
#templates;
|
||||
|
||||
use Test::More; # increment this value for each test you create
|
||||
my $numTests = 0;
|
||||
|
||||
my $session = WebGUI::Test->session;
|
||||
my $lib = WebGUI::Test->lib;
|
||||
|
||||
##Find the name of the International macro in the user's config file.
|
||||
|
||||
#note "International macro name = $international";
|
||||
|
||||
##Regexp setup for parsing out the Macro calls.
|
||||
my $macro = qr{
|
||||
\^
|
||||
Extras
|
||||
(?: \( \) )?
|
||||
;
|
||||
}xms;
|
||||
|
||||
# put your tests here
|
||||
|
||||
$numTests = $session->db->quickScalar('select count(distinct(assetId)) from template');
|
||||
|
||||
plan tests => $numTests;
|
||||
|
||||
my $getATemplate = WebGUI::Asset::Template->getIsa($session);
|
||||
|
||||
my @templateLabels;
|
||||
|
||||
while (my $templateAsset = $getATemplate->()) {
|
||||
my $template = $templateAsset->get('template');
|
||||
my $header = $templateAsset->get('extraHeadTags');
|
||||
my $match = ($template =~ $macro);
|
||||
if ($header) {
|
||||
$match ||= ($header =~ $macro);
|
||||
}
|
||||
ok(!$match, sprintf "%s: %s (%s) has no bad extras macros", $templateAsset->getTitle, $templateAsset->getId, $templateAsset->getUrl);
|
||||
}
|
||||
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue