Commit 8b7940de authored by Robert Lyon's avatar Robert Lyon Committed by Cecilia Vela Gurovic
Browse files

Bug 1821995: Avoid duplicate 'view-wizard-controls' id on page edit 



As valid HTML should have only unique ids for elements on a page

Change-Id: I21dce982cc9ad3a9dd2d754d4621f741f712484a
Signed-off-by: default avatarRobert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 5880a0d2)
parent c67e9144

htdocs/testing/frameworks/behat/classes/properties.php

+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ define ("LOCATOR_CONSTANTS", json_encode(array( 
    'User menu'                                 => array(".icon-chevron-down.collapsed", "css_element"),

    'Signoff page'                              => array("#signoff-confirm-form", "css_element"),

    'Verify page'                               => array("#verify-confirm-form", "css_element"),

    'Display page button'                       => array("#view-wizard-controls .btn-secondary:nth-of-type(1)", "css_element"),

    'Return to pages and collections button'    => array("#view-wizard-controls .btn-secondary:nth-of-type(2)", "css_element"),

    'Display page button'                       => array("#view-return-controls .btn-secondary:nth-of-type(1)", "css_element"),

    'Return to pages and collections button'    => array("#view-return-controls .btn-secondary:nth-of-type(2)", "css_element"),

    'Progressbar block'                         => array("#sb-progressbar h3.card-header", "css_element"),

    'Progressbar'                               => array("#progress_bar_fill.progress-bar", "css_element"),

    'Inbox message icon'                        => array("#activitylist .card-header a span", "css_element"),

htdocs/theme/raw/templates/view/blocks.tpl

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
            </div>

        </form>



        <div id="view-wizard-controls" class="col-collapse-offset col-with-collapse">

        <div id="view-return-controls" class="col-collapse-offset col-with-collapse">

            {if !$issitetemplate}

            <a class="btn btn-secondary" href="{$displaylink}">

                {str tag=displayview section=view}

test/behat/features/user_content/create_delete_page.feature

+3 −4
Original line number Diff line number Diff line
@@ -26,10 +26,9 @@ Scenario: Creating a page with content in it (Bug 1426983) 
    | Page title | Test view |

    And I fill in "First description" in first editor

    And I press "Save"

    # verify display page button is displayed

    And I should see "Display page" in the "div#view-wizard-controls.col-collapse-offset.col-with-collapse" element

    # verify Return to pages and collections is displayed

    And I should see "Return to pages and collections" in the "div#view-wizard-controls.col-collapse-offset.col-with-collapse" element

    # verify page elements are displayed Display page and Return to pages and collections buttons

    And I should see "Display page" in the "Display page button" property

    And I should see "Return to pages and collections" in the "Return to pages and collections button" property

    # Editing the pages

    And I follow "Settings" in the "Toolbar buttons" property

    #Change the Page title