Author: rfscholte
Date: Thu Dec 22 18:34:47 2011
New Revision: 1222390
URL: http://svn.apache.org/viewvc?rev=1222390&view=rev
Log:
Fix IT of MSKINS-17 + verification script.
Added:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/verify.groovy
Modified:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/src/site/site.xml?rev=1222390&r1=1222389&r2=1222390&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/src/site/site.xml
(original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/src/site/site.xml Thu
Dec 22 18:34:47 2011
@@ -33,9 +33,7 @@
<!-- START SNIPPET: skin-custom-config -->
<custom>
- <fluidoSkin>
- <publishDate>1970-01-01</publishDate>
- </fluidoSkin>
+ <publishDate>1970-01-01</publishDate>
</custom>
<!-- END SNIPPET: skin-custom-config -->
Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/verify.groovy?rev=1222390&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/verify.groovy (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-17/verify.groovy Thu Dec
22 18:34:47 2011
@@ -0,0 +1,3 @@
+File index = new File( basedir, "target/site/index.html" )
+assert index.exists()
+assert 1 == index.getText().count( '<li id="publishDate"
class="pull-right">Last Published: 1970-01-01</li>' )
\ No newline at end of file
Modified:
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1222390&r1=1222389&r2=1222390&view=diff
==============================================================================
---
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
(original)
+++
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Thu Dec 22 18:34:47 2011
@@ -359,7 +359,7 @@
#if ( $publishDate )
#set ( $dateValue = $dateFormat.format( $publishDate ) )
#elseif ( $decoration.custom.getChild( 'publishDate' ) )
- #set ( $dateValue = $decoration.custom.getChild( 'publishDate' ) )
+ #set ( $dateValue = $decoration.custom.getChild( 'publishDate'
).getValue() )
#else
#set ( $dateValue = $dateFormat.format( $currentDate ) )
#end
