Merge pull request #2639 from constantine2nd/develop

test/Fix failed v6.0.0 tests
This commit is contained in:
Simon Redfern 2025-12-04 12:17:32 +01:00 committed by GitHub
commit 416f8ecaa2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 9 deletions

View File

@ -3,7 +3,7 @@ package code.api.v6_0_0
import code.api.util.APIUtil.OAuth._
import code.api.util.ApiRole.{CanCreateCustomView, CanGetCustomViews}
import code.api.util.ErrorMessages
import code.api.util.ErrorMessages.UserHasMissingRoles
import code.api.util.ErrorMessages.{InvalidCustomViewFormat, InvalidJsonFormat, UserHasMissingRoles}
import code.api.v6_0_0.APIMethods600.Implementations6_0_0
import code.entitlement.Entitlement
import code.setup.DefaultUsers
@ -125,7 +125,7 @@ class CustomViewsTest extends V600ServerSetup with DefaultUsers {
Then("The automatic role guard should reject the request")
responseWithoutRole.code should equal(403)
responseWithoutRole.body.extract[ErrorMessage].message should contain(CanGetCustomViews.toString)
responseWithoutRole.body.extract[ErrorMessage].message should equal(UserHasMissingRoles + CanGetCustomViews.toString)
When("The same user is granted the required role")
Entitlement.entitlement.vend.addEntitlement("", resourceUser1.userId, CanGetCustomViews.toString)
@ -271,7 +271,7 @@ class CustomViewsTest extends V600ServerSetup with DefaultUsers {
response.code should equal(400)
And("Error message should indicate invalid custom view format")
response.body.extract[ErrorMessage].message should include("InvalidCustomViewFormat")
response.body.extract[ErrorMessage].message should include(InvalidCustomViewFormat)
}
scenario("We verify automatic role guard from ResourceDoc configuration for management endpoint", ApiEndpoint2, VersionOfApi) {
@ -295,7 +295,7 @@ class CustomViewsTest extends V600ServerSetup with DefaultUsers {
Then("The automatic role guard should reject the request")
responseWithoutRole.code should equal(403)
responseWithoutRole.body.extract[ErrorMessage].message should contain(CanCreateCustomView.toString)
responseWithoutRole.body.extract[ErrorMessage].message should equal(UserHasMissingRoles + CanCreateCustomView.toString)
When("The same user is granted the required role")
Entitlement.entitlement.vend.addEntitlement("", resourceUser1.userId, CanCreateCustomView.toString)
@ -325,7 +325,7 @@ class CustomViewsTest extends V600ServerSetup with DefaultUsers {
response.code should equal(400)
And("Error message should indicate invalid JSON format")
response.body.extract[ErrorMessage].message should include("InvalidJsonFormat")
response.body.extract[ErrorMessage].message should include(InvalidJsonFormat)
}
}
}

View File

@ -91,8 +91,8 @@ class PasswordResetTest extends V600ServerSetup {
When("We make a request v6.0.0 without a Role " + canCreateResetPasswordUrl)
val request600 = (v6_0_0_Request / "management" / "user" / "reset-password-url").POST <@(user1)
val response600 = makePostRequest(request600, write(postJson))
Then("We should get a 400")
response600.code should equal(400)
Then("We should get a 403")
response600.code should equal(403)
And("error should be " + UserHasMissingRoles + CanCreateResetPasswordUrl)
response600.body.extract[ErrorMessage].message should equal((UserHasMissingRoles + CanCreateResetPasswordUrl))
}

View File

@ -89,8 +89,8 @@ class SystemViewsTest extends V600ServerSetup with DefaultUsers {
Then("The automatic role guard should reject the request")
responseWithoutRole.code should equal(403)
responseWithoutRole.body.extract[ErrorMessage].message should contain(CanGetSystemViews.toString)
responseWithoutRole.body.extract[ErrorMessage].message should be (UserHasMissingRoles + CanGetSystemViews)
When("The same user is granted the required role")
Entitlement.entitlement.vend.addEntitlement("", resourceUser1.userId, CanGetSystemViews.toString)
val requestWithRole = (v6_0_0_Request / "management" / "system-views").GET <@ (user1)