From a0b67495342265ee4de947d783569c23fa7adca2 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@git.wordpress.org>
Date: Thu, 5 Oct 2017 04:22:09 +0000
Subject: [PATCH] Customize: Fix QUnit tests after failures introduced in
 [41768].

Props bpayton.
Fixes #40104.


git-svn-id: https://develop.svn.wordpress.org/trunk@41773 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/qunit/index.html                         | 13 +++++++++++++
 tests/qunit/wp-admin/js/customize-nav-menus.js |  7 +++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/tests/qunit/index.html b/tests/qunit/index.html
index 25c6b7f061..1527db6d22 100644
--- a/tests/qunit/index.html
+++ b/tests/qunit/index.html
@@ -371,6 +371,19 @@
 				<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>
 		</script>
 
+		<script type="text/html" id="tmpl-nav-menu-locations-header">
+			<span class="customize-control-title customize-section-title-menu_locations-heading"><?php _e( 'Menu Locations' ); ?></span>
+			<p class="customize-control-description customize-section-title-menu_locations-description">Something</p>
+		</script>
+
+		<script type="text/html" id="tmpl-nav-menu-create-menu-section-title">
+			<h3>
+				<button type="button" class="button customize-add-menu-button">
+					<?php _e( 'Create New Menu' ); ?>
+				</button>
+			</h3>
+		</script>
+
 		<script type="text/html" id="tmpl-customize-section-sidebar">
 			<li id="accordion-section-{{ data.id }}" class="accordion-section control-section control-section-{{ data.type }}">
 			<h3 class="accordion-section-title" tabindex="0">
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/tests/qunit/wp-admin/js/customize-nav-menus.js
+++ b/tests/qunit/wp-admin/js/customize-nav-menus.js
@@ -53,7 +53,7 @@ jQuery( window ).load( function (){
 	// @todo Add more tests for api.Menus.MenusPanel behaviors
 
 	test( 'there an expected MenuSection for the primary menu', function() {
-		var section, controls;
+		var section, controls, lastControl;
 
 		section = api.section( 'nav_menu[' + primaryMenuId + ']' );
 		ok( section, 'section exists' );
@@ -65,7 +65,10 @@ jQuery( window ).load( function (){
 		controls = section.controls();
 		ok( controls[0].extended( api.Menus.MenuNameControl ), 'first control in menu section is MenuNameControl' );
 		ok( controls[1].extended( api.Menus.MenuItemControl ), 'second control in menu section is MenuItemControl' );
-		ok( controls[ controls.length - 1 ].extended( api.Menus.MenuDeleteControl ), 'last control in menu section is a MenuDeleteControl' );
+
+		lastControl = controls[ controls.length - 1 ];
+		ok( lastControl.extended( api.Control ), 'last control in menu section is a base Control' );
+		ok( lastControl.params.templateId === 'nav-menu-delete-button', 'last control in menu section has a delete-button template' );
 	} );
 	// @todo Add more tests for api.Menus.MenuSection behaviors