From 62ea486570f748c61236a419f70f5e8c6718fadd Mon Sep 17 00:00:00 2001 From: arbisoft Date: Mon, 12 Jan 2015 15:55:06 +0500 Subject: [PATCH] ECOM-528 updated the test cases --- .../student/tests/test_recent_enrollments.py | 34 +++++-------------- common/djangoapps/student/views.py | 3 +- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/common/djangoapps/student/tests/test_recent_enrollments.py b/common/djangoapps/student/tests/test_recent_enrollments.py index f7511d12c5..618c378477 100644 --- a/common/djangoapps/student/tests/test_recent_enrollments.py +++ b/common/djangoapps/student/tests/test_recent_enrollments.py @@ -129,42 +129,24 @@ class TestRecentEnrollments(ModuleStoreTestCase): @ddt.data( #Register as an honor in any course modes with no payment option ([('audit', 0), ('honor', 0)], 'honor', True), - ([('audit', 0)], 'honor', True), ([('honor', 0)], 'honor', True), ([], 'honor', True), #Register as an honor in any course modes which has payment option - ([('audit', 0), ('honor', 10)], 'honor', False), - ([('audit', 10), ('honor', 0)], 'honor', False), - ([('professional', 20)], 'honor', True), - ([('verified', 20)], 'honor', True), - ([('professional', 20), ('verified', 20)], 'honor', True), - ([('audit', 0), ('honor', 5), ('professional', 20)], 'honor', True), - ([('audit', 0), ('honor', 10), ('verified', 20)], 'honor', True), - ([('audit', 10), ('honor', 0), ('verified', 20), ('professional', 20)], 'honor', True), - ([('audit', 10)], 'honor', False), - ([('honor', 10)], 'honor', False), + ([('honor', 10)], 'honor', False), # This is a paid course + ([('audit', 0), ('honor', 0), ('professional', 20)], 'honor', True), + ([('audit', 0), ('honor', 0), ('verified', 20)], 'honor', True), + ([('audit', 0), ('honor', 0), ('verified', 20), ('professional', 20)], 'honor', True), ([], 'honor', True), #Register as an audit in any course modes with no payment option ([('audit', 0), ('honor', 0)], 'audit', True), ([('audit', 0)], 'audit', True), - ([('honor', 0)], 'audit', True), - ([], 'audit', True), - #Register as an audit in any course modes which has payment option - ([('audit', 0), ('honor', 10)], 'audit', False), - ([('audit', 10), ('honor', 0)], 'audit', False), - ([('audit', 10)], 'audit', False), - ([('honor', 10)], 'audit', False), - ([], 'audit', True), + #Register as an audit in any course modes which has no payment option + ([('audit', 0), ('honor', 0), ('verified', 10)], 'audit', True), #Register as a verified in any course modes which has payment option - ([('audit', 0), ('honor', 10)], 'verified', False), - ([('professional', 20)], 'verified', False), + ([('professional', 20)], 'professional', False), ([('verified', 20)], 'verified', False), ([('professional', 20), ('verified', 20)], 'verified', False), - ([('audit', 0), ('honor', 5), ('professional', 20)], 'verified', False), - ([('audit', 0), ('honor', 10), ('verified', 20)], 'verified', False), - ([('audit', 0), ('honor', 10), ('verified', 20), ('professional', 20)], 'verified', False), - ([('audit', 10)], 'verified', False), - ([('honor', 10)], 'verified', False), + ([('audit', 0), ('honor', 0), ('verified', 20)], 'verified', False) ) @ddt.unpack def test_donate_button(self, course_modes, enrollment_mode, show_donate): diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index 959ba55675..af017129f5 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -760,8 +760,7 @@ def _allow_donation(course_modes, course_id, enrollment): """ donations_enabled = DonationConfiguration.current().enabled - return donations_enabled and enrollment.mode in course_modes[course_id] and \ - course_modes[course_id][enrollment.mode].min_price == 0 + return donations_enabled and enrollment.mode in course_modes[course_id] and course_modes[course_id][enrollment.mode].min_price == 0 def try_change_enrollment(request):