From e65bd71a1178312385d0338b85d46d7f7ad29006 Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Sat, 29 Nov 2014 11:21:45 -0500 Subject: [PATCH 1/2] fix blank lines --- .../instructor/tests/views/test_instructor_dashboard.py | 2 +- lms/djangoapps/shoppingcart/tests/test_views.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py b/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py index 60adb472ae..545a7b6c28 100644 --- a/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py +++ b/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py @@ -15,6 +15,7 @@ from shoppingcart.models import PaidCourseRegistration from course_modes.models import CourseMode from student.roles import CourseFinanceAdminRole + class TestInstructorDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase): """ Tests for the instructor dashboard (not legacy). @@ -77,7 +78,6 @@ class TestInstructorDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase): response = self.client.get(self.url) self.assertTrue('{currency}{amount}'.format(currency='Rs', amount=total_amount) in response.content) - @patch.dict(settings.FEATURES, {'DISPLAY_ANALYTICS_ENROLLMENTS': False}) @override_settings(ANALYTICS_DASHBOARD_URL='') def test_no_enrollments(self): diff --git a/lms/djangoapps/shoppingcart/tests/test_views.py b/lms/djangoapps/shoppingcart/tests/test_views.py index 923bd98057..f61080981f 100644 --- a/lms/djangoapps/shoppingcart/tests/test_views.py +++ b/lms/djangoapps/shoppingcart/tests/test_views.py @@ -157,7 +157,6 @@ class ShoppingCartViewsTests(ModuleStoreTestCase): self.assertEqual(context['currency'], 'usd') self.assertEqual(context['currency_symbol'], '$') - data = {'company_name': 'Test Company', 'company_contact_name': 'JohnDoe', 'company_contact_email': 'john@est.com', 'recipient_name': 'Mocker', 'recipient_email': 'mock@germ.com', 'company_address_line_1': 'DC Street # 1', From 6dea98f8f6e0f1ae547b503f4048c3c39772cd62 Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Sat, 29 Nov 2014 09:51:40 -0500 Subject: [PATCH 2/2] In microsites, don't redirect logged in users with enrollments to dashboard --- lms/djangoapps/branding/views.py | 7 +++---- lms/djangoapps/courseware/tests/test_microsites.py | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lms/djangoapps/branding/views.py b/lms/djangoapps/branding/views.py index 249c581070..667ab7a9e0 100644 --- a/lms/djangoapps/branding/views.py +++ b/lms/djangoapps/branding/views.py @@ -45,10 +45,9 @@ def index(request): # In this case, we want to have the user stay on a course catalog # page to make it easier to browse for courses (and register) if microsite.get_value( - 'ALWAYS_REDIRECT_HOMEPAGE_TO_DASHBOARD_FOR_AUTHENTICATED_USER', - settings.FEATURES.get('ALWAYS_REDIRECT_HOMEPAGE_TO_DASHBOARD_FOR_AUTHENTICATED_USER', True) - ) or get_course_enrollments(request.user): - + 'ALWAYS_REDIRECT_HOMEPAGE_TO_DASHBOARD_FOR_AUTHENTICATED_USER', + settings.FEATURES.get('ALWAYS_REDIRECT_HOMEPAGE_TO_DASHBOARD_FOR_AUTHENTICATED_USER', True) + ): return redirect(reverse('dashboard')) if settings.FEATURES.get('AUTH_USE_CERTIFICATES'): diff --git a/lms/djangoapps/courseware/tests/test_microsites.py b/lms/djangoapps/courseware/tests/test_microsites.py index baa872f902..633c7b9d7f 100644 --- a/lms/djangoapps/courseware/tests/test_microsites.py +++ b/lms/djangoapps/courseware/tests/test_microsites.py @@ -142,9 +142,9 @@ class TestMicrosites(ModuleStoreTestCase, LoginEnrollmentTestCase): resp = self.client.get(reverse('root'), HTTP_HOST=settings.MICROSITE_TEST_HOSTNAME) self.assertEquals(resp.status_code, 200) - def test_redirect_on_homepage_when_has_enrollments(self): + def test_no_redirect_on_homepage_when_has_enrollments(self): """ - Verify that a user going to homepage will redirect to dashboard if he/she has + Verify that a user going to homepage will not redirect to dashboard if he/she has a course enrollment """ self.setup_users() @@ -154,7 +154,7 @@ class TestMicrosites(ModuleStoreTestCase, LoginEnrollmentTestCase): self.enroll(self.course, True) resp = self.client.get(reverse('root'), HTTP_HOST=settings.MICROSITE_TEST_HOSTNAME) - self.assertEquals(resp.status_code, 302) + self.assertEquals(resp.status_code, 200) def test_microsite_course_enrollment(self): """