From 51976b0616c9710c5da48c0e64c213ccccb40212 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Tue, 28 Jul 2015 13:55:49 -0400 Subject: [PATCH 1/3] Minor improvements to learner profile tests --- .../acceptance/tests/lms/test_learner_profile.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/common/test/acceptance/tests/lms/test_learner_profile.py b/common/test/acceptance/tests/lms/test_learner_profile.py index 9f412495a2..61eab9ea32 100644 --- a/common/test/acceptance/tests/lms/test_learner_profile.py +++ b/common/test/acceptance/tests/lms/test_learner_profile.py @@ -159,10 +159,16 @@ class OwnLearnerProfilePageTest(LearnerProfileTestMixin, WebAppTest): """ Verify age limit messages for a user. """ - self.set_birth_year(birth_year=birth_year if birth_year is not None else "") + if birth_year: + self.set_birth_year(birth_year=birth_year) + else: + self.set_birth_year(birth_year="") profile_page = self.visit_profile_page(username) self.assertTrue(profile_page.privacy_field_visible) - self.assertEqual(profile_page.age_limit_message_present, message is not None) + if message: + self.assertTrue(profile_page.age_limit_message_present) + else: + self.assertFalse(profile_page.age_limit_message_present) self.assertIn(message, profile_page.profile_forced_private_message) def test_profile_defaults_to_public(self): @@ -245,7 +251,7 @@ class OwnLearnerProfilePageTest(LearnerProfileTestMixin, WebAppTest): dashboard_page = DashboardPage(self.browser) dashboard_page.visit() dashboard_page.click_username_dropdown() - self.assertTrue('Profile' in dashboard_page.username_dropdown_link_text) + self.assertIn('Profile', dashboard_page.username_dropdown_link_text) dashboard_page.click_my_profile_link() my_profile_page = LearnerProfilePage(self.browser, username) my_profile_page.wait_for_page() From 55006037421df22cc8c06d74ab035140e1959e6d Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Tue, 28 Jul 2015 13:59:04 -0400 Subject: [PATCH 2/3] assertTrue should be assertEqual --- common/test/acceptance/tests/lms/test_learner_profile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/test/acceptance/tests/lms/test_learner_profile.py b/common/test/acceptance/tests/lms/test_learner_profile.py index 61eab9ea32..ebf7a8f97e 100644 --- a/common/test/acceptance/tests/lms/test_learner_profile.py +++ b/common/test/acceptance/tests/lms/test_learner_profile.py @@ -337,7 +337,7 @@ class OwnLearnerProfilePageTest(LearnerProfileTestMixin, WebAppTest): self._test_dropdown_field(profile_page, 'country', 'Pakistan', 'Pakistan', 'display') profile_page.make_field_editable('country') - self.assertTrue(profile_page.mode_for_field('country'), 'edit') + self.assertEqual(profile_page.mode_for_field('country'), 'edit') self.assertTrue(profile_page.field_icon_present('country')) From 263bcaf2fc60a5cf46bddc4e1d4763ef6b95ae08 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Tue, 28 Jul 2015 16:47:03 -0400 Subject: [PATCH 3/3] Simplify birth_year variable --- common/test/acceptance/tests/lms/test_learner_profile.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/test/acceptance/tests/lms/test_learner_profile.py b/common/test/acceptance/tests/lms/test_learner_profile.py index ebf7a8f97e..e59920c762 100644 --- a/common/test/acceptance/tests/lms/test_learner_profile.py +++ b/common/test/acceptance/tests/lms/test_learner_profile.py @@ -159,10 +159,9 @@ class OwnLearnerProfilePageTest(LearnerProfileTestMixin, WebAppTest): """ Verify age limit messages for a user. """ - if birth_year: - self.set_birth_year(birth_year=birth_year) - else: - self.set_birth_year(birth_year="") + if birth_year is None: + birth_year = "" + self.set_birth_year(birth_year=birth_year) profile_page = self.visit_profile_page(username) self.assertTrue(profile_page.privacy_field_visible) if message: