Commit 4fd1ebce by Chris Rodriguez

Fixing test to match CSS

parent 9af7cb9b
...@@ -116,7 +116,7 @@ class LoginFromCombinedPageTest(UniqueCourseTest): ...@@ -116,7 +116,7 @@ class LoginFromCombinedPageTest(UniqueCourseTest):
self.login_page.visit().password_reset(email=email) self.login_page.visit().password_reset(email=email)
# Expect that we're shown a success message # Expect that we're shown a success message
self.assertIn("PASSWORD RESET EMAIL SENT", self.login_page.wait_for_success()) self.assertIn("Password Reset Email Sent", self.login_page.wait_for_success())
def test_password_reset_failure(self): def test_password_reset_failure(self):
# Navigate to the password reset form # Navigate to the password reset form
......
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
%> %>
<<<<<<< Updated upstream
=======
<%block name="bodyclass">view-incourse view-instructordash</%block>
>>>>>>> Stashed changes
## ----- Tips on adding something to the new instructor dashboard ----- ## ----- Tips on adding something to the new instructor dashboard -----
## 1. add your input element, e.g. in instructor_dashboard2/data_download.html ## 1. add your input element, e.g. in instructor_dashboard2/data_download.html
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment