Merged in test-fix-1 (pull request #295)

[NOJIRA]

backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/UserBootstrapTests.groovy

@@ -10,19 +10,20 @@ import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.domain.EntityScan
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
+import org.springframework.context.annotation.ComponentScan
+import org.springframework.context.annotation.FilterType
 import org.springframework.core.io.ClassPathResource
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories
 import org.springframework.test.annotation.DirtiesContext
 import org.springframework.test.context.ContextConfiguration
-import spock.lang.Ignore
 import spock.lang.Specification
 
 @DataJpaTest
 @ContextConfiguration(classes=[CoreShibUiConfiguration, SearchConfiguration, TestConfiguration, InternationalizationConfiguration, ShibUIConfiguration])
 @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"])
 @EntityScan(["edu.internet2.tier.shibboleth.admin.ui", "edu.internet2.tier.shibboleth.admin.ui.security.model"])
-@DirtiesContext(methodMode = DirtiesContext.MethodMode.AFTER_METHOD)
-@Ignore
+@DirtiesContext(methodMode = DirtiesContext.MethodMode.AFTER_METHOD, classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
+@ComponentScan(excludeFilters = [@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = [UserBootstrap])])
 class UserBootstrapTests extends Specification {
     @Autowired
     ShibUIConfiguration shibUIConfiguration
@@ -35,8 +36,7 @@ class UserBootstrapTests extends Specification {
 
     def "simple test"() {
         setup:
-        userRepository.deleteAll()
-        roleRepository.deleteAll()
+        shibUIConfiguration.roles = []
         shibUIConfiguration.userBootstrapResource = new ClassPathResource('/conf/1044.csv')
         def userBootstrap = new UserBootstrap(shibUIConfiguration, userRepository, roleRepository)
 
@@ -46,13 +46,11 @@ class UserBootstrapTests extends Specification {
         then:
         noExceptionThrown()
         assert userRepository.findAll().size() == 2
-        assert roleRepository.findAll().size() == 3
+        assert roleRepository.findAll().size() == 2
     }
 
     def "bootstrap roles"() {
         setup:
-        userRepository.deleteAll()
-        roleRepository.deleteAll()
         shibUIConfiguration.roles = ['ROLE_ADMIN', 'ROLE_USER']
         def userbootstrap = new UserBootstrap(shibUIConfiguration, userRepository, roleRepository)