Merge pull request #4108 from edx/diana/update-choose-form

Revise course mode choose page.

common/templates/course_modes/choose.html

@@ -93,7 +93,7 @@ $(document).ready(function() {
               <%include file="_contribution.html" args="suggested_prices=suggested_prices, currency=currency, chosen_price=chosen_price, min_price=min_price"/>
 
               <div class="help-tip is-expandable">
-                <h5 class="title title-expand"><i class="icon-caret-down expandable-icon"></i> ${_("Why do I have to pay? What if I don't meet all the requirements?")}</h5>
+                <h5 class="title title-expand"><i class="icon-caret-down expandable-icon"></i> ${_("Why do I have to pay? What if I want a free honor code certificate?")}</h5>
 
                 <div class="copy expandable-area">
                   <dl class="list-faq">
@@ -110,18 +110,14 @@ $(document).ready(function() {
                     % if "honor" in modes:
                     <dt class="faq-question">${_("What if I can't afford it or don't have the necessary equipment?")}</dt>
                     <dd class="faq-answer">
-                      <p>${_("If you can't afford the minimum fee or don't meet the requirements, you can audit the course or elect to pursue an honor code certificate at no cost. If you would like to pursue the honor code certificate, please check the honor code certificate box, tell us why you can't pursue the verified certificate below, and then click the 'Select Certificate' button to complete your registration.")}</p>
+                    <p>${_("If you can't afford the minimum fee or don't meet the requirements, you can audit the course or elect to pursue an honor code certificate at no cost.")}
+                       ${_("If you would like to pursue the honor code certificate, please check the honor code certificate box and then click the 'Select Certificate' button to complete your registration.")}</p>
 
                       <ul class="list-fields">
                         <li class="field field-honor-code checkbox">
                           <input type="checkbox" name="honor-code" id="honor-code">
                           <label for="honor-code">${_("Select Honor Code Certificate")}</label>
                         </li>
-
-                        <li class="field field-explain">
-                          <label for="explain"><span class="sr">${_("Explain your situation: ")}</span>${_("Please write a few sentences about why you'd like to opt out of the paid verified certificate to pursue the honor code certificate:")}</label>
-                          <textarea name="explain"></textarea>
-                        </li>
                       </ul>
                     </dd>
                     % endif

lms/djangoapps/courseware/features/certificates.feature

@@ -71,7 +71,7 @@ Feature: LMS.Verified certificates
     Scenario: I can take a verified certificate course for free
         Given I am logged in
         And the course has an honor mode
-        When I give a reason why I cannot pay
+        When I select the honor code option
         Then I should see the course on my dashboard
         And a "edx.course.enrollment.activated" server event is emitted
 

lms/djangoapps/courseware/features/certificates.py

@@ -295,7 +295,7 @@ def edit_my_name(step):
     world.css_click(btn_css)
 
 
-@step(u'I give a reason why I cannot pay$')
+@step(u'I select the honor code option$')
 def give_a_reason_why_i_cannot_pay(step):
     register()
 
@@ -305,8 +305,5 @@ def give_a_reason_why_i_cannot_pay(step):
     cb_css = 'input#honor-code'
     world.css_click(cb_css)
 
-    text_css = 'li.field-explain textarea'
-    world.css_find(text_css).type('I cannot afford it.')
-
     btn_css = 'input[value="Select Certificate"]'
     world.css_click(btn_css)