From 36afbfbdde250bbc2a982a604d6626e3e4827f52 Mon Sep 17 00:00:00 2001
From: Ben McMorran <ben.mcmorran@gmail.com>
Date: Mon, 4 Aug 2014 11:10:05 -0400
Subject: [PATCH] Add test for expand collapse while editing name

---
 common/test/acceptance/pages/studio/overview.py |  8 ++++++++
 .../acceptance/tests/test_studio_outline.py     | 17 +++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/common/test/acceptance/pages/studio/overview.py b/common/test/acceptance/pages/studio/overview.py
index 6c8e4f8116..cea0fe1f73 100644
--- a/common/test/acceptance/pages/studio/overview.py
+++ b/common/test/acceptance/pages/studio/overview.py
@@ -7,6 +7,7 @@ from bok_choy.page_object import PageObject
 from bok_choy.promise import EmptyPromise
 
 from selenium.webdriver.support.ui import Select
+from selenium.webdriver.common.keys import Keys
 
 from .course_page import CoursePage
 from .container import ContainerPage
@@ -91,6 +92,13 @@ class CourseOutlineItem(object):
         set_input_value_and_save(self, self._bounded_selector(self.NAME_INPUT_SELECTOR), new_name)
         self.wait_for_ajax()
 
+    def finalize_name(self):
+        """
+        Presses ENTER, saving the value of the display name for this item.
+        """
+        self.q(css=self._bounded_selector(self.NAME_INPUT_SELECTOR)).results[0].send_keys(Keys.ENTER)
+        self.wait_for_ajax()
+
     def in_editable_form(self):
         """
         Return whether this outline item's display name is in its editable form.
diff --git a/common/test/acceptance/tests/test_studio_outline.py b/common/test/acceptance/tests/test_studio_outline.py
index 393f6f3cec..46d8d5f40e 100644
--- a/common/test/acceptance/tests/test_studio_outline.py
+++ b/common/test/acceptance/tests/test_studio_outline.py
@@ -470,20 +470,25 @@ class EditNamesTest(CourseOutlineTest):
         """
         Scenario: A section stays in the same expand/collapse state while its name is edited
             Given that I have created a section
-            And the section is expanded
+            And the section is collapsed
             When I click on the name of the section
-            Then the section is expanded
+            Then the section is collapsed
             And given that I have entered a new name
-            Then the section is expanded
+            Then the section is collapsed
+            And given that I press ENTER to finalize the name
+            Then the section is collapsed
         """
         self.course_outline_page.visit()
+        self.course_outline_page.section_at(0).toggle_expand()
         self.assertFalse(self.course_outline_page.section_at(0).in_editable_form())
-        self.assertFalse(self.course_outline_page.section_at(0).is_collapsed)
+        self.assertTrue(self.course_outline_page.section_at(0).is_collapsed)
         self.course_outline_page.section_at(0).edit_name()
         self.assertTrue(self.course_outline_page.section_at(0).in_editable_form())
-        self.assertFalse(self.course_outline_page.section_at(0).is_collapsed)
+        self.assertTrue(self.course_outline_page.section_at(0).is_collapsed)
         self.course_outline_page.section_at(0).enter_name('Changed')
-        self.assertFalse(self.course_outline_page.section_at(0).is_collapsed)
+        self.assertTrue(self.course_outline_page.section_at(0).is_collapsed)
+        self.course_outline_page.section_at(0).finalize_name()
+        self.assertTrue(self.course_outline_page.section_at(0).is_collapsed)
 
 
 class CreateSectionsTest(CourseOutlineTest):