Pull Request comments addressed. Tests fixed.

common/djangoapps/student/tests/test_recent_enrollments.py

@@ -9,6 +9,7 @@ from opaque_keys.edx import locator
 from pytz import UTC
 import unittest
 import ddt
+from shoppingcart.models import DonationConfiguration
 
 from student.tests.factories import UserFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
@@ -124,7 +125,7 @@ class TestRecentEnrollments(ModuleStoreTestCase):
         self._configure_message_timeout(600)
         self.client.login(username=self.student.username, password=self.PASSWORD)
         response = self.client.get(reverse("dashboard"))
-        self.assertContains(response, "You have successfully enrolled in")
+        self.assertContains(response, "Thank you for enrolling in")
 
     @ddt.data(
         (['audit', 'honor', 'verified'], False),
@@ -139,6 +140,9 @@ class TestRecentEnrollments(ModuleStoreTestCase):
         # Enable the enrollment success message
         self._configure_message_timeout(10000)
 
+        # Enable donations
+        DonationConfiguration(enabled=True).save()
+
         # Create the course mode(s)
         for mode in course_modes:
             CourseModeFactory(mode_slug=mode, course_id=self.course.id)

lms/static/js/dashboard/donation.js

@@ -100,7 +100,7 @@ var edx = edx || {};
                 var html = _.template($("#donation-tpl").html(), {});
                 this.$el.html(html);
                 this.$amount = $("input[name=\"amount\"]", this.$el);
-                this.$submit = $("button[type=\"submit\"]", this.$el);
+                this.$submit = $(".action-donate", this.$el);
                 this.$errorMsg = $(".donation-error-msg", this.$el);
                 this.$paymentForm = $(".payment-form", this.$el);
                 this.$submit.click(this.donate);

lms/static/sass/multicourse/_dashboard.scss

@@ -1188,14 +1188,14 @@
           }
 
           .amount {
-            padding: $baseline ($baseline/2);
+            height: 40px;
             width: 80px;
             vertical-align: middle;
             text-align: left;
-            border: 2px;
+            border: 2px solid $white;
 
             &.validation-error {
-              border: 2px solid $pink;
+              border: 2px solid $error-color;
             }
           }
 

lms/templates/dashboard/donation.underscore

@@ -4,4 +4,4 @@
     <input class="amount" type="text" name="amount" value="25" />
     <button class="btn action-primary action-donate" type="submit" name="Donate"><%- gettext('Donate') %></button>
 </form>
-<form class="payment-form"></form>
\ No newline at end of file
+<form class="payment-form"></form>

lms/templates/enrollment/course_enrollment_message.html

@@ -16,11 +16,11 @@
                 </div>
             </div>
             % if course_msg["allow_donation"]:
-            <div class="nav-actions donate-actions">
-                <h3 class="sr">${_('Donation Actions')}</h3>
-                <div class="donate-container" data-course="${ course_msg['course_id'] }"></div>
-            </div>
+                <div class="nav-actions donate-actions">
+                    <h3 class="sr">${_('Donation Actions')}</h3>
+                    <div class="donate-container" data-course="${ course_msg['course_id'] }"></div>
+                </div>
             % endif
         </div>
     </div>
-% endfor
\ No newline at end of file
+% endfor