SHIBUI-2015

Merge master to branch
TIER · Sep 1, 2021 · d6df5f9 · d6df5f9
2 parents 65694f6 + fe83c5a
commit d6df5f9
Show file tree

Hide file tree

Showing 123 changed files with 3,648 additions and 1,182 deletions.
diff --git a/.gitignore b/.gitignore
@@ -406,4 +406,5 @@ beacon/spring/out
 *.classpath
 *.settings
 *.project
-*bin
+*bin
+/a.json
diff --git a/.../tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy b/.../tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy
@@ -58,7 +58,7 @@ class EnversEntityDescriptorVersionServiceTests extends Specification {
 
         when: 'Second version'
         ed.serviceProviderName = 'SP2'
-        ed = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction(txMgr) {
+        ed = EnversTestsSupport.doInExplicitTransaction(txMgr) {
             entityDescriptorRepository.save(ed)
         }
         versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId)
@@ -71,7 +71,7 @@ class EnversEntityDescriptorVersionServiceTests extends Specification {
 
         when: 'Third version'
         ed.serviceProviderName = 'SP3'
-        ed = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction(txMgr) {
+        ed = EnversTestsSupport.doInExplicitTransaction(txMgr) {
             entityDescriptorRepository.save(ed)
         }
         versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId)
@@ -86,7 +86,7 @@ class EnversEntityDescriptorVersionServiceTests extends Specification {
     def "versioning service returns correct entity descriptor for version number"() {
         when: 'Initial version'
         EntityDescriptor ed = new EntityDescriptor(entityID: 'ed', serviceProviderName: 'SP1', createdBy: 'anonymousUser')
-        ed = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction(txMgr) {
+        ed = EnversTestsSupport.doInExplicitTransaction(txMgr) {
             entityDescriptorRepository.save(ed)
         }
         def versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId)
@@ -98,7 +98,7 @@ class EnversEntityDescriptorVersionServiceTests extends Specification {
 
         when: 'Update the original'
         ed.serviceProviderName = 'SP2'
-        ed = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction(txMgr) {
+        ed = EnversTestsSupport.doInExplicitTransaction(txMgr) {
             entityDescriptorRepository.save(ed)
         }
         versions = entityDescriptorVersionService.findVersionsForEntityDescriptor(ed.resourceId)
@@ -112,17 +112,17 @@ class EnversEntityDescriptorVersionServiceTests extends Specification {
     def "versioning service throws EntityNotFoundException for non existent version number"() {
         when: 'Initial version'
         EntityDescriptor ed = new EntityDescriptor(entityID: 'ed', serviceProviderName: 'SP1', createdBy: 'anonymousUser')
-        ed = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction(txMgr) {
+        ed = EnversTestsSupport.doInExplicitTransaction(txMgr) {
             entityDescriptorRepository.save(ed)
         }
 
         then:
         try { 
             def edRepresentation = entityDescriptorVersionService.findSpecificVersionOfEntityDescriptor(ed.resourceId, '1000')
-            1 == 2
+            false
         }
         catch (EntityNotFoundException expected) {
-            1 == 1
+            true
         }
     }
-}
+}
diff --git a/...end/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/...end/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
@@ -131,6 +131,8 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-1740: Verify dev profile group membership'                  | '/SHIBUI-1740-2.side'
         'SHIBUI-1740: Verify admin-owned resource not visible to nonadmins' | '/SHIBUI-1740-3.side'
         'SHIBUI-1740: Verify nonadmin-owned resource visibility'            | '/SHIBUI-1740-4.side'
+        'SHIBUI-1742: Verify enabler role allows enabling'                  | '/SHIBUI-1742-1.side'
+        'SHIBUI-1742: Verify role CRUD operations'                          | '/SHIBUI-1742-2.side'
     }
 }