Commit eabd6c8d by Jonathan Piacenti Committed by E. Kolpakov

Quality check and test fixes.

parent fc4eed42
...@@ -1167,7 +1167,7 @@ class ContentStoreTest(ContentStoreTestCase): ...@@ -1167,7 +1167,7 @@ class ContentStoreTest(ContentStoreTestCase):
def test_course_index_view_with_no_courses(self): def test_course_index_view_with_no_courses(self):
"""Test viewing the index page with no courses""" """Test viewing the index page with no courses"""
# Create a course so there is something to view # Create a course so there is something to view
resp = self.client.get_html('/course/') resp = self.client.get_html('/home/')
self.assertContains( self.assertContains(
resp, resp,
'<h1 class="page-header">My Courses</h1>', '<h1 class="page-header">My Courses</h1>',
...@@ -1189,7 +1189,7 @@ class ContentStoreTest(ContentStoreTestCase): ...@@ -1189,7 +1189,7 @@ class ContentStoreTest(ContentStoreTestCase):
def test_course_index_view_with_course(self): def test_course_index_view_with_course(self):
"""Test viewing the index page with an existing course""" """Test viewing the index page with an existing course"""
CourseFactory.create(display_name='Robot Super Educational Course') CourseFactory.create(display_name='Robot Super Educational Course')
resp = self.client.get_html('/course/') resp = self.client.get_html('/home/')
self.assertContains( self.assertContains(
resp, resp,
'<h3 class="course-title">Robot Super Educational Course</h3>', '<h3 class="course-title">Robot Super Educational Course</h3>',
...@@ -1604,7 +1604,7 @@ class RerunCourseTest(ContentStoreTestCase): ...@@ -1604,7 +1604,7 @@ class RerunCourseTest(ContentStoreTestCase):
Asserts that the given course key is in the accessible course listing section of the html Asserts that the given course key is in the accessible course listing section of the html
and NOT in the unsucceeded course action section of the html. and NOT in the unsucceeded course action section of the html.
""" """
course_listing = lxml.html.fromstring(self.client.get_html('/course/').content) course_listing = lxml.html.fromstring(self.client.get_html('/home/').content)
self.assertEqual(len(self.get_course_listing_elements(course_listing, course_key)), 1) self.assertEqual(len(self.get_course_listing_elements(course_listing, course_key)), 1)
self.assertEqual(len(self.get_unsucceeded_course_action_elements(course_listing, course_key)), 0) self.assertEqual(len(self.get_unsucceeded_course_action_elements(course_listing, course_key)), 0)
...@@ -1613,7 +1613,7 @@ class RerunCourseTest(ContentStoreTestCase): ...@@ -1613,7 +1613,7 @@ class RerunCourseTest(ContentStoreTestCase):
Asserts that the given course key is in the unsucceeded course action section of the html Asserts that the given course key is in the unsucceeded course action section of the html
and NOT in the accessible course listing section of the html. and NOT in the accessible course listing section of the html.
""" """
course_listing = lxml.html.fromstring(self.client.get_html('/course/').content) course_listing = lxml.html.fromstring(self.client.get_html('/home/').content)
self.assertEqual(len(self.get_course_listing_elements(course_listing, course_key)), 0) self.assertEqual(len(self.get_course_listing_elements(course_listing, course_key)), 0)
self.assertEqual(len(self.get_unsucceeded_course_action_elements(course_listing, course_key)), 1) self.assertEqual(len(self.get_unsucceeded_course_action_elements(course_listing, course_key)), 1)
......
...@@ -44,9 +44,9 @@ class InternationalizationTest(ModuleStoreTestCase): ...@@ -44,9 +44,9 @@ class InternationalizationTest(ModuleStoreTestCase):
self.client = AjaxEnabledTestClient() self.client = AjaxEnabledTestClient()
self.client.login(username=self.uname, password=self.password) self.client.login(username=self.uname, password=self.password)
resp = self.client.get_html('/course/') resp = self.client.get_html('/home/')
self.assertContains(resp, self.assertContains(resp,
'<h1 class="page-header">My Courses</h1>', '<h1 class="page-header">Studio Home</h1>',
status_code=200, status_code=200,
html=True) html=True)
...@@ -56,13 +56,13 @@ class InternationalizationTest(ModuleStoreTestCase): ...@@ -56,13 +56,13 @@ class InternationalizationTest(ModuleStoreTestCase):
self.client.login(username=self.uname, password=self.password) self.client.login(username=self.uname, password=self.password)
resp = self.client.get_html( resp = self.client.get_html(
'/course/', '/home/',
{}, {},
HTTP_ACCEPT_LANGUAGE='en', HTTP_ACCEPT_LANGUAGE='en',
) )
self.assertContains(resp, self.assertContains(resp,
'<h1 class="page-header">My Courses</h1>', '<h1 class="page-header">Studio Home</h1>',
status_code=200, status_code=200,
html=True) html=True)
...@@ -81,7 +81,7 @@ class InternationalizationTest(ModuleStoreTestCase): ...@@ -81,7 +81,7 @@ class InternationalizationTest(ModuleStoreTestCase):
self.client.login(username=self.uname, password=self.password) self.client.login(username=self.uname, password=self.password)
resp = self.client.get_html( resp = self.client.get_html(
'/course/', '/home/',
{}, {},
HTTP_ACCEPT_LANGUAGE='eo' HTTP_ACCEPT_LANGUAGE='eo'
) )
......
...@@ -234,13 +234,13 @@ class AuthTestCase(ContentStoreTestCase): ...@@ -234,13 +234,13 @@ class AuthTestCase(ContentStoreTestCase):
def test_private_pages_auth(self): def test_private_pages_auth(self):
"""Make sure pages that do require login work.""" """Make sure pages that do require login work."""
auth_pages = ( auth_pages = (
'/course/', '/home/',
) )
# These are pages that should just load when the user is logged in # These are pages that should just load when the user is logged in
# (no data needed) # (no data needed)
simple_auth_pages = ( simple_auth_pages = (
'/course/', '/home/',
) )
# need an activated user # need an activated user
...@@ -266,7 +266,7 @@ class AuthTestCase(ContentStoreTestCase): ...@@ -266,7 +266,7 @@ class AuthTestCase(ContentStoreTestCase):
def test_index_auth(self): def test_index_auth(self):
# not logged in. Should return a redirect. # not logged in. Should return a redirect.
resp = self.client.get_html('/course/') resp = self.client.get_html('/home/')
self.assertEqual(resp.status_code, 302) self.assertEqual(resp.status_code, 302)
# Logged in should work. # Logged in should work.
...@@ -283,7 +283,7 @@ class AuthTestCase(ContentStoreTestCase): ...@@ -283,7 +283,7 @@ class AuthTestCase(ContentStoreTestCase):
self.login(self.email, self.pw) self.login(self.email, self.pw)
# make sure we can access courseware immediately # make sure we can access courseware immediately
course_url = '/course/' course_url = '/home/'
resp = self.client.get_html(course_url) resp = self.client.get_html(course_url)
self.assertEquals(resp.status_code, 200) self.assertEquals(resp.status_code, 200)
...@@ -293,7 +293,7 @@ class AuthTestCase(ContentStoreTestCase): ...@@ -293,7 +293,7 @@ class AuthTestCase(ContentStoreTestCase):
resp = self.client.get_html(course_url) resp = self.client.get_html(course_url)
# re-request, and we should get a redirect to login page # re-request, and we should get a redirect to login page
self.assertRedirects(resp, settings.LOGIN_REDIRECT_URL + '?next=/course/') self.assertRedirects(resp, settings.LOGIN_REDIRECT_URL + '?next=/home/')
class ForumTestCase(CourseTestCase): class ForumTestCase(CourseTestCase):
......
...@@ -66,6 +66,6 @@ def login_page(request): ...@@ -66,6 +66,6 @@ def login_page(request):
def howitworks(request): def howitworks(request):
"Proxy view" "Proxy view"
if request.user.is_authenticated(): if request.user.is_authenticated():
return redirect('/course/') return redirect('/home/')
else: else:
return render_to_response('howitworks.html', {}) return render_to_response('howitworks.html', {})
...@@ -42,7 +42,7 @@ class TestCourseIndex(CourseTestCase): ...@@ -42,7 +42,7 @@ class TestCourseIndex(CourseTestCase):
""" """
Test getting the list of courses and then pulling up their outlines Test getting the list of courses and then pulling up their outlines
""" """
index_url = '/course/' index_url = '/home/'
index_response = authed_client.get(index_url, {}, HTTP_ACCEPT='text/html') index_response = authed_client.get(index_url, {}, HTTP_ACCEPT='text/html')
parsed_html = lxml.html.fromstring(index_response.content) parsed_html = lxml.html.fromstring(index_response.content)
course_link_eles = parsed_html.find_class('course-link') course_link_eles = parsed_html.find_class('course-link')
...@@ -68,7 +68,7 @@ class TestCourseIndex(CourseTestCase): ...@@ -68,7 +68,7 @@ class TestCourseIndex(CourseTestCase):
# Add a library: # Add a library:
lib1 = LibraryFactory.create() lib1 = LibraryFactory.create()
index_url = '/course/' index_url = '/home/'
index_response = self.client.get(index_url, {}, HTTP_ACCEPT='text/html') index_response = self.client.get(index_url, {}, HTTP_ACCEPT='text/html')
parsed_html = lxml.html.fromstring(index_response.content) parsed_html = lxml.html.fromstring(index_response.content)
library_link_elements = parsed_html.find_class('library-link') library_link_elements = parsed_html.find_class('library-link')
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<%inherit file="base.html" /> <%inherit file="base.html" />
<%def name="online_help_token()"><% return "home" %></%def> <%def name="online_help_token()"><% return "home" %></%def>
<%block name="title">${_("My Courses")}</%block> <%block name="title">${_("Studio Home")}</%block>
<%block name="bodyclass">is-signedin index view-dashboard</%block> <%block name="bodyclass">is-signedin index view-dashboard</%block>
<%block name="requirejs"> <%block name="requirejs">
......
...@@ -482,7 +482,7 @@ class LoginOAuthTokenMixin(object): ...@@ -482,7 +482,7 @@ class LoginOAuthTokenMixin(object):
self._setup_user_response(success=True) self._setup_user_response(success=True)
response = self.client.post(self.url, {"access_token": "dummy"}) response = self.client.post(self.url, {"access_token": "dummy"})
self.assertEqual(response.status_code, 204) self.assertEqual(response.status_code, 204)
self.assertEqual(self.client.session['_auth_user_id'], self.user.id) self.assertEqual(self.client.session['_auth_user_id'], self.user.id) # pylint: disable=no-member
def test_invalid_token(self): def test_invalid_token(self):
self._setup_user_response(success=False) self._setup_user_response(success=False)
......
...@@ -246,6 +246,7 @@ class CombinedLoginAndRegisterPage(PageObject): ...@@ -246,6 +246,7 @@ class CombinedLoginAndRegisterPage(PageObject):
def wait_for_errors(self): def wait_for_errors(self):
"""Wait for errors to be visible, then return them. """ """Wait for errors to be visible, then return them. """
def _check_func(): def _check_func():
"""Return success status and any errors that occurred."""
errors = self.errors errors = self.errors
return (bool(errors), errors) return (bool(errors), errors)
return Promise(_check_func, "Errors are visible").fulfill() return Promise(_check_func, "Errors are visible").fulfill()
...@@ -259,6 +260,7 @@ class CombinedLoginAndRegisterPage(PageObject): ...@@ -259,6 +260,7 @@ class CombinedLoginAndRegisterPage(PageObject):
def wait_for_success(self): def wait_for_success(self):
"""Wait for a success message to be visible, then return it.""" """Wait for a success message to be visible, then return it."""
def _check_func(): def _check_func():
"""Return success status and any errors that occurred."""
success = self.success success = self.success
return (bool(success), success) return (bool(success), success)
return Promise(_check_func, "Success message is visible").fulfill() return Promise(_check_func, "Success message is visible").fulfill()
...@@ -119,7 +119,7 @@ class LoginFromCombinedPageTest(UniqueCourseTest): ...@@ -119,7 +119,7 @@ class LoginFromCombinedPageTest(UniqueCourseTest):
def test_password_reset_success(self): def test_password_reset_success(self):
# Create a user account # Create a user account
email, password = self._create_unique_user() email, password = self._create_unique_user() # pylint: disable=unused-variable
# Navigate to the password reset form and try to submit it # Navigate to the password reset form and try to submit it
self.login_page.visit().password_reset(email=email) self.login_page.visit().password_reset(email=email)
...@@ -141,6 +141,9 @@ class LoginFromCombinedPageTest(UniqueCourseTest): ...@@ -141,6 +141,9 @@ class LoginFromCombinedPageTest(UniqueCourseTest):
) )
def _create_unique_user(self): def _create_unique_user(self):
"""
Create a new user with a unique name and email.
"""
username = "test_{uuid}".format(uuid=self.unique_id[0:6]) username = "test_{uuid}".format(uuid=self.unique_id[0:6])
email = "{user}@example.com".format(user=username) email = "{user}@example.com".format(user=username)
password = "password" password = "password"
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
import os import os
import sys
BASEDIR = os.path.dirname(os.path.abspath(__file__)) BASEDIR = os.path.dirname(os.path.abspath(__file__))
......
import os import os
import unittest import unittest
from pavelib.prereqs import no_prereq_install from pavelib.prereqs import no_prereq_install
class TestPaverPrereqInstall(unittest.TestCase): class TestPaverPrereqInstall(unittest.TestCase):
"""
Test the status of the NO_PREREQ_INSTALL variable, its presence and how
paver handles it.
"""
def check_val(self, set_val, expected_val): def check_val(self, set_val, expected_val):
"""
Verify that setting the variable to a certain value returns
the expected boolean for it.
As environment variables are only stored as strings, we have to cast
whatever it's set at to a boolean that does not violate expectations.
"""
_orig_environ = dict(os.environ) _orig_environ = dict(os.environ)
os.environ['NO_PREREQ_INSTALL'] = set_val os.environ['NO_PREREQ_INSTALL'] = set_val
self.assertEqual( self.assertEqual(
...@@ -21,19 +30,37 @@ class TestPaverPrereqInstall(unittest.TestCase): ...@@ -21,19 +30,37 @@ class TestPaverPrereqInstall(unittest.TestCase):
os.environ.update(_orig_environ) os.environ.update(_orig_environ)
def test_no_prereq_install_true(self): def test_no_prereq_install_true(self):
"""
Ensure that 'true' will be True.
"""
self.check_val('true', True) self.check_val('true', True)
def test_no_prereq_install_false(self): def test_no_prereq_install_false(self):
"""
Ensure that 'false' will be False.
"""
self.check_val('false', False) self.check_val('false', False)
def test_no_prereq_install_True(self): def test_no_prereq_install_True(self):
"""
Ensure that 'True' will be True.
"""
self.check_val('True', True) self.check_val('True', True)
def test_no_prereq_install_False(self): def test_no_prereq_install_False(self):
"""
Ensure that 'False' will be False.
"""
self.check_val('False', False) self.check_val('False', False)
def test_no_prereq_install_0(self): def test_no_prereq_install_0(self):
"""
Ensure that '0' will be False.
"""
self.check_val('0', False) self.check_val('0', False)
def test_no_prereq_install_1(self): def test_no_prereq_install_1(self):
"""
Ensure that '1' will be True.
"""
self.check_val('1', True) self.check_val('1', True)
...@@ -41,7 +41,7 @@ def no_prereq_install(): ...@@ -41,7 +41,7 @@ def no_prereq_install():
try: try:
return vals[val] return vals[val]
except: except KeyError:
return False return False
......
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