Skip to content

test/Fix failed v6.0.0 tests #2639

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.

Sign up for GitHub

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

Merged
simonredfern merged 1 commit into from
Dec 4, 2025
Merged

test/Fix failed v6.0.0 tests #2639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions obp-api/src/test/scala/code/api/v6_0_0/CustomViewsTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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) {
Expand All @@ -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)
Expand Down Expand Up @@ -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)
}
}
}
4 changes: 2 additions & 2 deletions obp-api/src/test/scala/code/api/v6_0_0/PasswordResetTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down
4 changes: 2 additions & 2 deletions obp-api/src/test/scala/code/api/v6_0_0/SystemViewsTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down