Merge pull request #3181 from archivesspace/ANW-2011-Run-specs-only-o…

…n-Java-11

ANW-2011 specs only on java 11, split frontend feature specs into fou…

.github/workflows/accessibility.yml

@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [ 8, 11 ]
+        java: [ 11 ]
 
     services:
       db:

.github/workflows/backend.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [ 8, 11 ]
+        java: [ 11 ]
 
     services:
       db:

.github/workflows/frontend.yml

@@ -9,40 +9,38 @@ on:
       - 'solr/**'
 
 jobs:
-  frontend_part_a_and_selenium_java_8:
+  frontend_part_a:
     uses: ./.github/workflows/common-frontend.yml
     secrets: inherit
     with:
       run-cmd: |
-        ./build/run frontend:selenium
-        ./build/run frontend:test:part_a
-      name: part_a_and_selenium
-      java-version: 8
+        ./build/run frontend:test -Dpattern="spec/features/[a-c]*_spec.rb"
+      name: part_a
+      java-version: 11
 
-  frontend_part_b_java_8:
+  frontend_part_b:
     uses: ./.github/workflows/common-frontend.yml
     secrets: inherit
     with:
       run-cmd: |
-        ./build/run frontend:test:part_b
+        ./build/run frontend:test -Dpattern="spec/features/[d-j]*_spec.rb"
       name: part_b
-      java-version: 8
+      java-version: 11
 
-  frontend_part_a_and_selenium_java_11:
+  frontend_part_c:
     uses: ./.github/workflows/common-frontend.yml
     secrets: inherit
     with:
       run-cmd: |
-        ./build/run frontend:selenium
-        ./build/run frontend:test:part_a
-      name: part_a_and_selenium
+        ./build/run frontend:test -Dpattern="spec/features/[k-r]*_spec.rb"
+      name: part_c
       java-version: 11
 
-  frontend_part_b_java_11:
+  frontend_part_d:
     uses: ./.github/workflows/common-frontend.yml
     secrets: inherit
     with:
       run-cmd: |
-        ./build/run frontend:test:part_b
-      name: part_b
+        ./build/run frontend:test -Dpattern="spec/features/[s-z]*_spec.rb"
+      name: part_d
       java-version: 11

.github/workflows/indexer.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [ 8, 11 ]
+        java: [ 11 ]
 
     steps:
     - uses: actions/checkout@v4

.github/workflows/public.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 8, 11 ]
+        java: [ 11 ]
 
     services:
       db:

build/build.xml

@@ -29,6 +29,12 @@
   <property name="aspace.public.port" value="3001" />
   <property name="aspace.db_url.dev" value="jdbc:mysql://127.0.0.1:3306/archivesspace?useUnicode=true&amp;characterEncoding=UTF-8&amp;user=as&amp;password=as123&amp;useSSL=false&amp;allowPublicKeyRetrieval=true" />
   <property name="aspace.db_url.test" value="jdbc:mysql://127.0.0.1:3307/archivesspace?useUnicode=true&amp;characterEncoding=UTF-8&amp;user=as&amp;password=as123&amp;useSSL=false&amp;allowPublicKeyRetrieval=true" />
+  <property name="aspace.db_host.test" value="127.0.0.1" />
+  <property name="aspace.db_port.test" value="3307" />
+  <property name="aspace.db_name.test" value="archivesspace" />
+  <property name="aspace.db_user.test" value="as" />
+  <property name="aspace.db_password.test" value="as123" />
+  <property name="aspace.db_root_password.test" value="123456" />
   <property name="aspace.solr_url.dev" value="http://127.0.0.1:8983/solr/archivesspace" />
   <property name="aspace.solr_url.test" value="http://127.0.0.1:8984/solr/archivesspace" />
   <property name="aspace.data_directory.dev" value="${basedir}/../build/dev" />
@@ -544,6 +550,18 @@
     </java>
   </target>
 
+  <target name="db:dump:test" description="Create a new dump of the test database">
+    <exec dir="${basedir}" executable="mysqldump"  newenvironment="false" failonerror="true" logError="true" output="../frontend/spec/fixtures/archivesspace-test.sql">
+      <arg line="--host='${aspace.db_host.test}' --port='${aspace.db_port.test}' -u root -p${aspace.db_root_password.test} ${aspace.db_name.test}"/>
+    </exec>
+  </target>
+
+  <target name="db:load:test" description="Create a new dump of the test database">
+    <exec dir="${basedir}" executable="mysql"  newenvironment="false" failonerror="true" input="../frontend/spec/fixtures/archivesspace-test.sql">
+      <arg line="--host='${aspace.db_host.test}' --port='${aspace.db_port.test}' -u ${aspace.db_user.test} -p${aspace.db_password.test} ${aspace.db_name.test}"/>
+    </exec>
+  </target>
+
   <!-- DOCS -->
   <target name="doc:api" depends="set-classpath, bootstrap-jruby" description="Generate markdown for API documentation">
     <antcall target="bundler">
@@ -675,7 +693,7 @@
 
   <!-- Note: Selenium tests for frontend are not currently included
    in coverage reports -->
-  <target name="frontend:coverage" depends="set-classpath, frontend:clean, frontend:test:part_a, frontend:test:part_b" description="Generate coverage reports for the frontend">
+  <target name="frontend:coverage" depends="set-classpath, frontend:clean, frontend:test" description="Generate coverage reports for the frontend">
   </target>
 
   <target name="frontend:devserver" depends="set-classpath, frontend:clean, frontend:copy:templates" description="Start an instance of the ArchivesSpace frontend development server">
@@ -723,24 +741,6 @@
     </antcall>
   </target>
 
-  <target name="frontend:test:part_a" depends="set-classpath, frontend:clean, setup-integration" description="Run all spec files starting with [a-h] from the non-Selenium unit test suite (used in CI)">
-    <property name="tag" value="~db"/>
-    <antcall target="rspec">
-      <param name="dir" value="../frontend" />
-      <param name="pattern" value="spec/*/[a-h]*_spec.rb" />
-      <param name="tag" value="${tag}" />
-    </antcall>
-  </target>
-
-  <target name="frontend:test:part_b" depends="set-classpath, frontend:clean, setup-integration" description="Run all spec files starting with [i-z] from the non-Selenium unit test suite (used in CI)">
-    <property name="tag" value="~db"/>
-    <antcall target="rspec">
-      <param name="dir" value="../frontend" />
-      <param name="pattern" value="spec/*/[i-z]*_spec.rb" />
-      <param name="tag" value="${tag}" />
-    </antcall>
-  </target>
-
   <target name="frontend:test:plugin" depends="set-classpath, setup-integration" description="Run the unit test suite">
     <property name="spec" value=""/>
     <condition property="example-arg" value="-e &quot;${example}&quot;" else="">
@@ -873,7 +873,7 @@
   </target>
 
   <!-- Prepares all tests to be run -->
-  <target name="setup-integration" depends="db:nuke:test, db:migrate:test, solr:reset:test" description="Prepare to run integration tests">
+  <target name="setup-integration" depends="db:nuke:test, db:load:test, db:migrate:test, solr:reset:test" description="Prepare to run integration tests">
   </target>
 
   <target name="solr:reset" description="Delete all documents from Solr">