From 0feab88d03b5b1725bb96a9de405aa25dff80e93 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Wed, 17 Jul 2019 17:35:58 -0700
Subject: [PATCH] NOJIRA

UsersController test cleanup.
---
 .../admin/ui/configuration/DevConfig.groovy   |  4 ++--
 .../UsersControllerIntegrationTests.groovy    | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy
index f28f15214..9e97395db 100644
--- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy
+++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy
@@ -78,8 +78,8 @@ class DevConfig {
                 roles.add(roleRepository.findByName('ROLE_ADMIN').get())
                 it
             }, new User().with {
-                username = 'user'
-                password = '{noop}userpass'
+                username = 'nonadmin'
+                password = '{noop}nonadminpass'
                 firstName = 'Peter'
                 lastName = 'Vandelay'
                 emailAddress = 'peter@institution.edu'
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersControllerIntegrationTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersControllerIntegrationTests.groovy
index ab60461a0..b50495b47 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersControllerIntegrationTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersControllerIntegrationTests.groovy
@@ -10,6 +10,7 @@ import org.springframework.security.test.context.support.WithMockUser
 import org.springframework.test.annotation.DirtiesContext
 import org.springframework.test.context.ActiveProfiles
 import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.result.MockMvcResultHandlers
 import spock.lang.Ignore
 import spock.lang.Specification
 
@@ -39,7 +40,7 @@ class UsersControllerIntegrationTests extends Specification {
         def expectedJson = """
 [
   {
-    "modifiedBy" : anonymousUser,
+    "modifiedBy" : "anonymousUser",
     "firstName" : "Joe",
     "emailAddress" : "joe@institution.edu",
     "role" : "ROLE_ADMIN",
@@ -48,7 +49,7 @@ class UsersControllerIntegrationTests extends Specification {
     "lastName" : "Doe"
   },
   {
-    "modifiedBy" : anonymousUser,
+    "modifiedBy" : "anonymousUser",
     "firstName" : "Peter",
     "emailAddress" : "peter@institution.edu",
     "role" : "ROLE_USER",
@@ -57,12 +58,21 @@ class UsersControllerIntegrationTests extends Specification {
     "lastName" : "Vandelay"
   },
   {
-    "modifiedBy" : anonymousUser,
+    "modifiedBy" : "anonymousUser",
+    "firstName" : "Bad",
+    "emailAddress" : "badboy@institution.edu",
+    "role" : "ROLE_NONE",
+    "username" : "none",
+    "createdBy" : "anonymousUser",
+    "lastName" : "robot"
+  },
+  {
+    "modifiedBy" : "anonymousUser",
     "firstName" : "Anon",
     "emailAddress" : "anon@institution.edu",
     "role" : "ROLE_ADMIN",
     "username" : "anonymousUser",
-    "createdBy" : anonymousUser,
+    "createdBy" : "anonymousUser",
     "lastName" : "Ymous"
   }
 ]"""
@@ -75,7 +85,6 @@ class UsersControllerIntegrationTests extends Specification {
                 .andExpect(status().isOk())
                 .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
                 .andExpect(content().json(expectedJson, false))
-
     }
 
     @WithMockUser(value = "admin", roles = ["ADMIN"])