Skip to content

Commit 82f574e

Browse files
Lunyachekarsentur
andauthored
feat: Replace Twitter with X (#36524)
* feat: Replace Twitter with X --------- Co-authored-by: Turchanikov Arsen <[email protected]>
1 parent c8e6a76 commit 82f574e

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

lms/envs/common.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2858,10 +2858,10 @@
28582858
'url_stub': 'facebook.com/',
28592859
'example': 'https://www.facebook.com/username'
28602860
},
2861-
'twitter': {
2862-
'display_name': 'Twitter',
2863-
'url_stub': 'twitter.com/',
2864-
'example': 'https://www.twitter.com/username'
2861+
'x': {
2862+
'display_name': 'X',
2863+
'url_stub': 'x.com/',
2864+
'example': 'https://www.x.com/username'
28652865
},
28662866
'linkedin': {
28672867
'display_name': 'LinkedIn',

openedx/core/djangoapps/user_api/accounts/serializers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ class Meta:
9999

100100
def validate_platform(self, platform):
101101
"""
102-
Validate that the platform value is one of (facebook, twitter or linkedin)
102+
Validate that the platform value is one of (facebook, x or linkedin)
103103
"""
104-
valid_platforms = ["facebook", "twitter", "linkedin"]
104+
valid_platforms = ["facebook", "x", "linkedin"]
105105
if platform not in valid_platforms:
106106
raise serializers.ValidationError(
107-
"The social platform must be facebook, twitter or linkedin"
107+
"The social platform must be facebook, x or linkedin"
108108
)
109109
return platform
110110

openedx/core/djangoapps/user_api/accounts/tests/test_api.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def test_set_single_social_link(self):
187187
def test_set_multiple_social_links(self):
188188
social_links = [
189189
dict(platform="facebook", social_link=f"https://www.facebook.com/{self.user.username}"),
190-
dict(platform="twitter", social_link=f"https://www.twitter.com/{self.user.username}"),
190+
dict(platform="x", social_link=f"https://www.x.com/{self.user.username}"),
191191
]
192192
update_account_settings(self.user, {"social_links": social_links})
193193
account_settings = get_account_settings(self.default_request)[0]
@@ -200,7 +200,7 @@ def test_add_social_links(self):
200200
update_account_settings(self.user, {"social_links": original_social_links})
201201

202202
extra_social_links = [
203-
dict(platform="twitter", social_link=f"https://www.twitter.com/{self.user.username}"),
203+
dict(platform="x", social_link=f"https://www.x.com/{self.user.username}"),
204204
dict(platform="linkedin", social_link=f"https://www.linkedin.com/in/{self.user.username}"),
205205
]
206206
update_account_settings(self.user, {"social_links": extra_social_links})
@@ -211,25 +211,25 @@ def test_add_social_links(self):
211211

212212
def test_replace_social_links(self):
213213
original_facebook_link = dict(platform="facebook", social_link="https://www.facebook.com/myself")
214-
original_twitter_link = dict(platform="twitter", social_link="https://www.twitter.com/myself")
215-
update_account_settings(self.user, {"social_links": [original_facebook_link, original_twitter_link]})
214+
original_x_link = dict(platform="x", social_link="https://www.x.com/myself")
215+
update_account_settings(self.user, {"social_links": [original_facebook_link, original_x_link]})
216216

217217
modified_facebook_link = dict(platform="facebook", social_link="https://www.facebook.com/new_me")
218218
update_account_settings(self.user, {"social_links": [modified_facebook_link]})
219219

220220
account_settings = get_account_settings(self.default_request)[0]
221-
assert account_settings['social_links'] == [modified_facebook_link, original_twitter_link]
221+
assert account_settings['social_links'] == [modified_facebook_link, original_x_link]
222222

223223
def test_remove_social_link(self):
224224
original_facebook_link = dict(platform="facebook", social_link="https://www.facebook.com/myself")
225-
original_twitter_link = dict(platform="twitter", social_link="https://www.twitter.com/myself")
226-
update_account_settings(self.user, {"social_links": [original_facebook_link, original_twitter_link]})
225+
original_x_link = dict(platform="x", social_link="https://www.x.com/myself")
226+
update_account_settings(self.user, {"social_links": [original_facebook_link, original_x_link]})
227227

228228
removed_facebook_link = dict(platform="facebook", social_link="")
229229
update_account_settings(self.user, {"social_links": [removed_facebook_link]})
230230

231231
account_settings = get_account_settings(self.default_request)[0]
232-
assert account_settings['social_links'] == [original_twitter_link]
232+
assert account_settings['social_links'] == [original_x_link]
233233

234234
def test_unsupported_social_link_platform(self):
235235
social_links = [

openedx/core/djangoapps/user_api/accounts/tests/test_utils.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ def validate_social_link(self, social_platform, link):
4040
('facebook', 'facebook.com/edX/', 'https://www.facebook.com/edX', True),
4141
('facebook', 'HTTP://facebook.com/edX/', 'https://www.facebook.com/edX', True),
4242
('facebook', 'www.evilwebsite.com/123', None, False),
43-
('twitter', 'https://www.twiter.com/edX/', None, False),
44-
('twitter', 'https://www.twitter.com/edX/123s', None, False),
45-
('twitter', 'twitter.com/edX', 'https://www.twitter.com/edX', True),
46-
('twitter', 'twitter.com/edX?foo=bar', 'https://www.twitter.com/edX?foo=bar', True),
47-
('twitter', 'twitter.com/test.user', 'https://www.twitter.com/test.user', True),
43+
('x', 'https://www.x.com/edX/', 'https://www.x.com/edX', True),
44+
('x', 'https://www.x.com/edX/123s', None, False),
45+
('x', 'x.com/edX', 'https://www.x.com/edX', True),
46+
('x', 'x.com/edX?foo=bar', 'https://www.x.com/edX?foo=bar', True),
47+
('x', 'x.com/test.user', 'https://www.x.com/test.user', True),
4848
('linkedin', 'www.linkedin.com/harryrein', None, False),
4949
('linkedin', 'www.linkedin.com/in/harryrein-1234', 'https://www.linkedin.com/in/harryrein-1234', True),
5050
('linkedin', 'www.evilwebsite.com/123?www.linkedin.com/edX', None, False),

0 commit comments

Comments
 (0)