@messages("repairsAndFittingOut.p1")
+ @govukRadios(ngrRadio) + @saveAndContinueButton(msg = messages("service.continue"), isStartButton = false) + } +} \ No newline at end of file diff --git a/conf/app.routes b/conf/app.routes index 98becfe..4a811eb 100644 --- a/conf/app.routes +++ b/conf/app.routes @@ -130,7 +130,6 @@ POST /does-rent-include-parking-spaces-or-garages uk.gov.hmrc.n GET /does-rent-include-parking-spaces-or-garages/change uk.gov.hmrc.ngrraldfrontend.controllers.DoesYourRentIncludeParkingController.show(mode: Mode = CheckMode) POST /does-rent-include-parking-spaces-or-garages/change uk.gov.hmrc.ngrraldfrontend.controllers.DoesYourRentIncludeParkingController.submit(mode: Mode = CheckMode) - #How many parking spaces or garages included in rent GET /how-many-parking-spaces-or-garages-included-in-rent uk.gov.hmrc.ngrraldfrontend.controllers.HowManyParkingSpacesOrGaragesIncludedInRentController.show(mode: Mode = NormalMode) POST /how-many-parking-spaces-or-garages-included-in-rent uk.gov.hmrc.ngrraldfrontend.controllers.HowManyParkingSpacesOrGaragesIncludedInRentController.submit(mode: Mode = NormalMode) @@ -174,7 +173,12 @@ GET /rent-review/change uk.gov.hmrc.ngrraldfron POST /rent-review/change uk.gov.hmrc.ngrraldfrontend.controllers.RentReviewController.submit(mode: Mode = CheckMode) #Rent review +GET /repairs-and-fitting-out uk.gov.hmrc.ngrraldfrontend.controllers.RepairsAndFittingOutController.show(mode: Mode = NormalMode) +POST /repairs-and-fitting-out uk.gov.hmrc.ngrraldfrontend.controllers.RepairsAndFittingOutController.submit(mode: Mode = NormalMode) +GET /repairs-and-fitting-out/change uk.gov.hmrc.ngrraldfrontend.controllers.RepairsAndFittingOutController.show(mode: Mode = CheckMode) +POST /repairs-and-fitting-out/change uk.gov.hmrc.ngrraldfrontend.controllers.RepairsAndFittingOutController.submit(mode: Mode = CheckMode) + GET /how-much-was-the-lump-sum uk.gov.hmrc.ngrraldfrontend.controllers.HowMuchWasTheLumpSumController.show(mode: Mode = NormalMode) POST /how-much-was-the-lump-sum uk.gov.hmrc.ngrraldfrontend.controllers.HowMuchWasTheLumpSumController.submit(mode: Mode = NormalMode) GET /how-much-was-the-lump-sum/change uk.gov.hmrc.ngrraldfrontend.controllers.HowMuchWasTheLumpSumController.show(mode: Mode = CheckMode) -POST /how-much-was-the-lump-sum/change uk.gov.hmrc.ngrraldfrontend.controllers.HowMuchWasTheLumpSumController.submit(mode: Mode = CheckMode) \ No newline at end of file +POST /how-much-was-the-lump-sum/change uk.gov.hmrc.ngrraldfrontend.controllers.HowMuchWasTheLumpSumController.submit(mode: Mode = CheckMode) diff --git a/conf/messages b/conf/messages index 3bf9e41..09656ed 100644 --- a/conf/messages +++ b/conf/messages @@ -414,6 +414,12 @@ rentReview.rentReviewMonthsYears.months.maximum.11.error = The number of months rentReview.rentReviewMonthsYears.years.invalid.error = The number of years for how often your rent is reviewed must be a number, like 2 rentReview.rentReviewMonthsYears.years.maximum.1000.error = How often your rent is reviewed must be 1,000 years or less +#Repairs and fitting out +repairsAndFittingOut.title = Repairs and fitting out +repairsAndFittingOut.header = Have you done any repairs or fitting out in the property? +repairsAndFittingOut.p1 = Repairs are when you fix things like poor electrical wiring, leaking windows or a broken toilet. Fitting out is when you install things like air conditioning, a kitchen or carpeting. +repairsAndFittingOut.empty.error = Select yes if you have done any repairs of fitting out in the property + #How much was the lump sum howMuchWasTheLumpSum.title = How much was the lump sum? howMuchWasTheLumpSum.empty.error = Enter the lump sum, in pounds diff --git a/test/uk/gov/hmrc/ngrraldfrontend/controllers/ConfirmBreakClauseControllerSpec.scala b/test/uk/gov/hmrc/ngrraldfrontend/controllers/ConfirmBreakClauseControllerSpec.scala index a017e1e..50be1a8 100644 --- a/test/uk/gov/hmrc/ngrraldfrontend/controllers/ConfirmBreakClauseControllerSpec.scala +++ b/test/uk/gov/hmrc/ngrraldfrontend/controllers/ConfirmBreakClauseControllerSpec.scala @@ -49,6 +49,14 @@ class ConfirmBreakClauseControllerSpec extends ControllerSpecSupport { val content = contentAsString(result) content must include(pageTitle) } + "return OK and the correct view with prepopulated data" in { + val result = controllerProperty(confirmBreakClauseAnswers).show(NormalMode)(authenticatedFakeRequest) + status(result) mustBe OK + val content = contentAsString(result) + val document = Jsoup.parse(content) + document.select("input[type=radio][name=confirmBreakClause-radio-value][value=true]").hasAttr("checked") mustBe true + document.select("input[type=radio][name=confirmBreakClause-radio-value][value=false]").hasAttr("checked") mustBe false + } "Return NotFoundException when property is not found in the mongo" in { when(mockNGRConnector.getLinkedProperty(any[CredId])(any())).thenReturn(Future.successful(None)) val exception = intercept[NotFoundException] { diff --git a/test/uk/gov/hmrc/ngrraldfrontend/controllers/RepairsAndFittingOutControllerSpec.scala b/test/uk/gov/hmrc/ngrraldfrontend/controllers/RepairsAndFittingOutControllerSpec.scala new file mode 100644 index 0000000..d67258f --- /dev/null +++ b/test/uk/gov/hmrc/ngrraldfrontend/controllers/RepairsAndFittingOutControllerSpec.scala @@ -0,0 +1,123 @@ +/* + * Copyright 2025 HM Revenue & Customs + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package uk.gov.hmrc.ngrraldfrontend.controllers + +import org.jsoup.Jsoup +import org.mockito.ArgumentMatchers.any +import org.mockito.Mockito.when +import play.api.http.Status.{BAD_REQUEST, OK, SEE_OTHER} +import play.api.test.FakeRequest +import play.api.test.Helpers.{await, contentAsString, defaultAwaitTimeout, redirectLocation, status} +import uk.gov.hmrc.auth.core.Nino +import uk.gov.hmrc.http.{HeaderNames, NotFoundException} +import uk.gov.hmrc.ngrraldfrontend.helpers.ControllerSpecSupport +import uk.gov.hmrc.ngrraldfrontend.models.AgreementType.NewAgreement +import uk.gov.hmrc.ngrraldfrontend.models.registration.CredId +import uk.gov.hmrc.ngrraldfrontend.models.{AuthenticatedUserRequest, NormalMode, UserAnswers} +import uk.gov.hmrc.ngrraldfrontend.pages.{RepairsAndFittingOutPage, DoesYourRentIncludeParkingPage} +import uk.gov.hmrc.ngrraldfrontend.views.html.RepairsAndFittingOutView + +import scala.concurrent.Future + +class RepairsAndFittingOutControllerSpec extends ControllerSpecSupport { + val pageTitle = "Repairs and fitting out" + val view: RepairsAndFittingOutView = inject[RepairsAndFittingOutView] + val controllerNoProperty: RepairsAndFittingOutController = new RepairsAndFittingOutController(view, fakeAuth, fakeData(None), mockSessionRepository, mockNavigator, mcc)(mockConfig, ec) + val controllerProperty: Option[UserAnswers] => RepairsAndFittingOutController = answers => new RepairsAndFittingOutController(view, fakeAuth, fakeDataProperty(Some(property),answers), mockSessionRepository, mockNavigator, mcc)(mockConfig, ec) + val confirmBreakClauseAnswers: Option[UserAnswers] = UserAnswers("id").set(RepairsAndFittingOutPage, true).toOption + + + "RepairsAndFittingOutController" must { + "method show" must { + "Return OK and the correct view" in { + val result = controllerProperty(None).show(NormalMode)(authenticatedFakeRequest) + status(result) mustBe OK + val content = contentAsString(result) + content must include(pageTitle) + } + "return OK and the correct view with prepopulated data" in { + val result = controllerProperty(confirmBreakClauseAnswers).show(NormalMode)(authenticatedFakeRequest) + status(result) mustBe OK + val content = contentAsString(result) + val document = Jsoup.parse(content) + document.select("input[type=radio][name=repairsAndFittingOut-radio-value][value=true]").hasAttr("checked") mustBe true + document.select("input[type=radio][name=repairsAndFittingOut-radio-value][value=false]").hasAttr("checked") mustBe false + } + "Return NotFoundException when property is not found in the mongo" in { + when(mockNGRConnector.getLinkedProperty(any[CredId])(any())).thenReturn(Future.successful(None)) + val exception = intercept[NotFoundException] { + await(controllerNoProperty.show(NormalMode)(authenticatedFakeRequest)) + } + exception.getMessage contains "Could not find answers in backend mongo" mustBe true + } + } + + "method submit" must { + "Return See_Other and the correct view after submitting yes" in { + when(mockSessionRepository.set(any())).thenReturn(Future.successful(true)) + val result = controllerProperty(None).submit(NormalMode)(AuthenticatedUserRequest(FakeRequest(routes.ConfirmBreakClauseController.submit(NormalMode)) + .withFormUrlEncodedBody( + "repairsAndFittingOut-radio-value" -> "true", + ) + .withHeaders(HeaderNames.authorisation -> "Bearer 1"), None, None, None, Some(property), credId = Some(credId.value), None, None, nino = Nino(true, Some("")))) + result.map(result => { + result.header.headers.get("Location") mustBe Some("/ngr-rald-frontend/landlord") //TODO this is currently going to the wrong page as the journey hasn't yet been completed + }) + status(result) mustBe SEE_OTHER + redirectLocation(result) mustBe Some(routes.LandlordController.show(NormalMode).url) + } + "Return See_Other and the correct view after submitting no" in { + when(mockSessionRepository.set(any())).thenReturn(Future.successful(true)) + val result = controllerProperty(None).submit(NormalMode)(AuthenticatedUserRequest(FakeRequest(routes.ConfirmBreakClauseController.submit(NormalMode)) + .withFormUrlEncodedBody( + "repairsAndFittingOut-radio-value" -> "false", + ) + .withHeaders(HeaderNames.authorisation -> "Bearer 1"), None, None, None, Some(property), credId = Some(credId.value), None, None, nino = Nino(true, Some("")))) + result.map(result => { + result.header.headers.get("Location") mustBe Some("/ngr-rald-frontend/landlord") //TODO this is currently going to the wrong page as the journey hasn't yet been completed + }) + status(result) mustBe SEE_OTHER + redirectLocation(result) mustBe Some(routes.LandlordController.show(NormalMode).url) + } + "Return Form with Errors when no radio selection is input" in { + val result = controllerProperty(None).submit(NormalMode)(AuthenticatedUserRequest(FakeRequest(routes.ConfirmBreakClauseController.submit(NormalMode)) + .withFormUrlEncodedBody( + "repairsAndFittingOut-radio-value" -> "", + ) + .withHeaders(HeaderNames.authorisation -> "Bearer 1"), None, None, None, Some(property), credId = Some(credId.value), None, None, nino = Nino(true, Some("")))) + result.map(result => { + result.header.headers.get("Location") mustBe Some("/ngr-rald-frontend/landlord") //TODO this is currently going to the wrong page as the journey hasn't yet been completed + }) + status(result) mustBe BAD_REQUEST + val content = contentAsString(result) + content must include(pageTitle) + content must include("Select yes if you have done any repairs of fitting out in the property") + } + + "Return Exception if no address is in the mongo" in { + when(mockNGRConnector.getLinkedProperty(any[CredId])(any())).thenReturn(Future.successful(None)) + val exception = intercept[NotFoundException] { + await(controllerNoProperty.submit(NormalMode)(AuthenticatedUserRequest(FakeRequest(routes.LandlordController.submit(NormalMode)) + .withFormUrlEncodedBody(("what-type-of-agreement-radio", "")) + .withHeaders(HeaderNames.authorisation -> "Bearer 1"), None, None, None, Some(property), credId = Some(credId.value), None, None, nino = Nino(true, Some(""))))) + } + exception.getMessage contains "Could not find answers in backend mongo" mustBe true + } + } + } +} + diff --git a/test/uk/gov/hmrc/ngrraldfrontend/models/forms/RepairAndFittingOutFormSpec.scala b/test/uk/gov/hmrc/ngrraldfrontend/models/forms/RepairAndFittingOutFormSpec.scala new file mode 100644 index 0000000..16b869f --- /dev/null +++ b/test/uk/gov/hmrc/ngrraldfrontend/models/forms/RepairAndFittingOutFormSpec.scala @@ -0,0 +1,81 @@ +/* + * Copyright 2025 HM Revenue & Customs + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package uk.gov.hmrc.ngrraldfrontend.models.forms + +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers +import play.api.data.FormError +import play.api.libs.json.Json + +class RepairAndFittingOutFormSpec extends AnyFlatSpec with Matchers { + + val validData = Map( + "repairsAndFittingOut-radio-value" -> "true" + ) + + "RepairAndFittingOutForm" should "bind valid data successfully" in { + val boundForm = RepairsAndFittingOutForm.form.bind(validData) + + boundForm.errors shouldBe empty + boundForm.value shouldBe Some(RepairsAndFittingOutForm("true")) + } + + it should "fail when repairsAndFittingOut (radio) is missing" in { + val data = validData - "repairsAndFittingOut-radio-value" + val boundForm = RepairsAndFittingOutForm.form.bind(data) + + boundForm.errors shouldBe List(FormError("repairsAndFittingOut-radio-value", List("repairsAndFittingOut.empty.error"), List())) + } + + it should "fail to bind when repairsAndFittingOut is empty" in { + val data = Map("repairsAndFittingOut-radio-value" -> "") + val boundForm = RepairsAndFittingOutForm.form.bind(data) + + boundForm.hasErrors shouldBe true + boundForm.errors should contain(FormError("repairsAndFittingOut-radio-value", List("repairsAndFittingOut.empty.error"))) + } + + it should "fail when no is selected" in { + val data = Map( + "repairsAndFittingOut-radio-value" -> "false", + ) + + val boundForm = RepairsAndFittingOutForm.form.bind(data) + + boundForm.errors shouldBe empty + boundForm.value shouldBe Some(RepairsAndFittingOutForm("false")) + } + + "DoesYourRentIncludeParkingForm.format" should "serialize to JSON correctly" in { + val form = RepairsAndFittingOutForm("true") + val json = Json.toJson(form) + + json shouldBe Json.obj( + "radioValue" -> "true", + ) + } + + it should "deserialize from JSON correctly" in { + val json = Json.obj( + "radioValue" -> "false", + ) + + val result = json.validate[RepairsAndFittingOutForm] + result.isSuccess shouldBe true + result.get shouldBe RepairsAndFittingOutForm("false") + } +} diff --git a/test/uk/gov/hmrc/ngrraldfrontend/views/RepairAndFittingOutViewSpec.scala b/test/uk/gov/hmrc/ngrraldfrontend/views/RepairAndFittingOutViewSpec.scala new file mode 100644 index 0000000..d8b073a --- /dev/null +++ b/test/uk/gov/hmrc/ngrraldfrontend/views/RepairAndFittingOutViewSpec.scala @@ -0,0 +1,100 @@ +/* + * Copyright 2025 HM Revenue & Customs + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package uk.gov.hmrc.ngrraldfrontend.views + +import org.jsoup.Jsoup +import org.jsoup.nodes.Document +import uk.gov.hmrc.govukfrontend.views.viewmodels.radios.Radios +import uk.gov.hmrc.ngrraldfrontend.helpers.ViewBaseSpec +import uk.gov.hmrc.ngrraldfrontend.models.NormalMode +import uk.gov.hmrc.ngrraldfrontend.models.components.NGRRadio +import uk.gov.hmrc.ngrraldfrontend.models.components.NGRRadio.{buildRadios, simpleNgrRadio} +import uk.gov.hmrc.ngrraldfrontend.models.forms.RepairsAndFittingOutForm +import uk.gov.hmrc.ngrraldfrontend.views.html.RepairsAndFittingOutView + +class RepairAndFittingOutViewSpec extends ViewBaseSpec { + lazy val view: RepairsAndFittingOutView = inject[RepairsAndFittingOutView] + + object Strings { + val title = "Repairs and fitting out" + val body = "Repairs are when you fix things like poor electrical wiring, leaking windows or a broken toilet. Fitting out is when you install things like air conditioning, a kitchen or carpeting." + val heading = "Have you done any repairs or fitting out in the property?" + val radio1 = "Yes" + val radio2 = "No" + val continue = "Continue" + } + + object Selectors { + val title = "#main-content > div > div.govuk-grid-column-two-thirds > form > h1" + val body = "#main-content > div > div.govuk-grid-column-two-thirds > form > p" + val heading = "#main-content > div > div.govuk-grid-column-two-thirds > form > div > fieldset > legend > h1" + val radio1 = "#main-content > div > div.govuk-grid-column-two-thirds > form > div > fieldset > div > div:nth-child(1) > label" + val radio2 = "#main-content > div > div.govuk-grid-column-two-thirds > form > div > fieldset > div > div:nth-child(2) > label" + val continue = "#continue" + } + + val address = "5 Brixham Marina, Berry Head Road, Brixham, Devon, TQ5 9BW" + private val ngrRadio: NGRRadio = RepairsAndFittingOutForm.repairsAndFittingOutRadio + val form = RepairsAndFittingOutForm.form.fillAndValidate(RepairsAndFittingOutForm("true")) + val radio: Radios = buildRadios(form, ngrRadio) + + "ConfirmBreakClauseView" must { + val repairsAndFittingOutView = view(address, form, radio, NormalMode) + lazy implicit val document: Document = Jsoup.parse(repairsAndFittingOutView.body) + val htmlApply = view.apply(address, form, radio, NormalMode).body + val htmlRender = view.render(address, form, radio, NormalMode, request, messages, mockConfig).body + lazy val htmlF = view.f(address, form, radio, NormalMode) + + "htmlF is not empty" in { + htmlF.toString() must not be empty + } + + "apply must be the same as render" in { + htmlApply mustBe htmlRender + } + + "render is not empty" in { + htmlRender must not be empty + } + + "show correct title" in { + elementText(Selectors.title) mustBe Strings.title + } + + "show correct heading" in { + elementText(Selectors.heading) mustBe Strings.heading + } + + "show correct body" in { + elementText(Selectors.body) mustBe Strings.body + } + + + "show correct radio 1" in { + elementText(Selectors.radio1) mustBe Strings.radio1 + } + + "show correct radio 2" in { + elementText(Selectors.radio2) mustBe Strings.radio2 + } + + "show correct continue button" in { + elementText(Selectors.continue) mustBe Strings.continue + } + } +} +