You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by ma...@apache.org on 2026/05/18 09:44:40 UTC
(grails-spring-security) 01/01: Merge branch '7.0.x' into 8.0.x
This is an automated email from the ASF dual-hosted git repository.
matrei pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/grails-spring-security.git
commit d0b702ed09b55feaec11096c78b75e8dc6a0a106
Merge: 5a0988302 9cbf91b3e
Author: Mattias Reichel <ma...@gmail.com>
AuthorDate: Mon May 18 11:34:43 2026 +0200
Merge branch '7.0.x' into 8.0.x
# Conflicts:
# gradle.properties
# plugin-ui/examples/common/src/testFixtures/groovy/page/HomePage.groovy
# plugin-ui/examples/common/src/testFixtures/groovy/page/register/VerifyRegistrationPage.groovy
# plugin-ui/examples/common/src/testFixtures/groovy/page/registrationCode/RegistrationCodeSearchPage.groovy
# plugin-ui/examples/common/src/testFixtures/groovy/page/role/RoleSearchPage.groovy
# plugin-ui/examples/common/src/testFixtures/groovy/page/user/UserCreatePage.groovy
# plugin-ui/examples/extended/src/integration-test/groovy/extended/spec/RoleSpec.groovy
# plugin-ui/examples/extended/src/integration-test/groovy/spec/AclSidSpec.groovy
# plugin-ui/examples/extended/src/integration-test/groovy/spec/RegisterSpec.groovy
# plugin-ui/examples/extended/src/integration-test/groovy/spec/RegistrationCodeSpec.groovy
# plugin-ui/examples/extended/src/integration-test/groovy/spec/RequestmapSpec.groovy
# plugin-ui/examples/extended/src/integration-test/groovy/spec/UserSpec.groovy
# plugin-ui/examples/simple/src/integration-test/groovy/spec/RegisterSpec.groovy
# plugin-ui/examples/simple/src/integration-test/groovy/spec/RegistrationCodeSpec.groovy
# plugin-ui/examples/simple/src/integration-test/groovy/spec/UserSimpleSpec.groovy
etc/bin/run-all-test-configs.sh | 36 ++++
.../integration-test/groovy/demo/LoginPage.groovy | 17 +-
.../groovy/demo/SecuredControllerSpec.groovy | 46 ++--
.../groovy/demo/SecuredPage.groovy | 2 +-
plugin-core/plugin/build.gradle | 5 +
.../springsecurity/SpringSecurityUtilsSpec.groovy | 1 -
.../plugin/springsecurity/SecurityTestUtils.groovy | 0
.../config/http/SecurityFiltersMapper.groovy | 0
.../page/CreatePage.groovy => common/build.gradle} | 18 +-
.../testFixtures}/groovy/module/RolesTab.groovy | 1 -
.../testFixtures}/groovy/page/CreatePage.groovy | 13 +-
.../src/testFixtures}/groovy/page/EditPage.groovy | 16 +-
.../src/testFixtures/groovy/page/HomePage.groovy} | 16 +-
.../testFixtures/groovy/page/LifecyclePage.groovy} | 26 ++-
.../testFixtures}/groovy/page/SearchPage.groovy | 23 +-
.../groovy/page/aclClass/AclClassCreatePage.groovy | 8 +-
.../groovy/page/aclClass/AclClassEditPage.groovy | 8 +-
.../groovy/page/aclClass/AclClassSearchPage.groovy | 7 +-
.../groovy/page/aclEntry/AclEntryCreatePage.groovy | 8 +-
.../groovy/page/aclEntry/AclEntryEditPage.groovy | 6 +-
.../groovy/page/aclEntry/AclEntryForm.groovy | 66 ++++++
.../groovy/page/aclEntry/AclEntrySearchPage.groovy | 31 ++-
.../AclObjectIdentityCreatePage.groovy | 8 +-
.../AclObjectIdentityEditPage.groovy | 8 +-
.../AclObjectIdentityForm.groovy} | 25 ++-
.../AclObjectIdentitySearchPage.groovy | 7 +-
.../groovy/page/aclSid/AclSidCreatePage.groovy | 12 +-
.../groovy/page/aclSid/AclSidEditPage.groovy | 8 +-
.../groovy/page/aclSid/AclSidForm.groovy} | 35 +--
.../groovy/page/aclSid/AclSidSearchPage.groovy | 40 +++-
.../PersistentLoginSearchPage.groovy | 22 +-
.../groovy/page/register/ForgotPasswordPage.groovy | 15 +-
.../groovy/page/register/RegisterPage.groovy | 32 ++-
.../groovy/page/register/ResetPasswordPage.groovy | 43 +++-
.../page/register/SecurityQuestionsPage.groovy | 15 +-
.../page/register/VerifyRegistrationPage.groovy} | 14 +-
.../RegistrationCodeEditPage.groovy | 7 +-
.../registrationCode/RegistrationCodeForm.groovy} | 22 +-
.../RegistrationCodeSearchPage.groovy | 6 +-
.../page/requestmap/RequestmapCreatePage.groovy | 8 +-
.../page/requestmap/RequestmapEditPage.groovy | 9 +-
.../groovy/page/requestmap/RequestmapForm.groovy} | 21 +-
.../page/requestmap/RequestmapSearchPage.groovy | 7 +-
.../groovy/page/role/RoleCreatePage.groovy | 8 +-
.../groovy/page/role/RoleEditPage.groovy | 9 +-
.../testFixtures/groovy/page/role/RoleForm.groovy} | 21 +-
.../groovy/page/role/RoleSearchPage.groovy | 7 +-
.../groovy/page/user/UserCreatePage.groovy | 7 +-
.../groovy/page/user/UserEditPage.groovy | 33 ++-
.../testFixtures/groovy/page/user/UserForm.groovy | 50 +++++
.../groovy/page/user/UserSearchPage.groovy | 130 +++++++++++
.../groovy/spec/SecurityUISpec.groovy} | 10 +-
plugin-ui/examples/extended/build.gradle | 1 +
.../examples/extended/grails-app/views/index.gsp | 1 +
.../page/profile/ProfileCreatePage.groovy | 14 +-
.../page/profile/ProfileEditPage.groovy | 18 +-
.../page/profile/ProfileListPage.groovy | 16 +-
.../groovy/{ => extended}/spec/AclClassSpec.groovy | 62 +++---
.../groovy/extended/spec/AclEntrySpec.groovy | 176 +++++++++++++++
.../extended/spec/AclObjectIdentitySpec.groovy | 139 ++++++++++++
.../groovy/extended/spec/AclSidSpec.groovy | 147 +++++++++++++
.../{ => extended}/spec/ExtendedMenuSpec.groovy | 46 ++--
.../extended/spec/ExtendedSecurityInfoSpec.groovy | 166 ++++++++++++++
.../{ => extended}/spec/PersistentLoginSpec.groovy | 79 +++----
.../groovy/extended/spec/RegisterSpec.groovy | 230 ++++++++++++++++++++
.../spec/RegistrationCodeSpec.groovy | 58 +++--
.../{ => extended}/spec/RequestmapSpec.groovy | 115 +++++-----
.../groovy/extended}/spec/RoleSpec.groovy | 95 ++++----
.../groovy/{ => extended}/spec/UserSpec.groovy | 157 +++++++-------
.../{ => extended}/test/ProfileServiceSpec.groovy | 10 +-
.../groovy/page/aclClass/AclClassEditPage.groovy | 37 ----
.../groovy/page/aclClass/AclClassSearchPage.groovy | 37 ----
.../groovy/page/aclEntry/AclEntryCreatePage.groovy | 41 ----
.../groovy/page/aclEntry/AclEntrySearchPage.groovy | 35 ---
.../groovy/page/aclSid/AclSidSearchPage.groovy | 40 ----
.../groovy/page/register/ResetPasswordPage.groovy | 41 ----
.../page/requestmap/RequestmapEditPage.groovy | 33 ---
.../page/requestmap/RequestmapSearchPage.groovy | 34 ---
.../groovy/page/role/RoleSearchPage.groovy | 38 ----
.../groovy/page/user/UserEditPage.groovy | 37 ----
.../groovy/page/user/UserSearchPage.groovy | 38 ----
.../groovy/spec/AclEntrySpec.groovy | 166 --------------
.../groovy/spec/AclObjectIdentitySpec.groovy | 133 ------------
.../integration-test/groovy/spec/AclSidSpec.groovy | 148 -------------
.../groovy/spec/ExtendedSecurityInfoSpec.groovy | 144 -------------
.../groovy/spec/RegisterSpec.groovy | 240 ---------------------
plugin-ui/examples/simple/build.gradle | 1 +
.../examples/simple/grails-app/views/index.gsp | 1 +
.../integration-test/groovy/page/EditPage.groovy | 33 ---
.../integration-test/groovy/page/SearchPage.groovy | 51 -----
.../groovy/page/aclClass/AclClassCreatePage.groovy | 38 ----
.../groovy/page/aclEntry/AclEntryEditPage.groovy | 41 ----
.../AclObjectIdentityEditPage.groovy | 33 ---
.../AclObjectIdentitySearchPage.groovy | 36 ----
.../groovy/page/aclSid/AclSidEditPage.groovy | 35 ---
.../PersistentLoginSearchPage.groovy | 35 ---
.../groovy/page/register/ForgotPasswordPage.groovy | 34 ---
.../groovy/page/register/RegisterPage.groovy | 37 ----
.../RegistrationCodeEditPage.groovy | 40 ----
.../groovy/page/role/RoleCreatePage.groovy | 38 ----
.../groovy/page/user/UserCreatePage.groovy | 40 ----
.../groovy/page/user/UserSearchPage.groovy | 38 ----
.../{ => simple}/spec/DefaultMenuSpec.groovy | 43 ++--
.../simple/spec/DefaultSecurityInfoSpec.groovy | 163 ++++++++++++++
.../groovy/{ => simple}/spec/RegisterSpec.groovy | 215 +++++++++---------
.../{ => simple}/spec/RegistrationCodeSpec.groovy | 88 ++++----
.../groovy/simple}/spec/RequestmapSpec.groovy | 116 +++++-----
.../groovy/simple}/spec/RoleSpec.groovy | 85 ++++----
.../groovy/{ => simple}/spec/UserSimpleSpec.groovy | 171 +++++++--------
.../groovy/spec/AbstractSecuritySpec.groovy | 44 ----
.../groovy/spec/DefaultSecurityInfoSpec.groovy | 144 -------------
.../groovy/spec/RequestmapSpec.groovy | 143 ------------
settings.gradle | 2 +
113 files changed, 2474 insertions(+), 3036 deletions(-)
diff --cc plugin-ui/examples/extended/src/integration-test/groovy/extended/test/ProfileServiceSpec.groovy
index afdd604ce,fedbdb72b..b648d482e
--- a/plugin-ui/examples/extended/src/integration-test/groovy/extended/test/ProfileServiceSpec.groovy
+++ b/plugin-ui/examples/extended/src/integration-test/groovy/extended/test/ProfileServiceSpec.groovy
@@@ -16,15 -16,17 +16,19 @@@
* specific language governing permissions and limitations
* under the License.
*/
+ package extended.test
- package test
+ import org.hibernate.SessionFactory
+ import spock.lang.Specification
+ import spock.lang.Stepwise
+ import test.Profile
+ import test.ProfileService
+ import test.User
+import spock.lang.Stepwise
+
import grails.gorm.transactions.Rollback
import grails.testing.mixin.integration.Integration
- import spock.lang.Specification
- import org.hibernate.SessionFactory
@Rollback
@Stepwise