From 779b39b50177a1ea435791ab3974198fd142fc8b Mon Sep 17 00:00:00 2001
From: Russel Cole <russel.cole@pixl8.co.uk>
Date: Mon, 9 Dec 2024 12:08:49 +0000
Subject: [PATCH] PRESIDECMS-2980 fix args in getTemplate before
 updateScheduledFields in   emailTemplateServiceTests

---
 .../api/email/EmailTemplateServiceTest.cfc    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/integration/api/email/EmailTemplateServiceTest.cfc b/tests/integration/api/email/EmailTemplateServiceTest.cfc
index 73aaa28464..368454334f 100755
--- a/tests/integration/api/email/EmailTemplateServiceTest.cfc
+++ b/tests/integration/api/email/EmailTemplateServiceTest.cfc
@@ -188,7 +188,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {
 					, schedule_sent           = ""
 				};
 
-				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false ).$results( template );
+				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false, useRequestCache=false ).$results( template );
 				service.$( "saveTemplate").$args( template=template, id=templateId , isDraft=true ).$results( templateId );
 				service.$( "_getNow", nowish );
 
@@ -215,7 +215,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {
 					, schedule_next_send_date = ""
 				};
 
-				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false ).$results( template );
+				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false, useRequestCache=false ).$results( template );
 				service.$( "saveTemplate", templateId );
 				service.$( "_getNow", nowish );
 
@@ -245,7 +245,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {
 					, schedule_next_send_date = ""
 				};
 
-				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false ).$results( template );
+				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false, useRequestCache=false ).$results( template );
 				service.$( "saveTemplate", templateId );
 				service.$( "_getNow", nowish );
 
@@ -272,7 +272,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {
 					, schedule_next_send_date = DateAdd( "ww", -1, nowish )
 				};
 
-				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false ).$results( template );
+				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false, useRequestCache=false ).$results( template );
 				service.$( "saveTemplate", templateId );
 				service.$( "_getNow", nowish );
 
@@ -299,7 +299,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {
 					, schedule_next_send_date = nowish
 				};
 
-				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false ).$results( template );
+				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false, useRequestCache=false ).$results( template );
 				service.$( "saveTemplate", templateId );
 				service.$( "_getNow", nowish );
 
@@ -325,7 +325,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {
 					, schedule_next_send_date = DateAdd( "ww", 4, nowish )
 				};
 
-				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false ).$results( template );
+				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false, useRequestCache=false ).$results( template );
 				service.$( "saveTemplate", templateId );
 				service.$( "_getNow", nowish );
 
@@ -353,7 +353,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {
 					, schedule_next_send_date = nextSendDate
 				};
 
-				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false ).$results( template );
+				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false, useRequestCache=false ).$results( template );
 				service.$( "saveTemplate", templateId );
 				service.$( "_getNow", nowish );
 
@@ -379,7 +379,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {
 					, schedule_next_send_date = DateAdd( "ww", 4, nowish )
 				};
 
-				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false ).$results( template );
+				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false, useRequestCache=false ).$results( template );
 				service.$( "saveTemplate", templateId );
 				service.$( "_getNow", nowish );
 
@@ -406,7 +406,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {
 					, schedule_next_send_date = ""
 				};
 
-				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false ).$results( template );
+				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false, useRequestCache=false ).$results( template );
 				service.$( "saveTemplate", templateId );
 				service.$( "_getNow", nowish );
 
@@ -433,7 +433,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {
 					, schedule_next_send_date = ""
 				};
 
-				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false ).$results( template );
+				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false, useRequestCache=false ).$results( template );
 				service.$( "saveTemplate", templateId );
 				service.$( "_getNow", nowish );
 
@@ -461,7 +461,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {
 					, schedule_next_send_date = ""
 				};
 
-				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false ).$results( template );
+				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false, useRequestCache=false ).$results( template );
 				service.$( "saveTemplate", templateId );
 				service.$( "_getNow", nowish );
 
@@ -496,7 +496,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {
 					, schedule_next_send_date = ""
 				};
 
-				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false ).$results( template );
+				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false, useRequestCache=false ).$results( template );
 				service.$( "saveTemplate", templateId );
 				service.$( "_getNow", nowish );
 
@@ -526,7 +526,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {
 					, schedule_next_send_date = ""
 				};
 
-				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false ).$results( template );
+				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false, useRequestCache=false ).$results( template );
 				service.$( "saveTemplate", templateId );
 				service.$( "_getNow", nowish );
 
@@ -553,7 +553,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {
 					, schedule_sent           = true
 				};
 
-				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false ).$results( template );
+				service.$( "getTemplate" ).$args( id=templateId, allowDrafts=true, fromVersionTable=false, useRequestCache=false ).$results( template );
 				service.$( "saveTemplate", templateId );
 				service.$( "_getNow", nowish );