Merge pull request #4112 from plone/fix-robottests-contentbrowser-6.1.x

fix robottests for contentbrowser [6.1]

Products/CMFPlone/tests/robot/test_contentbrowser.robot

@@ -136,8 +136,8 @@ I select a related item image via contentbrowser
    Click item in contenbrowser column    4    3
    # Click second element in fifth column, that is the "Image2" Object
    Click item in contenbrowser column    5    2
-   # Click the select Button in the Toolbar of column 6
-   Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[6]/div[contains(@class, "levelToolbar")]/button
+   # Click the select Button in the Toolbar of column 6   
+   Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[6]/div[contains(@class, "levelToolbar")]/div[contains(@class,"selectLevel")]/button
 
 
 I select two related item images via contentbrowser
@@ -181,7 +181,7 @@ I set an internal link via contentbrowser
     ...    all_elements=False
     Click tiny button and open contentbrowser    Insert/edit link
     Click item in contenbrowser column    1    3
-    Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[contains(@class, "preview")]/div[contains(@class, "levelToolbar")]/button
+    Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[contains(@class, "preview")]/div[contains(@class, "levelToolbar")]/div[contains(@class,"selectLevel")]/button
     Click    //div[contains(@class, 'modal-footer')]//input[contains(@name, 'insert')]
 
 I set an image via contentbrowser
@@ -191,7 +191,7 @@ I set an image via contentbrowser
     Click item in contenbrowser column    1    3
     Click item in contenbrowser column    2    1
     Click item in contenbrowser column    3    1
-    Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[contains(@class, "preview")]/div[contains(@class, "levelToolbar")]/button
+    Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[contains(@class, "preview")]/div[contains(@class, "levelToolbar")]/div[contains(@class,"selectLevel")]/button
     Click    //div[contains(@class, 'modal-footer')]//input[contains(@name, 'insert')]
 
 I upload an image via contentbrowser
@@ -204,7 +204,7 @@ I upload an image via contentbrowser
     Upload File By Selector    //div[contains(@class,"pat-upload")]//input[@class="dz-hidden-input"]    ${PATH_TO_TEST_FILES}/plone-logo.png
     Click    //div[contains(@class,"pat-upload")]//button[contains(@class,"upload-all")]
     Click item in contenbrowser column    3    3
-    Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[contains(@class, "preview")]/div[contains(@class, "levelToolbar")]/button
+    Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[contains(@class, "preview")]/div[contains(@class, "levelToolbar")]/div[contains(@class,"selectLevel")]/button
     Click    //div[contains(@class, 'modal-footer')]//input[contains(@name, 'insert')]
 
 I search and select an image via contentbrowser
@@ -219,8 +219,8 @@ I search and select an image via contentbrowser
     Type Text    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "toolBar")]//input[contains(@name,"filter")]    Anot
     # here we need a timeout, because the search filter is not so fast like the testbrowser, it looks like a asynch operation
     Sleep    1
-    Click item in contenbrowser column    5    1
-    Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[contains(@class, "preview")]/div[contains(@class, "levelToolbar")]/button
+    Click item in contenbrowser column    1    1
+    Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[contains(@class, "preview")]/div[contains(@class, "levelToolbar")]/div[contains(@class,"selectLevel")]/button
     Click    //div[contains(@class, 'modal-footer')]//input[contains(@name, 'insert')]
 
 I save the document

Products/CMFPlone/tests/robot/test_edit.robot

@@ -114,7 +114,7 @@ I select a related item
     # Click first element in first column
     Click item in contenbrowser column    1    1
     # Click the select Button in the Toolbar of column 2
-    Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[2]/div[contains(@class, "levelToolbar")]//button[contains(@class, "btn-primary")]
+    Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[2]/div[contains(@class, "levelToolbar")]//button[contains(@class, "btn-outline-primary")]
 
 I select a linked item
     # Click the select button
@@ -123,7 +123,7 @@ I select a linked item
     Click item in contenbrowser column    1    1
     # Click the select Button in the Toolbar of column 2
     # This selects the "test-folder"
-    Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[2]/div[contains(@class, "levelToolbar")]//button[contains(@class, "btn-primary")]
+    Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[2]/div[contains(@class, "levelToolbar")]//button[contains(@class, "btn-outline-primary")]
 
 I save the page
     Click    //button[@name="form.buttons.save"]

Products/CMFPlone/tests/robot/test_linkintegrity.robot

@@ -62,7 +62,7 @@ I add a link in rich text
     Click    //button[@aria-label="Insert/edit link"]
     Click    //div[contains(@class,"linkModal")]//div[contains(@class,"content-browser-selected-items-wrapper")]//a[contains(@class,"btn-primary")]
     Click item in contenbrowser column    1    3
-    Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[contains(@class, "preview")]/div[contains(@class, "levelToolbar")]//button[contains(@class, "btn-primary")]
+    Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[contains(@class, "preview")]/div[contains(@class, "levelToolbar")]//button
     Click    //div[contains(@class,"modal-footer")]//input[@name="insert"]
     Click    //button[@name="form.buttons.save"]
     Get Text    //body    contains    Changes saved

Products/CMFPlone/tests/robot/test_querystring.robot

@@ -355,7 +355,7 @@ I search in ${NAME} subfolder in the contentbrowser widget
     mark results
     Click    //div[@class="querystring-criteria-value"]//div[contains(@class, "content-browser-selected-items-wrapper")]//a[contains(@class, "btn-primary")]
     Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumn")]//div[contains(@class, "item-title")][text()[contains(.,'${NAME}')]]
-    Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[3]/div[contains(@class, "levelToolbar")]/button
+    Click    //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]//div[contains(@class, "levelToolbar")]//button[@title="select B"]
 
 
 I open the select box titled operator

news/4112.testing

@@ -0,0 +1,2 @@
+fix robottests for contentbrowser improvements
+[1letter]