Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ODPR-1752] - Bug fix - international countries showing UK #79

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/models/CountriesList.scala
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ trait CountriesList {

lazy val gbCountry: Country = allCountries.filter(x => x.code == "GB").head
lazy val ukCountries: Seq[Country] = allCountries.filter(x => x.code == "GG" || x.code == "IM" || x.code == "JE")
lazy val internationalCountries: Seq[Country] = allCountries.filterNot(x => ukCountries.exists(_.code == x.code))
lazy val internationalCountries: Seq[Country] = allCountries.filterNot(x => x.code == "GG" || x.code == "IM" || x.code == "JE" || x.code == "GB")
lazy val nonUkInternationalCountries: Seq[Country] = allCountries.filterNot(_.code == "GB")
}

Expand Down
61 changes: 61 additions & 0 deletions test/models/CountriesListSpec.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/*
* 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 models

import org.scalatest.freespec.AnyFreeSpec
import org.scalatest.matchers.must.Matchers

class CountriesListSpec extends AnyFreeSpec with Matchers {

val countryList: CountriesList = new CountriesList {}

"CountryList" - {
"must have only GB in country list for gbCountry" in {

countryList.gbCountry mustEqual Country("GB", "United Kingdom")
countryList.gbCountry must not be Country("US", "United States")
countryList.gbCountry must not be Country("GG", "Guernsey")
countryList.gbCountry must not be Country("IM", "The Isle of Man")
countryList.gbCountry must not be Country("JE", "Jersey")
}

"must have only Jersey, Guernsey, Isle of Man for ukCountries" in {

countryList.ukCountries mustEqual List(Country("GG", "Guernsey"),
Country("IM", "The Isle of Man"),
Country("JE", "Jersey"))
countryList.ukCountries must not contain Country("GB", "United Kingdom")
countryList.ukCountries must not contain Country("US", "United States")
}

"must have only International countries for internationalCountries" in {

countryList.internationalCountries mustEqual
countryList.allCountries.filterNot(x => x.code == "GG" || x.code == "IM" || x.code == "JE" || x.code == "GB")
countryList.internationalCountries must not contain Country("GB", "United Kingdom")
countryList.internationalCountries must not contain Country("GG", "Guernsey")
countryList.internationalCountries must not contain Country("IM", "The Isle of Man")
countryList.internationalCountries must not contain Country("JE", "Jersey")
}

"must have all countries except GB for nonUkInternationalCountries" in {

countryList.nonUkInternationalCountries must not contain Country("GB", "United Kingdom")
}
}

}