[NOISSUE]

auto test
TIER · Feb 25, 2019 · 1994587 · 1994587
1 parent 060259e
commit 1994587
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -184,6 +184,9 @@ sourceSets {
         java {
             srcDirs = []
         }
+        resources {
+            srcDir new File(buildDir, 'generated/ui')
+        }
     }
     integrationTest {
         groovy {
@@ -197,6 +200,11 @@ sourceSets {
     }
 }
 
+task copyUI(type: Copy) {
+    from tasks.findByPath(':ui:npm_run_buildProd').outputs
+    into new File(buildDir, 'generated/ui/static')
+}
+
 task integrationTest(type: Test) {
     group = 'verification'
     description = 'Run various integration tests'

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
@@ -1,14 +1,20 @@
 package edu.internet2.tier.shibboleth.admin.ui
 
+import edu.internet2.tier.shibboleth.admin.ui.controller.BadJSONMetadataSourcesUiDefinitionControllerIntegrationTests
 import jp.vmi.selenium.selenese.Main
 import jp.vmi.selenium.selenese.Runner
 import jp.vmi.selenium.selenese.config.DefaultConfig
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.context.annotation.ComponentScan
+import org.springframework.context.annotation.FilterType
+import org.springframework.test.context.ActiveProfiles
 import spock.lang.Specification
 import spock.lang.Unroll
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = [ShibbolethUiApplication])
+@ComponentScan(excludeFilters = [@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = [BadJSONMetadataSourcesUiDefinitionControllerIntegrationTests.Config, BadJSONMetadataSourcesUiDefinitionControllerIntegrationTests])])
+@ActiveProfiles(['dev'])
 class SeleniumSIDETest extends Specification {
     @Value('${local.server.port}')
     int randomPort