Merge pull request #2593 from NationalSecurityAgency/t#2490/primevue-…

…pkiTests T#2490/primevue pki tests
NationalSecurityAgency · Jun 19, 2024 · b24eb07 · b24eb07
2 parents cf1b648 + a1ded00
commit b24eb07
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 78 deletions.
diff --git a/.github/scripts/runSubsetOfServiceTests.sh b/.github/scripts/runSubsetOfServiceTests.sh
@@ -82,7 +82,7 @@ if (( ${#integrationTests[@]} != 0 )); then
 fi
 
 if  [ "$cachingSpec" == 'yes' ]; then
-    echo 'Found CachingSpec. Building dashboard & client-display...'
+    echo 'Found CachingSpec. Building dashboard'
     cd ../dashboard-prime
     npm run deploy
 #    cd ../client-display

diff --git a/.github/workflows/build-and-test-email-confirmation.yml b/.github/workflows/build-and-test-email-confirmation.yml
@@ -53,9 +53,9 @@ jobs:
         repository: NationalSecurityAgency/skills-client
         path: skills-client
 
-    - uses: actions/setup-node@v2-beta
+    - uses: actions/setup-node@v3
       with:
-        node-version: '14'
+        node-version: '20.11.0'
 
     - uses: actions/setup-java@v1
       with:

diff --git a/.github/workflows/build-and-test-night-service-tests.yml b/.github/workflows/build-and-test-night-service-tests.yml
@@ -46,7 +46,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: '20.11.0'
 
       - uses: actions/setup-java@v3
         with:

diff --git a/.github/workflows/build-and-test-rabbitmq.yml b/.github/workflows/build-and-test-rabbitmq.yml
@@ -61,9 +61,9 @@ jobs:
 
     - uses: actions/checkout@v2
 
-    - uses: actions/setup-node@v2-beta
+    - uses: actions/setup-node@v3
       with:
-        node-version: '14'
+        node-version: '20.11.0'
 
     - uses: actions/setup-java@v1
       with:

diff --git a/.github/workflows/build-and-test-ssl.yml b/.github/workflows/build-and-test-ssl.yml
@@ -18,6 +18,7 @@ on:
   schedule:
     - cron: '0 7 * * *'
   workflow_dispatch:
+  push:
 #  pull_request:
 #    paths-ignore:
 #      - 'README.md'
@@ -60,7 +61,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: '20.11.0'
 
       - uses: actions/setup-java@v3
         with:

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -208,7 +208,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: '20.11.0'
 
       - uses: actions/setup-java@v3
         with:

diff --git a/service/src/test/java/skills/intTests/CachingSpec.groovy b/service/src/test/java/skills/intTests/CachingSpec.groovy
@@ -15,12 +15,14 @@
  */
 package skills.intTests
 
+import groovy.util.logging.Slf4j
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.core.io.ResourceLoader
 import org.springframework.core.io.support.ResourcePatternUtils
 import org.springframework.http.ResponseEntity
 import skills.intTests.utils.DefaultIntSpec
 
+@Slf4j
 class CachingSpec extends DefaultIntSpec {
 
     @Autowired
@@ -83,81 +85,22 @@ class CachingSpec extends DefaultIntSpec {
     def "assets should be cached"() {
         when:
         int count = 0
-        getFileNamesFromClasspath("/public/assets/**").each {
-            println it
-            ResponseEntity<String> responseEntity = skillsService.wsHelper.rawGet("/assets/${it}", [:])
-            assert responseEntity.statusCode.is2xxSuccessful()
-            assert responseEntity.headers.getCacheControl() == "max-age=${defaultCacheAge}, must-revalidate, private"
-            count++
-        }
+        List<String> ignore = ["dashboard-prime"]
+        getFileNamesFromClasspath("/public/assets/**")
+                .findAll { !ignore.contains(it) }
+                .each {
+                    String endpoint = "/assets/${it}".toString()
+                    log.info("Checking endpoint: [${endpoint}]")
+                    ResponseEntity<String> responseEntity = skillsService.wsHelper.rawGet(endpoint, [:])
+                    assert responseEntity.statusCode.is2xxSuccessful(), "Failed for [${endpoint}] endpoint"
+                    assert responseEntity.headers.getCacheControl() == "max-age=${defaultCacheAge}, must-revalidate, private", "Failed for [${endpoint}] endpoint"
+                    count++
+                }
 
         then:
         count > 0
     }
 
-// TODO: add back
-//    def "clientPortal index page should not be cached"() {
-//        when:
-//        ResponseEntity<String> responseEntity = skillsService.wsHelper.rawGet("assets/clientPortal/index.html", [:])
-//
-//        then:
-//        responseEntity.statusCode.is2xxSuccessful()
-//        responseEntity.headers.getCacheControl() == "no-store"
-//    }
-//
-//    def "clientPortal js resources should be cached"() {
-//        when:
-//
-//        getFileNamesFromClasspath("/public/assets/clientPortal/js/**").each {
-//            ResponseEntity<String> responseEntity = skillsService.wsHelper.rawGet("/assets/clientPortal/js/${it}", [:])
-//            assert responseEntity.statusCode.is2xxSuccessful()
-//            assert responseEntity.headers.getCacheControl() == "max-age=7776000, must-revalidate, private"
-//        }
-//
-//        then:
-//        true
-//    }
-//
-//    def "clientPortal img resources should be cached"() {
-//        when:
-//
-//        getFileNamesFromClasspath("/public/assets/clientPortal/img/**").each {
-//            ResponseEntity<String> responseEntity = skillsService.wsHelper.rawGet("/assets/clientPortal/img/${it}", [:])
-//            assert responseEntity.statusCode.is2xxSuccessful()
-//            assert responseEntity.headers.getCacheControl() == "max-age=1209600, must-revalidate, private"
-//        }
-//
-//        then:
-//        true
-//    }
-//
-//    def "clientPortal fonts resources should be cached"() {
-//        when:
-//
-//        getFileNamesFromClasspath("/public/assets/clientPortal/fonts/**").each {
-//            ResponseEntity<String> responseEntity = skillsService.wsHelper.rawGet("/assets/clientPortal/fonts/${it}", [:])
-//            assert responseEntity.statusCode.is2xxSuccessful()
-//            assert responseEntity.headers.getCacheControl() == "max-age=1209600, must-revalidate, private"
-//        }
-//
-//        then:
-//        true
-//    }
-//
-//    def "clientPortal css resources should be cached"() {
-//        when:
-//
-//        getFileNamesFromClasspath("/public/assets/clientPortal/css/**").each {
-//            ResponseEntity<String> responseEntity = skillsService.wsHelper.rawGet("/assets/clientPortal/css/${it}", [:])
-//            assert responseEntity.statusCode.is2xxSuccessful()
-//            assert responseEntity.headers.getCacheControl() == "max-age=7776000, must-revalidate, private"
-//        }
-//
-//        then:
-//        true
-//    }
-
-
     private getFileNamesFromClasspath(String classpathPath) {
         return ResourcePatternUtils.getResourcePatternResolver(resourceLoader).getResources("classpath:${classpathPath}").collect {
             it.filename