From ccc392893e6c466d17ecd90ada4d3363551df822 Mon Sep 17 00:00:00 2001
From: Matjaz Gregoric <mtyaka@gmail.com>
Date: Wed, 17 Dec 2014 12:28:34 +0100
Subject: [PATCH] Update tests.

Most of the updates are related to the My Courses -> Studio Home change.
---
 cms/djangoapps/contentstore/features/common.py  |  2 +-
 cms/djangoapps/contentstore/features/courses.py |  8 ++++----
 .../contentstore/features/help.feature          |  2 +-
 .../contentstore/features/signup.feature        |  4 ++--
 cms/djangoapps/contentstore/features/signup.py  |  2 +-
 .../contentstore/tests/test_contentstore.py     |  3 +--
 .../js/mock/mock-index-page.underscore          | 17 +++++------------
 cms/templates/widgets/header.html               |  2 +-
 common/djangoapps/terrain/ui_helpers.py         |  2 +-
 common/test/acceptance/pages/studio/index.py    | 11 ++---------
 .../acceptance/tests/studio/test_studio_home.py | 10 ----------
 11 files changed, 19 insertions(+), 44 deletions(-)

diff --git a/cms/djangoapps/contentstore/features/common.py b/cms/djangoapps/contentstore/features/common.py
index 41c6b7cffd..692ec695ce 100644
--- a/cms/djangoapps/contentstore/features/common.py
+++ b/cms/djangoapps/contentstore/features/common.py
@@ -171,7 +171,7 @@ def log_into_studio(
     world.log_in(username=uname, password=password, email=email, name=name)
     # Navigate to the studio dashboard
     world.visit('/')
-    assert_in(uname, world.css_text('h2.title', timeout=10))
+    assert_in(uname, world.css_text('span.account-username', timeout=10))
 
 
 def add_course_author(user, course):
diff --git a/cms/djangoapps/contentstore/features/courses.py b/cms/djangoapps/contentstore/features/courses.py
index 7b3ccbcbd2..075d8525b5 100644
--- a/cms/djangoapps/contentstore/features/courses.py
+++ b/cms/djangoapps/contentstore/features/courses.py
@@ -33,8 +33,8 @@ def i_create_a_course(step):
     create_a_course()
 
 
-@step('I click the course link in My Courses$')
-def i_click_the_course_link_in_my_courses(step):
+@step('I click the course link in Studio Home$')
+def i_click_the_course_link_in_studio_home(step):
     course_css = 'a.course-link'
     world.css_click(course_css)
 
@@ -52,8 +52,8 @@ def courseware_page_has_loaded_in_studio(step):
     assert world.is_css_present(course_title_css)
 
 
-@step('I see the course listed in My Courses$')
-def i_see_the_course_in_my_courses(step):
+@step('I see the course listed in Studio Home$')
+def i_see_the_course_in_studio_home(step):
     course_css = 'h3.class-title'
     assert world.css_has_text(course_css, world.scenario_dict['COURSE'].display_name)
 
diff --git a/cms/djangoapps/contentstore/features/help.feature b/cms/djangoapps/contentstore/features/help.feature
index eb0f872247..567a2f2526 100644
--- a/cms/djangoapps/contentstore/features/help.feature
+++ b/cms/djangoapps/contentstore/features/help.feature
@@ -11,7 +11,7 @@ Feature: CMS.Help
     Scenario: Users can access online help within a course
         Given I have opened a new course in Studio
 
-        And I click the course link in My Courses
+        And I click the course link in Studio Home
         Then I should see online help for "outline"
 
         And I go to the course updates page
diff --git a/cms/djangoapps/contentstore/features/signup.feature b/cms/djangoapps/contentstore/features/signup.feature
index 1fe254adaa..0954551059 100644
--- a/cms/djangoapps/contentstore/features/signup.feature
+++ b/cms/djangoapps/contentstore/features/signup.feature
@@ -26,7 +26,7 @@ Feature: CMS.Sign in
     And I visit the url "/signin?next=http://www.google.com/"
     When I fill in and submit the signin form
     And I wait for "2" seconds
-    Then I should see that the path is "/course/"
+    Then I should see that the path is "/home/"
 
   Scenario: Login with mistyped credentials
     Given I have opened a new course in Studio
@@ -41,4 +41,4 @@ Feature: CMS.Sign in
     Then I should not see a login error message
     And I submit the signin form
     And I wait for "2" seconds
-    Then I should see that the path is "/course/"
+    Then I should see that the path is "/home/"
diff --git a/cms/djangoapps/contentstore/features/signup.py b/cms/djangoapps/contentstore/features/signup.py
index 014ff2eb69..b1c65edea5 100644
--- a/cms/djangoapps/contentstore/features/signup.py
+++ b/cms/djangoapps/contentstore/features/signup.py
@@ -25,7 +25,7 @@ def i_press_the_button_on_the_registration_form(step):
 
 @step('I should see an email verification prompt')
 def i_should_see_an_email_verification_prompt(step):
-    world.css_has_text('h1.page-header', u'My Courses')
+    world.css_has_text('h1.page-header', u'Studio Home')
     world.css_has_text('div.msg h3.title', u'We need to verify your email address')
 
 
diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py
index e0122f4cd9..a107d65449 100644
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -1166,11 +1166,10 @@ class ContentStoreTest(ContentStoreTestCase):
 
     def test_course_index_view_with_no_courses(self):
         """Test viewing the index page with no courses"""
-        # Create a course so there is something to view
         resp = self.client.get_html('/home/')
         self.assertContains(
             resp,
-            '<h1 class="page-header">My Courses</h1>',
+            '<h1 class="page-header">Studio Home</h1>',
             status_code=200,
             html=True
         )
diff --git a/cms/templates/js/mock/mock-index-page.underscore b/cms/templates/js/mock/mock-index-page.underscore
index af8c3e973e..0dffc7d244 100644
--- a/cms/templates/js/mock/mock-index-page.underscore
+++ b/cms/templates/js/mock/mock-index-page.underscore
@@ -1,6 +1,6 @@
 <div class="wrapper-mast wrapper">
   <header class="mast has-actions">
-    <h1 class="page-header">My Courses</h1>
+    <h1 class="page-header">Studio Home</h1>
     <nav class="nav-actions">
       <h3 class="sr">Page Actions</h3>
       <ul>
@@ -21,13 +21,6 @@
   <section class="content">
     <article class="content-primary" role="main">
 
-      <div class="introduction">
-        <h2 class="title">Welcome, user!</h2>
-        <div class="copy">
-          <p>Here are all of the courses you currently have access to in Studio:</p>
-        </div>
-      </div>
-
       <div class="wrapper-create-element wrapper-create-course">
         <form class="form-create create-course course-info" id="create-course-form" name="create-course-form">
           <div class="wrap-error">
@@ -106,14 +99,14 @@
                 <li class="field text required" id="field-organization">
                   <label for="new-library-org">Organization</label>
                   <input class="new-library-org" id="new-library-org" type="text" name="new-library-org" aria-required="true" placeholder="e.g. UniversityX or OrganizationX" />
-                  <span class="tip">The name of the organization sponsoring the library.  <strong>Note: This is part of your library URL, so no spaces or special characters are allowed.</strong> This cannot be changed.</span>
+                  <span class="tip">The public organization name for your library. This cannot be changed.</span>
                   <span class="tip tip-error is-hiding"></span>
                 </li>
 
                 <li class="field text required" id="field-library-number">
-                  <label for="new-library-number">Library Code/Number</label>
-                  <input class="new-library-number" id="new-library-number" type="text" name="new-library-number" aria-required="true" placeholder="e.g. CSPROB" />
-                  <span class="tip">The unique code that identifies this library. <strong>Note: This is part of your library URL, so no spaces or special characters are allowed and it cannot be changed.</strong></span>
+                  <label for="new-library-number">Major Version Number</label>
+                  <input class="new-library-number" id="new-library-number" type="text" name="new-library-number" aria-required="true" value="1" />
+                  <span class="tip">The <strong>major version number</strong> of your library. Minor revisions are tracked as edits happen within a library.</span>
                   <span class="tip tip-error is-hiding"></span>
                 </li>
               </ol>
diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html
index 31134059e8..b1d5d6b8d2 100644
--- a/cms/templates/widgets/header.html
+++ b/cms/templates/widgets/header.html
@@ -183,7 +183,7 @@
               <div class="nav-sub">
                 <ul>
                   <li class="nav-item nav-account-dashboard">
-                    <a href="/">${_("My Courses")}</a>
+                    <a href="/">${_("Studio Home")}</a>
                   </li>
                   <li class="nav-item nav-account-signout">
                     <a class="action action-signout" href="${reverse('logout')}">${_("Sign Out")}</a>
diff --git a/common/djangoapps/terrain/ui_helpers.py b/common/djangoapps/terrain/ui_helpers.py
index b26b311326..57e90820f8 100644
--- a/common/djangoapps/terrain/ui_helpers.py
+++ b/common/djangoapps/terrain/ui_helpers.py
@@ -48,7 +48,7 @@ REQUIREJS_WAIT = {
         "js/base", "js/models/course", "js/models/location", "js/models/section"],
 
     # Dashboard
-    re.compile('^My Courses \|'): [
+    re.compile('^Studio Home \|'): [
         "js/sock", "gettext", "js/base",
         "jquery.ui", "coffee/src/main", "underscore"],
 
diff --git a/common/test/acceptance/pages/studio/index.py b/common/test/acceptance/pages/studio/index.py
index aed9a5faae..2a69b43343 100644
--- a/common/test/acceptance/pages/studio/index.py
+++ b/common/test/acceptance/pages/studio/index.py
@@ -1,5 +1,5 @@
 """
-My Courses page in Studio
+Studio Home page
 """
 
 from bok_choy.page_object import PageObject
@@ -8,7 +8,7 @@ from . import BASE_URL
 
 class DashboardPage(PageObject):
     """
-    My Courses page in Studio
+    Studio Home page
     """
 
     url = BASE_URL + "/course/"
@@ -28,13 +28,6 @@ class DashboardPage(PageObject):
     def has_processing_courses(self):
         return self.q(css='.courses-processing').present
 
-    @property
-    def page_subheader(self):
-        """
-        Get the text of the introductory copy seen below the Welcome header. ("Here are all of...")
-        """
-        return self.q(css='.content-primary .introduction .copy p').first.text[0]
-
     def create_rerun(self, display_name):
         """
         Clicks the create rerun link of the course specified by display_name.
diff --git a/common/test/acceptance/tests/studio/test_studio_home.py b/common/test/acceptance/tests/studio/test_studio_home.py
index 9dc9b02497..6c20df9cfc 100644
--- a/common/test/acceptance/tests/studio/test_studio_home.py
+++ b/common/test/acceptance/tests/studio/test_studio_home.py
@@ -23,16 +23,6 @@ class CreateLibraryTest(WebAppTest):
         self.auth_page = AutoAuthPage(self.browser, staff=True)
         self.dashboard_page = DashboardPage(self.browser)
 
-    def test_subheader(self):
-        """
-        From the home page:
-            Verify that subheader is correct
-        """
-        self.auth_page.visit()
-        self.dashboard_page.visit()
-
-        self.assertIn("courses and libraries", self.dashboard_page.page_subheader)
-
     def test_create_library(self):
         """
         From the home page: