Skip to content

Commit

Permalink
Extend 126beta WNP to 127beta [fix #14435]
Browse files Browse the repository at this point in the history
  • Loading branch information
craigcook authored and alexgibson committed May 13, 2024
1 parent b1d5f85 commit 9023d5e
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 3 deletions.
44 changes: 42 additions & 2 deletions bedrock/firefox/tests/test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ def test_fx_dev_browser_102_0_a2_whatsnew_mdnplus(self, render_mock):

# end dev edition whatsnew tests

# begin beta whatsnew tests
# begin 126 beta whatsnew tests

@override_settings(DEV=True)
def test_fx_126_0_0beta_en_US(self, render_mock):
Expand Down Expand Up @@ -421,7 +421,47 @@ def test_fx_126_0_0beta_pl(self, render_mock):
template = render_mock.call_args[0][1]
assert template == ["firefox/whatsnew/index.html"]

# end beta whatsnew tests
# end 126 beta whatsnew tests

# begin 127 beta whatsnew tests

@override_settings(DEV=True)
def test_fx_127_0_0beta_en_US(self, render_mock):
"""Should use whatsnew-fx126beta-en-US template for en-US locale"""
req = self.rf.get("/firefox/whatsnew/")
req.locale = "en-US"
self.view(req, version="127.0beta")
template = render_mock.call_args[0][1]
assert template == ["firefox/whatsnew/whatsnew-fx126beta-en-US.html"]

@override_settings(DEV=True)
def test_fx_127_0_0beta_en_CA(self, render_mock):
"""Should use whatsnew-fx126beta-en-CA template for en-CA locale"""
req = self.rf.get("/firefox/whatsnew/")
req.locale = "en-CA"
self.view(req, version="127.0beta")
template = render_mock.call_args[0][1]
assert template == ["firefox/whatsnew/whatsnew-fx126beta-en-CA.html"]

@override_settings(DEV=True)
def test_fx_127_0_0beta_de(self, render_mock):
"""Should use whatsnew-fx126beta-de template for de locale"""
req = self.rf.get("/firefox/whatsnew/")
req.locale = "de"
self.view(req, version="127.0beta")
template = render_mock.call_args[0][1]
assert template == ["firefox/whatsnew/whatsnew-fx126beta-de.html"]

@override_settings(DEV=True)
def test_fx_127_0_0beta_pl(self, render_mock):
"""Should use default template for pl locale"""
req = self.rf.get("/firefox/whatsnew/")
req.locale = "pl"
self.view(req, version="127.0beta")
template = render_mock.call_args[0][1]
assert template == ["firefox/whatsnew/index.html"]

# end 127 beta whatsnew tests

@override_settings(DEV=True)
def test_rv_prefix(self, render_mock):
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ def get_template_names(self):
else:
template = "firefox/whatsnew/index.html"
elif channel == "beta":
if version.startswith("126."):
if version.startswith("126.") or version.startswith("127."):
if locale.startswith("en-"):
if locale == "en-GB" or country == "GB":
template = "firefox/whatsnew/whatsnew-fx126beta-en-GB.html"
Expand Down

0 comments on commit 9023d5e

Please sign in to comment.