Merge branch 'master' into feature/SHIBUI-1437-QA

Jenkinsfile-Selenium

@@ -0,0 +1,32 @@
+pipeline {
+  agent any
+  options {
+    disableConcurrentBuilds()
+    buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10'))
+  }
+  stages {
+    stage('Run Selenium tests') {      
+      steps {
+        sh '''
+          ./gradlew integrationTest -Dselenium.host=jenkins
+        '''
+      }
+      post {
+        always {
+          junit 'backend/build/test-results/integrationTest/**/*.xml'
+        }
+      }
+    }
+  }
+  post {
+    failure {
+      step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])])
+    }
+    success {
+      emailext body: '''${SCRIPT, template="groovy-text.template"}''', recipientProviders: [[$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']], subject: '[SHIBUI] Build Success'
+    }
+    always {
+      cleanWs()
+    }
+  }
+}

README.md

@@ -2,7 +2,7 @@
 
 For more information, see `docs`
 
-## Requirements
+## Requirements_
 
 * Java 8 (note that ONLY Java 8 is supported at this time; other later versions might work)
 

backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy

@@ -111,7 +111,6 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-1391: Regex Validation'                                     | '/SHIBUI-1391.side'
         'SHIBUI-1407: Metadata source comparison highlights'                | '/SHIBUI-1407-1.side'
         'SHIBUI-1407: Metadata provider comparison highlights'              | '/SHIBUI-1407-2.side'
-
     }
 }
 

backend/src/integration/resources/SHIBUI-1364-1.side

@@ -2257,4 +2257,4 @@
   }],
   "urls": ["http://localhost:10101/"],
   "plugins": []
-}
+}