LDEV-6067 add admin updates notification test

Author: zspitzer

core/src/main/cfml/context/admin/update.cfm

@@ -14,6 +14,7 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  * 
  ---><cfsetting showdebugoutput="false">
+<cfparam name="url.json" default="false" type="boolean">
 <cftry>
 <cfparam name="session.alwaysNew" default="true" type="boolean">
 <cfinclude template="services.update.functions.cfm">
@@ -109,20 +110,24 @@
 			<cfset request.adminType=url.adminType>
 			<cfset external=getAllExternalData()>
 
+			<cfset extUpdates = []>
 			<cfsavecontent variable="ext" trim="true">
 				<cfloop query="extensions">
 					<cfscript>
 						sct = {};
 						loop list="#extensions.columnlist()#" item="key" {
 							sct[ key ]=extensions[ key ];
 						}
-						updateVersion= updateAvailable( sct, external );
-						if (updateVersion eq "false")
+						updateVersion = updateAvailable( sct, external );
+						if ( updateVersion eq "false" )
 							continue;
-						uid=extensions.id
-						link="";
-						dn="";
-						link="?action=ext.applications&action2=detail&id=#uid#";
+						uid = extensions.id;
+						link = "?action=ext.applications&action2=detail&id=#uid#";
+						arrayAppend( extUpdates, {
+							"name": extensions.name,
+							"current": sct.version,
+							"available": updateVersion
+						} );
 					</cfscript>
 					<cfoutput>
 						<a href="#link#" style="color:red;text-decoration:none;">- #extensions.name# - <b>#updateVersion#</b> ( #sct.version# ) </a><br>
@@ -209,6 +214,19 @@
 		<cfset content=session[id].content>
 	</cfif>
 
+	<cfif url.json>
+		<cfset result = {
+			"currentVersion": server.lucee.version,
+			"hasUpdate": adminType == "server" && ( hasUpdate ?: false ),
+			"availableVersion": available ?: "",
+			"extensionUpdates": extUpdates ?: []
+		}>
+		<cfsetting showdebugoutput="false">
+		<cfcontent reset="yes" type="application/json">
+		<cfoutput>#serializeJson( result )#</cfoutput>
+		<cfabort>
+	</cfif>
+
 	<cfoutput>#content#</cfoutput>
 
 	<cfcatch>

loader/build.xml

@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.2.5.22-SNAPSHOT"/>
+  <property name="version" value="6.2.5.23-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

loader/pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.2.5.22-SNAPSHOT</version>
+  <version>6.2.5.23-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>

test/general/AdminPages.cfc

@@ -114,6 +114,24 @@ component extends="org.lucee.cfml.test.LuceeTestCase"	{
                 // 500 (mappng doesn't exist)
                 checkUrl( adminRoot, "index.cfm?action=resources.mappings&action2=create&virtual=/lucee/adminMissing", 500 );
             });
+
+            it( title="check admin updates notification (JSON)", body=function(){
+                local.content = checkUrl( adminRoot, "update.cfm?adminType=server&json=true", 200 );
+                expect( isJson( local.content ) ).toBeTrue( "Response should be JSON" );
+                local.data = deserializeJson( local.content );
+                local.TAB = chr( 9 );
+                if ( local.data.hasUpdate || arrayLen( local.data.extensionUpdates ) ) {
+                    systemOutput( "", true );
+                    systemOutput( "Admin reports update(s) available:", true );
+                    if ( local.data.hasUpdate ) {
+                        systemOutput( TAB & "Core: " & local.data.currentVersion & " -> " & local.data.availableVersion, true );
+                    }
+                    for ( local.ext in local.data.extensionUpdates ) {
+                        systemOutput( TAB & "Extension: " & local.ext.name & " " & local.ext.current & " -> " & local.ext.available, true );
+                    }
+                    systemOutput( "", true );
+                }
+            });
         });
     }
 
@@ -147,7 +165,8 @@ component extends="org.lucee.cfml.test.LuceeTestCase"	{
         //expect( local.result.status ).toBeBetween( 200, 399, adminRoot & page & " returned status code: " & local.result.status);
         // if ( local.result.status neq arguments.statusCode )
         //     systemOutput( trim(local.result.filecontent), true );
-        expect( local.result.status ).toBe( arguments.statusCode, 
+        expect( local.result.status ).toBe( arguments.statusCode,
             arguments.adminRoot & page & " returned status code: " & local.result.status );
+        return local.result.fileContent;
     }
 }