FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

change path to emailjson · devhttps/frontend@43d74c0 · GitHub

/ frontend Public
forked from guardian/frontend

Commit 43d74c0

Browse files
QuarpT
committed
change path to emailjson
1 parent 45c97fa commit 43d74c0

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎common/app/implicits/Requests.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ trait Requests {
2525

2626
def getRequestFormat: RequestFormat = if(isJson) JsonFormat else if (isEmail) EmailFormat else if(isAmp) AmpFormat else HtmlFormat
2727

28-
lazy val isJson: Boolean = r.getQueryString("callback").isDefined || (r.path.endsWith(".json") && !isEmailJson)
28+
lazy val isJson: Boolean = r.getQueryString("callback").isDefined || r.path.endsWith(".json")
2929

30-
lazy val isEmailJson: Boolean = r.path.endsWith(s"$EMAIL_SUFFIX.json")
30+
lazy val isEmailJson: Boolean = r.path.endsWith(".emailjson")
3131

3232
// parameters for moon/guui new rendering layer project.
3333
lazy val isGuuiJson: Boolean = isJson && isGuui

‎facia/conf/routes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ GET /*path/show-more/*id.json
3030
GET /rss controllers.FaciaController.renderRootFrontRss()
3131
GET /*path/rss controllers.FaciaController.renderFrontRss(path)
3232
GET /*path/lite.json controllers.FaciaController.renderFrontJsonLite(path)
33-
GET /*path/email.json controllers.FaciaController.renderFrontJson(path)
33+
GET /*path.emailjson controllers.FaciaController.renderFrontJson(path)
3434
GET /*path.json controllers.FaciaController.renderFrontJson(path)
3535
GET / controllers.FaciaController.rootEditionRedirect()
3636
GET /*path controllers.FaciaController.renderFront(path)

‎facia/test/FaciaControllerTest.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ import scala.concurrent.Await
189189
}
190190

191191
it should "render json email fronts" in {
192-
val emailRequest = FakeRequest("GET", "/email/uk/daily/email.json")
192+
val emailRequest = FakeRequest("GET", "/email/uk/daily.emailjson")
193193
val emailJsonResponse = faciaController.renderFront("email/uk/daily")(emailRequest)
194194
status(emailJsonResponse) shouldBe 200
195195
val jsonResponse = contentAsJson(emailJsonResponse)

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL