WordPress.org

Make WordPress Core

Ticket #40104: 40104.1.diff

File 40104.1.diff, 2.6 KB (added by bpayton, 2 years ago)

Patch for last-minute qunit failures

  • tests/qunit/index.html

    diff --git a/tests/qunit/index.html b/tests/qunit/index.html
    index 25c6b7f061..1527db6d22 100644
    a b  
    371371                                <button type="button" class="menus-move-up">Move up</button><button type="button" class="menus-move-down">Move down</button><button type="button" class="menus-move-left">Move one level up</button><button type="button" class="menus-move-right">Move one level down</button>                 </div>
    372372                </script>
    373373
     374                <script type="text/html" id="tmpl-nav-menu-locations-header">
     375                        <span class="customize-control-title customize-section-title-menu_locations-heading"><?php _e( 'Menu Locations' ); ?></span>
     376                        <p class="customize-control-description customize-section-title-menu_locations-description">Something</p>
     377                </script>
     378
     379                <script type="text/html" id="tmpl-nav-menu-create-menu-section-title">
     380                        <h3>
     381                                <button type="button" class="button customize-add-menu-button">
     382                                        <?php _e( 'Create New Menu' ); ?>
     383                                </button>
     384                        </h3>
     385                </script>
     386
    374387                <script type="text/html" id="tmpl-customize-section-sidebar">
    375388                        <li id="accordion-section-{{ data.id }}" class="accordion-section control-section control-section-{{ data.type }}">
    376389                        <h3 class="accordion-section-title" tabindex="0">
  • tests/qunit/wp-admin/js/customize-nav-menus.js

    diff --git a/tests/qunit/wp-admin/js/customize-nav-menus.js b/tests/qunit/wp-admin/js/customize-nav-menus.js
    index bebbe23a32..f77111c171 100644
    a b jQuery( window ).load( function (){ 
    5353        // @todo Add more tests for api.Menus.MenusPanel behaviors
    5454
    5555        test( 'there an expected MenuSection for the primary menu', function() {
    56                 var section, controls;
     56                var section, controls, lastControl;
    5757
    5858                section = api.section( 'nav_menu[' + primaryMenuId + ']' );
    5959                ok( section, 'section exists' );
    jQuery( window ).load( function (){ 
    6565                controls = section.controls();
    6666                ok( controls[0].extended( api.Menus.MenuNameControl ), 'first control in menu section is MenuNameControl' );
    6767                ok( controls[1].extended( api.Menus.MenuItemControl ), 'second control in menu section is MenuItemControl' );
    68                 ok( controls[ controls.length - 1 ].extended( api.Menus.MenuDeleteControl ), 'last control in menu section is a MenuDeleteControl' );
     68
     69                lastControl = controls[ controls.length - 1 ];
     70                ok( lastControl.extended( api.Control ), 'last control in menu section is a base Control' );
     71                ok( lastControl.params.templateId === 'nav-menu-delete-button', 'last control in menu section has a delete-button template' );
    6972        } );
    7073        // @todo Add more tests for api.Menus.MenuSection behaviors
    7174