Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial check of removing feature flag (#13058)

Browse Source
This commit is contained in:
Kevin Kim
2016-07-22 09:28:19 -04:00
committed by Eric Fischer
parent b04a6a6a4b
commit 2fddd2bd71
10 changed files with 36 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lms/djangoapps/student_account/test/test_views.py
View File

@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
""" Tests for student account views. """
from copy import copy
import re
from unittest import skipUnless
from urllib import urlencode
@@ -462,9 +461,6 @@ class AccountSettingsViewTest(ThirdPartyAuthTestMixin, TestCase, ProgramsApiConf
'password',
'year_of_birth',
'preferred_language',
]
HIDDEN_FIELDS = [
'time_zone',
]
@@ -512,35 +508,15 @@ class AccountSettingsViewTest(ThirdPartyAuthTestMixin, TestCase, ProgramsApiConf
self.assertEqual(context['auth']['providers'][0]['name'], 'Facebook')
self.assertEqual(context['auth']['providers'][1]['name'], 'Google')
def test_hidden_fields_not_visible(self):
def test_view(self):
"""
Test that hidden fields are not visible when disabled.
Test that all fields are visible
"""
temp_features = copy(settings.FEATURES)
temp_features['ENABLE_TIME_ZONE_PREFERENCE'] = False
with self.settings(FEATURES=temp_features):
view_path = reverse('account_settings')
response = self.client.get(path=view_path)
view_path = reverse('account_settings')
response = self.client.get(path=view_path)
for attribute in self.FIELDS:
self.assertIn(attribute, response.content)
for attribute in self.HIDDEN_FIELDS:
self.assertIn('"%s": {"enabled": false' % (attribute), response.content)
def test_hidden_fields_are_visible(self):
"""
Test that hidden fields are visible when enabled.
"""
temp_features = copy(settings.FEATURES)
temp_features['ENABLE_TIME_ZONE_PREFERENCE'] = True
with self.settings(FEATURES=temp_features):
view_path = reverse('account_settings')
response = self.client.get(path=view_path)
for attribute in self.FIELDS:
self.assertIn(attribute, response.content)
for attribute in self.HIDDEN_FIELDS:
self.assertIn('"%s": {"enabled": true' % (attribute), response.content)
for attribute in self.FIELDS:
self.assertIn(attribute, response.content)
def test_header_with_programs_listing_enabled(self):
"""

1
lms/djangoapps/student_account/views.py
View File

@@ -454,7 +454,6 @@ def account_settings_context(request):
'options': all_languages(),
}, 'time_zone': {
'options': TIME_ZONE_CHOICES,
'enabled': settings.FEATURES.get('ENABLE_TIME_ZONE_PREFERENCE'),
}
},
'platform_name': get_themed_value('PLATFORM_NAME', settings.PLATFORM_NAME),