tests: Update baseline images

geokrety · May 22, 2024 · d7e2539 · d7e2539
1 parent 0a104d1
commit d7e2539
Show file tree

Hide file tree

Showing 38 changed files with 26 additions and 17 deletions.
diff --git a/tests-qa/acceptance/030_Geokrety/030_GeokretyAvatar/030_DefineAsMain.robot b/tests-qa/acceptance/030_Geokrety/030_GeokretyAvatar/030_DefineAsMain.robot
@@ -10,15 +10,17 @@ Test Setup      Test Setup
 
 *** Test Cases ***
 
-Set image as main geokret avatar
+First image is set as main geokret avatar
+    [Tags]    OpenEyes
     Open Eyes                               Browser  5
 
     Post GeoKret Avatar                     ${CURDIR}/../../ressources/pictures/sample-picture.png
-    Click Picture Action                    ${GEOKRET_DETAILS_AVATAR_FIRST_IMAGE}    ${PICTURE_PULLER_SET_AS_AVATAR_BUTTON}
 
-    Wait Until Modal                        Do you want to set this picture as main avatar?
-    Capture Element                         ${MODAL_DIALOG}    name=img1
-    Click Button                            ${MODAL_DIALOG_SUBMIT_BUTTON}
+    Wait Until Page Contains Element        ${GEOKRET_DETAILS_AVATAR_FIRST_IMAGE}${PICTURE_PULLER}
+    Scroll Into View                        ${GEOKRET_DETAILS_AVATAR_FIRST_IMAGE}${PICTURE_PULLER}
+    Mouse Over                              ${GEOKRET_DETAILS_AVATAR_FIRST_IMAGE}${PICTURE_PULLER}
+
+    Page Should Not Contain Button          ${PICTURE_PULLER_SET_AS_AVATAR_BUTTON}
     Capture Element                         ${GEOKRET_DETAILS_AVATAR_IMAGES}    name=img2
 
     Compare Images

diff --git a/tests-qa/acceptance/030_Geokrety/030_GeokretyAvatar/040_UpdateCaption.robot b/tests-qa/acceptance/030_Geokrety/030_GeokretyAvatar/040_UpdateCaption.robot
@@ -11,6 +11,7 @@ Test Setup      Test Setup
 *** Test Cases ***
 
 Define GeoKret avatar caption
+    [Tags]    OpenEyes
     Click Picture Action                    ${GEOKRET_DETAILS_AVATAR_FIRST_IMAGE}    ${PICTURE_PULLER_EDIT_BUTTON}
     Wait Until Modal                        Manage picture
     Input Text                              ${CAPTION_INPUT}    Bonjour

diff --git a/tests-qa/acceptance/030_Geokrety/030_GeokretyAvatar/050_DeletePicture.robot b/tests-qa/acceptance/030_Geokrety/030_GeokretyAvatar/050_DeletePicture.robot
@@ -30,7 +30,7 @@ Delete 1 GeoKret avatar should leave others present
     Page Should Contain Element             ${GEOKRET_DETAILS_AVATAR_IMAGES}
 
     Element Count Should Be                 ${GEOKRET_DETAILS_AVATAR_IMAGES_ALL}    ${1}
-    Check Image                             ${GEOKRET_DETAILS_PICTURES_PANEL}
+    Check Image                             ${GEOKRET_DETAILS_PICTURES_PANEL}//div[@class="gallery"]
 
 *** Keywords ***
 

diff --git a/tests-qa/acceptance/040_Users/Avatar/030_DefineAsMain.robot b/tests-qa/acceptance/040_Users/Avatar/030_DefineAsMain.robot
@@ -8,19 +8,20 @@ Test Setup      Test Setup
 
 *** Test Cases ***
 
-Set image as main avatar
+First uploaded image is set as main avatar
+    [Tags]    OpenEyes
     Open Eyes                               Browser  5
 
-    Post User Avatar                        ${CURDIR}/../../ressources/pictures/sample-picture.png
-    Click Picture Action                    ${USER_PROFILE_FIRST_IMAGE}         ${PICTURE_PULLER_SET_AS_AVATAR_BUTTON}
+    # Post User Avatar                        ${CURDIR}/../../ressources/pictures/sample-picture.png
+    Post User Avatar                        ${CURDIR}/../../ressources/pictures/sample-picture.png     position=1
+    Post User Avatar                        ${CURDIR}/../../ressources/pictures/sample-picture2.png    position=2
 
-    Wait Until Modal                        Do you want to set this picture as main avatar?
-    Capture Element                         ${MODAL_DIALOG}    name=img1
-    Click Button                            ${MODAL_DIALOG_SUBMIT_BUTTON}
-    Scroll Into View                        ${USER_PROFILE_AVATAR_GALLERY}
-    Capture Element                         ${USER_PROFILE_AVATAR_GALLERY}    name=img2
+    Wait Until Page Contains Element        ${USER_PROFILE_FIRST_IMAGE}${PICTURE_PULLER}
+    Scroll Into View                        ${USER_PROFILE_FIRST_IMAGE}${PICTURE_PULLER}
+    Mouse Over                              ${USER_PROFILE_FIRST_IMAGE}${PICTURE_PULLER}
+    Page Should Not Contain Button          ${USER_PROFILE_FIRST_IMAGE}${PICTURE_PULLER}${PICTURE_PULLER_SET_AS_AVATAR_BUTTON}
 
-    Compare Images
+    Check Image                             ${USER_PROFILE_PICTURES_PANEL}//div[@class="gallery"]
 
 Set second image as main avatar
     Post User Avatar                        ${CURDIR}/../../ressources/pictures/sample-picture.png     position=1
@@ -29,7 +30,7 @@ Set second image as main avatar
     Click Picture Action                    ${USER_PROFILE_SECOND_IMAGE}        ${PICTURE_PULLER_SET_AS_AVATAR_BUTTON}
     Wait Until Modal                        Do you want to set this picture as main avatar?
     Click Button                            ${MODAL_DIALOG_SUBMIT_BUTTON}
-    Check Image                             ${USER_PROFILE_PICTURES_PANEL}
+    Check Image                             ${USER_PROFILE_PICTURES_PANEL}//div[@class="gallery"]
 
 *** Keywords ***
 

diff --git a/tests-qa/acceptance/040_Users/Avatar/040_UpdateCaption.robot b/tests-qa/acceptance/040_Users/Avatar/040_UpdateCaption.robot
@@ -9,6 +9,7 @@ Test Setup      Test Setup
 *** Test Cases ***
 
 Define User Avatar Caption
+    [Tags]    OpenEyes
     Click Picture Action                    ${USER_PROFILE_FIRST_IMAGE}             ${PICTURE_PULLER_EDIT_BUTTON}
     Wait Until Modal                        Manage picture
     Input Text                              ${CAPTION_INPUT}    Bonjour

diff --git a/tests-qa/acceptance/040_Users/Avatar/050_DeletePicture.robot b/tests-qa/acceptance/040_Users/Avatar/050_DeletePicture.robot
@@ -28,7 +28,7 @@ Delete 1 picture should leave other present
     Page Should Contain Element             ${USER_PROFILE_IMAGES}
 
     Element Count Should Be                 ${USER_PROFILE_IMAGES}                  1
-    Check Image                             ${USER_PROFILE_PICTURES_PANEL}
+    Check Image                             ${USER_PROFILE_PICTURES_PANEL}//div[@class="gallery"]
 
 *** Keywords ***
 

diff --git a/tests-qa/acceptance/040_Users/Details/050_BanerTemplate.robot b/tests-qa/acceptance/040_Users/Details/050_BanerTemplate.robot
@@ -42,6 +42,7 @@ Suite Setup
     Clear Database And Seed ${2} users
 
 Select banner
+    [Tags]    OpenEyes
     [Arguments]    ${templateId}
     Sign In ${USER_1.name} Fast
     Go To Url                               ${PAGE_USER_1_BANER_TEMPLATE_URL}

diff --git a/tests-qa/acceptance/040_Users/Details/060_ObservationArea.robot b/tests-qa/acceptance/040_Users/Details/060_ObservationArea.robot
@@ -78,6 +78,7 @@ Check invalid coordinates
     ${SPACE}
 
 Save Observation Area Preferences
+    [Tags]    OpenEyes
     Sign In ${USER_1.name} Fast
     Go To Url                               ${PAGE_USER_1_OBSERVATION_AREA_URL}
     Fill form                               ${COORDS_NEW_YORK}    10
@@ -156,6 +157,7 @@ Check valid radius
 
 
 Check Map circle should reflect observation
+    [Tags]    OpenEyes
     [Arguments]    ${radius}
     Sign In ${USER_1.name} Fast
     Go To Url                               ${PAGE_USER_1_OBSERVATION_AREA_URL}

diff --git a/tests-qa/acceptance/ressources/Pictures.robot b/tests-qa/acceptance/ressources/Pictures.robot
@@ -42,6 +42,7 @@ ${USER_PROFILE_AVATAR_GALLERY}                  ${USER_PROFILE_DETAILS_PANEL}//d
 *** Keywords ***
 
 Check Image
+    [Tags]    OpenEyes
     [Arguments]    ${element}    ${name}=img1
     Open Eyes                               Browser  5
     Scroll Into View                        ${GK_LOGO_LINK}

diff --git a/tests-qa/visual_images/Define_GeoKret_avatar_caption/img1.png b/tests-qa/visual_images/Define_GeoKret_avatar_caption/img1.png
diff --git a/tests-qa/visual_images/Define_GeoKret_avatar_caption/img2.png b/tests-qa/visual_images/Define_GeoKret_avatar_caption/img2.png
diff --git a/tests-qa/visual_images/Define_GeoKret_avatar_caption/img3.png b/tests-qa/visual_images/Define_GeoKret_avatar_caption/img3.png
diff --git a/tests-qa/visual_images/Define_User_Avatar_Caption/img1.png b/tests-qa/visual_images/Define_User_Avatar_Caption/img1.png
diff --git a/tests-qa/visual_images/Define_User_Avatar_Caption/img2.png b/tests-qa/visual_images/Define_User_Avatar_Caption/img2.png
diff --git a/tests-qa/visual_images/Define_User_Avatar_Caption/img3.png b/tests-qa/visual_images/Define_User_Avatar_Caption/img3.png
diff --git a/...s-qa/visual_images/Delete_1_GeoKret_avatar_should_leave_others_present/img1.png b/...s-qa/visual_images/Delete_1_GeoKret_avatar_should_leave_others_present/img1.png
diff --git a/tests-qa/visual_images/Delete_1_picture_should_leave_other_present/img1.png b/tests-qa/visual_images/Delete_1_picture_should_leave_other_present/img1.png
diff --git a/tests-qa/visual_images/Delete_GeoKret_avatar_picture/img1.png b/tests-qa/visual_images/Delete_GeoKret_avatar_picture/img1.png
diff --git a/tests-qa/visual_images/Delete_User_avatar_picture/img1.png b/tests-qa/visual_images/Delete_User_avatar_picture/img1.png
diff --git a/tests-qa/visual_images/Fill_Coordinates_Show_Map_Centered/img1.png b/tests-qa/visual_images/Fill_Coordinates_Show_Map_Centered/img1.png
diff --git a/tests-qa/visual_images/First_image_is_set_as_main_geokret_avatar/img2.png b/tests-qa/visual_images/First_image_is_set_as_main_geokret_avatar/img2.png
diff --git a/tests-qa/visual_images/First_uploaded_image_is_set_as_main_avatar/img1.png b/tests-qa/visual_images/First_uploaded_image_is_set_as_main_avatar/img1.png
diff --git a/tests-qa/visual_images/GeoKrety_avatars_should_be_shown_on_Homepage/img1.png b/tests-qa/visual_images/GeoKrety_avatars_should_be_shown_on_Homepage/img1.png
diff --git a/tests-qa/visual_images/Map_circle_should_reflect_observation_radius_0/img1.png b/tests-qa/visual_images/Map_circle_should_reflect_observation_radius_0/img1.png
diff --git a/tests-qa/visual_images/Map_circle_should_reflect_observation_radius_1/img1.png b/tests-qa/visual_images/Map_circle_should_reflect_observation_radius_1/img1.png
diff --git a/tests-qa/visual_images/Map_circle_should_reflect_observation_radius_10/img1.png b/tests-qa/visual_images/Map_circle_should_reflect_observation_radius_10/img1.png
diff --git a/tests-qa/visual_images/Map_circle_should_reflect_observation_radius_5/img1.png b/tests-qa/visual_images/Map_circle_should_reflect_observation_radius_5/img1.png
diff --git a/tests-qa/visual_images/Map_should_reflect_manual_coordinates_input/img1.png b/tests-qa/visual_images/Map_should_reflect_manual_coordinates_input/img1.png
diff --git a/tests-qa/visual_images/Moves_Should_Be_Shown_On_GeoKret_Page/img1.png b/tests-qa/visual_images/Moves_Should_Be_Shown_On_GeoKret_Page/img1.png
diff --git a/tests-qa/visual_images/Save_Observation_Area_Preferences/img1.png b/tests-qa/visual_images/Save_Observation_Area_Preferences/img1.png
diff --git a/...-qa/visual_images/Select_Cache_Name_From_OC_Autocomplete_Fill_Waypoint/img1.png b/...-qa/visual_images/Select_Cache_Name_From_OC_Autocomplete_Fill_Waypoint/img1.png
diff --git a/tests-qa/visual_images/Set_image_as_main_avatar/img1.png b/tests-qa/visual_images/Set_image_as_main_avatar/img1.png
diff --git a/tests-qa/visual_images/Set_image_as_main_avatar/img2.png b/tests-qa/visual_images/Set_image_as_main_avatar/img2.png
diff --git a/tests-qa/visual_images/Set_image_as_main_geokret_avatar/img1.png b/tests-qa/visual_images/Set_image_as_main_geokret_avatar/img1.png
diff --git a/tests-qa/visual_images/Set_image_as_main_geokret_avatar/img2.png b/tests-qa/visual_images/Set_image_as_main_geokret_avatar/img2.png
diff --git a/tests-qa/visual_images/Set_second_image_as_main_avatar/img1.png b/tests-qa/visual_images/Set_second_image_as_main_avatar/img1.png
diff --git a/tests-qa/visual_images/Set_second_image_as_main_geokret_avatar/img1.png b/tests-qa/visual_images/Set_second_image_as_main_geokret_avatar/img1.png
diff --git a/tests-qa/visual_images/Users_avatars_should_be_shown_on_Homepage/img1.png b/tests-qa/visual_images/Users_avatars_should_be_shown_on_Homepage/img1.png