Add donation reminder to tests for manager

Issue #252
damies13 · Nov 1, 2024 · 0e39d9d · 0e39d9d
1 parent 1a0a18c
commit 0e39d9d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/Tests/Regression/Manager/GUI_Common.robot b/Tests/Regression/Manager/GUI_Common.robot
@@ -84,8 +84,8 @@ Open Manager GUI
 	[Arguments]		${options}=None
 	# Press Escape and move mouse because on linux the screen save had kicked in
 	Press Combination 	Key.esc
-	Move To 	10 	10
-	Move To 	20 	20
+	Wiggle Mouse
+
 	IF  ${options} == None
 		${options}= 	Create List
 		Create Directory 	${results_dir}
@@ -104,6 +104,8 @@ Open Manager GUI
 	IF 	'-n' in ${options}
 		Sleep 	10
 	ELSE
+		Handle Donation Reminder
+
 		${img}=	Set Variable		manager_${platform}_button_runschedule.png
 		${passed}= 	Run Keyword And Return Status 	Wait For 	${img} 	 timeout=${default_image_timeout / 2}
 		IF 	not ${passed}
@@ -130,13 +132,19 @@ Open Manager GUI
 		END
 	END
 
+Wiggle Mouse
+	Move To 	10 	10
+	Move To 	20 	20
+
+Handle Donation Reminder
+	${found}= 	Run Keyword And Return Status 	Click Button 	MaybeLater 		${default_image_timeout / 2}
+	VAR 	${DonationReminder} 	${found} 		scope=TEST
+
 Close Manager GUI ubuntu
 	Run Keyword And Ignore Error 	Click Dialog Button 	cancel 		0.01
 	Run Keyword And Ignore Error 	Click Dialog Button 	no 		0.01
 	Close Manager GUI
 
-
-
 Close Manager GUI windows
 	Run Keyword And Ignore Error 	Click Dialog Button 	cancel 		0.01
 	Run Keyword And Ignore Error 	Click Dialog Button 	no 		0.01

diff --git a/Tests/Regression/Manager/Images/file_method/manager_macos_button_maybelater.png b/Tests/Regression/Manager/Images/file_method/manager_macos_button_maybelater.png
diff --git a/Tests/Regression/Manager/Images/file_method/manager_ubuntu_button_maybelater.png b/Tests/Regression/Manager/Images/file_method/manager_ubuntu_button_maybelater.png
diff --git a/Tests/Regression/Manager/Images/file_method/manager_windows_button_maybelater.png b/Tests/Regression/Manager/Images/file_method/manager_windows_button_maybelater.png
diff --git a/Tests/Regression/Reporter/GUI_Common.robot b/Tests/Regression/Reporter/GUI_Common.robot
@@ -361,11 +361,8 @@ Open GUI macos
 	# Take A Screenshot
 
 Handle Donation Reminder
-	VAR 	${DonationReminter} 	${False} 		scope=TEST
-	${found}= 	Run Keyword And Return Status 	Click Button 	MaybeLater 		60
-	IF 	${found}
-		VAR 	${DonationReminter} 	${True} 		scope=TEST
-	END
+	${found}= 	Run Keyword And Return Status 	Click Button 	MaybeLater 		${default_image_timeout / 2}
+	VAR 	${DonationReminder} 	${found} 		scope=TEST
 
 Close GUI
 	${keyword}= 	Set Variable 	Close GUI ${platform}