Skip to content

Commit

Permalink
[DDCNL-7882] Tweaks to the SCA Wrapper and feature flag reads fix (#385)
Browse files Browse the repository at this point in the history
* Tweaking to remove account menu where it shouldn't be as well as feature flag read fixes

* Added tests for feature flag
  • Loading branch information
Mbrookesy authored Sep 18, 2023
1 parent 5989ebb commit d138413
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 5 deletions.
9 changes: 6 additions & 3 deletions app/models/admin/FeatureFlag.scala
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,12 @@ sealed trait FeatureFlagName {
object FeatureFlagName {
implicit val writes: Writes[FeatureFlagName] = (o: FeatureFlagName) => JsString(o.toString)

implicit val reads: Reads[FeatureFlagName] = {
case name if name == JsString(PertaxBackendToggle.toString) => JsSuccess(PertaxBackendToggle)
case _ => JsError("Unknown FeatureFlagName")
implicit val reads: Reads[FeatureFlagName] = new Reads[FeatureFlagName] {
override def reads(json: JsValue): JsResult[FeatureFlagName] =
allFeatureFlags
.find(flag => JsString(flag.toString) == json)
.map(JsSuccess(_))
.getOrElse(JsError(s"Unknown FeatureFlagName `${json.toString}`"))
}

implicit val formats: Format[FeatureFlagName] =
Expand Down
5 changes: 3 additions & 2 deletions app/views/Main.scala
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,15 @@ class MainImpl @Inject() (
keepAliveUrl = "/keep-alive",
showBackLinkJS = !disableBackLink,
backLinkUrl = backLinkHref,
showSignOutInHeader = true,
showSignOutInHeader = false,
hideMenuBar = !BaseUserRequest.isAuthenticated,
scripts = Seq(additionalScripts(scripts)),
styleSheets = Seq(
additionalStyles()
),
bannerConfig = BannerConfig(
showAlphaBanner = false,
showBetaBanner = false,
showBetaBanner = true,
showHelpImproveBanner = true
),
optTrustedHelper = trustedHelper,
Expand Down
55 changes: 55 additions & 0 deletions test/models/admin/FeatureFlagSpec.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/*
* Copyright 2023 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.admin

import play.api.libs.json.{JsResultException, JsString, Json}
import utils.UnitSpec

class FeatureFlagSpec extends UnitSpec {

val testFlag: FeatureFlagName = SCAWrapperToggle

"read json" in {
JsString(testFlag.toString).as[FeatureFlagName] shouldBe testFlag
}

"throw an exception if name is invalid" in {
val result = intercept[JsResultException] {
JsString("invalid").as[FeatureFlagName]
}

result.getMessage should include("Unknown FeatureFlagName `\"invalid\"`")
}

"write json" in {
Json.toJson(testFlag).toString shouldBe s""""${testFlag.toString}""""
}

"String binds to a Right(FeatureFlagName)" in {
FeatureFlagName.pathBindable.bind("key", testFlag.toString) shouldBe Right(testFlag)
}

"Invalid string binds to a Left" in {
val name = "invalid"
FeatureFlagName.pathBindable.bind("key", name) shouldBe Left(s"The feature flag `$name` does not exist")
}

"FeatureFlagName unbinds to a string" in {
FeatureFlagName.pathBindable.unbind("aa", testFlag) shouldBe testFlag.toString
}

}

0 comments on commit d138413

Please sign in to comment.