From 8f19128d83d5d0e14cb180087d1ea10424e89151 Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Mon, 1 Feb 2016 14:01:05 -0500
Subject: [PATCH] Fix unit tests so they are testing aria-expanded.

---
 lms/static/js/fixtures/accordion.html |  8 +++---
 lms/static/js/spec/navigation_spec.js | 38 +++++++++------------------
 2 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/lms/static/js/fixtures/accordion.html b/lms/static/js/fixtures/accordion.html
index 8182b78400..555d357a06 100644
--- a/lms/static/js/fixtures/accordion.html
+++ b/lms/static/js/fixtures/accordion.html
@@ -1,11 +1,11 @@
 <div class="course-wrapper">
   <div class="accordion">
-    <a href="accordion-menu-1" role="button" class="button-chapter chapter is-open" aria-controls="accordion-menu-1">
+    <a href="accordion-menu-1" role="button" class="button-chapter chapter is-open" aria-controls="accordion-menu-1" aria-expanded="true">
       <span class="group-heading active">
           1 Introduction Chapter
       </span>
     </a>
-    <div class="chapter-content-container is-open" id="accordion-menu-1" tabindex="-1" aria-expanded="true">
+    <div class="chapter-content-container is-open" id="accordion-menu-1" tabindex="-1">
       <div class="chapter-menu is-open">
           <div class="menu-item">
           <a href="#">
@@ -25,12 +25,12 @@
           </a>
         </div>
       </div>
-      <a href="accordion-menu-2" role="button" class="button-chapter chapter" aria-controls="accordion-menu-2">
+      <a href="accordion-menu-2" role="button" class="button-chapter chapter" aria-controls="accordion-menu-2" aria-expanded="false">
         <span class="group-heading">
             2 Another Chapter
         </span>
       </a>
-      <div class="chapter-content-container" id="accordion-menu-2" tabindex="-1" aria-expanded="false">
+      <div class="chapter-content-container" id="accordion-menu-2" tabindex="-1">
         <div class="chapter-menu">
           <div class="menu-item">
             <a href="#">
diff --git a/lms/static/js/spec/navigation_spec.js b/lms/static/js/spec/navigation_spec.js
index a96008bb94..d0c51cd049 100644
--- a/lms/static/js/spec/navigation_spec.js
+++ b/lms/static/js/spec/navigation_spec.js
@@ -2,7 +2,7 @@ define(['jquery', 'js/utils/navigation'], function($) {
     'use strict';
 
     describe('Course Navigation Accordion', function() {
-        var accordion, button, heading, chapterContent, chapterMenu;
+        var accordion, chapterMenu;
 
         function keyPressEvent(key) {
             return $.Event('keydown', { which: key });
@@ -12,10 +12,7 @@ define(['jquery', 'js/utils/navigation'], function($) {
             loadFixtures('js/fixtures/accordion.html');
 
             accordion = $('.accordion');
-            button = accordion.children('.button-chapter');
-            heading = button.children('.group-heading');
-            chapterContent = accordion.children('.chapter-content-container');
-            chapterMenu = chapterContent.children('.chapter-menu');
+            chapterMenu = accordion.children('.chapter-content-container').children('.chapter-menu');
 
             this.KEY = $.ui.keyCode;
             spyOn($.fn, 'focus').andCallThrough();
@@ -31,13 +28,8 @@ define(['jquery', 'js/utils/navigation'], function($) {
                 });
 
                 it('ensures aria attributes are present', function() {
-                    expect(accordion.find('.chapter-content-container').first()).toHaveAttr({
-                        'aria-expanded': 'true'
-                    });
-
-                    expect(accordion.find('.chapter-content-container').last()).toHaveAttr({
-                        'aria-expanded': 'false'
-                    });
+                    expect(accordion.find('.button-chapter').first()).toHaveAttr('aria-expanded', 'true');
+                    expect(accordion.find('.button-chapter').last()).toHaveAttr('aria-expanded', 'false');
                 });
 
                 it('ensures only one active item', function() {
@@ -58,19 +50,17 @@ define(['jquery', 'js/utils/navigation'], function($) {
                 });
 
                 it('ensure proper aria and attrs', function() {
-                    expect(accordion.find('.chapter-content-container').first()).toHaveAttr({
-                        'aria-expanded': 'false'
-                    });
-                    expect(accordion.find('.chapter-content-container').last()).toHaveAttr({
-                        'aria-expanded': 'true'
-                    });
+                    accordion.find('.button-chapter').last().trigger('click');
+
+                    expect(accordion.find('.button-chapter').first()).toHaveAttr('aria-expanded', 'false');
+                    expect(accordion.find('.button-chapter').last()).toHaveAttr('aria-expanded', 'true');
                 });
             });
 
             describe('open section with spacebar', function() {
 
                 it('ensures new section is opened and previous section is closed', function() {
-                    accordion.find('.button-chapter').last().focus().trigger(keyPressEvent(this.KEY.SPACE)); // Spacebar
+                    accordion.find('.button-chapter').last().focus().trigger(keyPressEvent(this.KEY.SPACE));
 
                     expect(accordion.find('.chapter-content-container').first()).not.toHaveClass('is-open');
                     expect(accordion.find('.chapter-content-container').last()).toHaveClass('is-open');
@@ -80,12 +70,10 @@ define(['jquery', 'js/utils/navigation'], function($) {
                 });
 
                 it('ensure proper aria and attrs', function() {
-                    expect(accordion.find('.chapter-content-container').first()).toHaveAttr({
-                        'aria-expanded': 'false'
-                    });
-                    expect(accordion.find('.chapter-content-container').last()).toHaveAttr({
-                        'aria-expanded': 'true'
-                    });
+                    accordion.find('.button-chapter').last().focus().trigger(keyPressEvent(this.KEY.SPACE));
+
+                    expect(accordion.find('.button-chapter').first()).toHaveAttr('aria-expanded', 'false');
+                    expect(accordion.find('.button-chapter').last()).toHaveAttr('aria-expanded', 'true');
                 });
             });
         });