Merge branch 'master' into WebGUI8. Merged up to 7.9.12

t/Asset/File/ZipArchive.t

@@ -0,0 +1,44 @@
+#-------------------------------------------------------------------
+# 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 lib "$FindBin::Bin/../../lib";
+
+use WebGUI::Storage;
+use WebGUI::Asset;
+use WebGUI::Asset::File::ZipArchive;
+
+use WebGUI::Test;
+use Test::More; # increment this value for each test you create
+use Test::Deep;
+plan tests => 2;
+
+my $session = WebGUI::Test->session;
+
+my $node = WebGUI::Asset->getImportNode($session);
+
+my $arch = $node->addChild({
+    className => 'WebGUI::Asset::File::ZipArchive',
+});
+
+WebGUI::Test->addToCleanup($arch);
+
+my $storage = $arch->getStorageLocation;
+$storage->addFileFromFilesystem(WebGUI::Test->getTestCollateralPath('extensions.tar'));
+ok($arch->unzip($storage, 'extensions.tar'), 'unzip returns true when it successfully unpacked');
+
+$arch->fixFilenames();
+
+cmp_bag(
+    $storage->getFiles, 
+    [ qw{ extensions.tar extension_pm.txt extension_perl.txt extension.html extensions extensions/extension.html }], 
+    'files after fixFilenames, html files left alone'
+);

t/Asset/Template.t

@@ -16,9 +16,11 @@ use WebGUI::Test;
 use WebGUI::Session;
 use WebGUI::Asset::Template;
 use Exception::Class;
-use Test::More tests => 46; # increment this value for each test you create
+
+use Test::More;
 use Test::Deep;
 use Data::Dumper;
+use Test::Exception;
 use JSON qw{ from_json };
 
 my $session = WebGUI::Test->session;
@@ -211,3 +213,28 @@ is($session->setting->get('userFunctionStyleId'), $userStyleTemplate->getId, 'Re
 
 $userStyleTemplate->purge;
 is($session->setting->get('userFunctionStyleId'), 'PBtmpl0000000000000060', 'purge resets the user function style template to Fail Safe');
+
+#----------------------------------------------------------------------------
+# Verify getParser
+WebGUI::Test->originalConfig( 'defaultTemplateParser' );
+WebGUI::Test->originalConfig( 'templateParsers' );
+$session->config->set( 'templateParsers', [ 'WebGUI::Asset::Template::HTMLTemplateExpr' ] );
+# Leaving out 'WebGUI::Asset::Template::TemplateToolkit' on purpose
+$session->config->set( 'defaultTemplateParser', 'WebGUI::Asset::Template::HTMLTemplateExpr' );
+
+my $class = 'WebGUI::Asset::Template';
+dies_ok { $class->getParser( $session, '::HI::' ) } "Invalid parser dies";
+
+isa_ok $class->getParser( $session ), 'WebGUI::Asset::Template::HTMLTemplateExpr', 'no parser passed in gets the default parser';
+
+$session->config->delete( 'defaultTemplateParser' );
+isa_ok $class->getParser( $session ), 'WebGUI::Asset::Template::HTMLTemplate', 'no parser passed and no default gets HTMLTemplate';
+$session->config->set( 'defaultTemplateParser', 'WebGUI::Asset::Template::HTMLTemplateExpr' );
+
+throws_ok 
+    { $class->getParser( $session, 'WebGUI::Asset::Template::TemplateToolkit') } 
+    'WebGUI::Error::NotInConfig',
+    'Parser not in config dies';
+isa_ok $class->getParser( $session, 'WebGUI::Asset::Template::HTMLTemplateExpr'), 'WebGUI::Asset::Template::HTMLTemplateExpr', 'parser in config is created';
+
+done_testing;

t/Asset/Wobject/Matrix.t

@@ -135,6 +135,8 @@ is($matrixListing->get('views'),'1','Views were incremented');
 # Test getListings
 
 my $expectedAssetId = $matrixListing->getId;
+my $safeAssetId     = $expectedAssetId;
+$safeAssetId =~ s/-/_____/;
 
 my $listings = $matrix->getListings;
 
@@ -209,19 +211,19 @@ cmp_deeply(
         $compareListData,
         {ResultSet=>{
             Result=>[
-                    {$expectedAssetId=>$matrixListingLastUpdatedHuman,fieldType=>"lastUpdated",name=>"Last Updated"},
-                    {fieldType=>"category",name=>"category1",$expectedAssetId=>$matrixListing->get('title').' '},
-                    {fieldType=>"category",name=>"category2",$expectedAssetId=>$matrixListing->get('title').' '}
+                    {$safeAssetId=>$matrixListingLastUpdatedHuman,fieldType=>"lastUpdated",name=>"Last Updated"},
+                    {fieldType=>"category",name=>"category1",$safeAssetId=>$matrixListing->get('title').' '},
+                    {fieldType=>"category",name=>"category2",$safeAssetId=>$matrixListing->get('title').' '}
                     ]
             },
          ColumnDefs=>[{
-            key         =>$expectedAssetId,
+            key         =>$safeAssetId,
             label       =>$matrixListing->get('title').' '.$matrixListing->get('version'),
             formatter   =>"formatColors",
             url         =>$matrixListing->getUrl,
             lastUpdated =>$matrixListingLastUpdatedHuman,
             }],
-         ResponseFields=>["attributeId", "name", "description","fieldType", "checked",$expectedAssetId,$expectedAssetId."_compareColor"]
+         ResponseFields=>["attributeId", "name", "description","fieldType", "checked",$safeAssetId,$safeAssetId."_compareColor"]
         },
         'Getting compareListData as JSON'
     ); 

t/Asset/Wobject/SyndicatedContent.t

@@ -51,7 +51,7 @@ isa_ok($syndicated_content, 'WebGUI::Asset::Wobject::SyndicatedContent');
 my $newSyndicatedContentSettings = {
 	cacheTimeout => 124,
 	templateId   => "PBtmpl0000000000000065", 
-    rssUrl      => 'http://svn.webgui.org/svnweb/plainblack/rss/WebGUI/',
+    rssUrl      => 'http://github.com/plainblack/webgui/commits/master.atom',
 };
 
 # update the new values for this instance