Merge pull request #12667 from edx/kkim/tz_pref_AS

Time Zone in Account Settings
2016-06-28 13:10:10 -04:00
parent 4911bf805f 059985b9ec
commit d0be769f1d
20 changed files with 227 additions and 77 deletions
--- a/common/test/acceptance/tests/lms/test_account_settings.py
+++ b/common/test/acceptance/tests/lms/test_account_settings.py
@@ -165,7 +165,8 @@ class AccountSettingsPageTest(AccountSettingsTestMixin, WebAppTest):
                    'Email Address',
                    'Password',
                    'Language',
-                    'Country or Region'
+                    'Country or Region',
+                    'Time Zone',
                ]
            },
            {