Merge branch 'archivesspace:master' into backend-bulk-updater-refactor

build/build.xml

@@ -691,8 +691,6 @@
     </java>
   </target>
 
-  <!-- Note: Selenium tests for frontend are not currently included
-   in coverage reports -->
   <target name="frontend:coverage" depends="set-classpath, frontend:clean, frontend:test" description="Generate coverage reports for the frontend">
   </target>
 
@@ -719,20 +717,7 @@
     <record name="frontend_test_log.out" action="stop" />
   </target>
 
-  <target name="frontend:selenium" depends="set-classpath, frontend:clean, setup-integration" description="Run the Selenium tests">
-    <dirset id="plugins" dir="../plugins">
-      <include name="**/selenium"/>
-    </dirset>
-    <pathconvert pathsep=" " property="plugin-selenium-dirs" refid="plugins"/>
-    <antcall target="rspec">
-      <param name="dir" value="../frontend" />
-      <param name="spec" value="selenium/spec" />
-      <param name="order" value="defined" />
-      <param name="extra-spec-paths" value="${plugin-selenium-dirs}"/>
-    </antcall>
-  </target>
-
-  <target name="frontend:test" depends="set-classpath, frontend:clean, setup-integration" description="Run the non-Selenium unit test suite">
+  <target name="frontend:test" depends="set-classpath, frontend:clean, setup-integration" description="Run the non-capybara unit test suite">
     <property name="tag" value="~db"/>
     <antcall target="rspec">
       <param name="dir" value="../frontend" />

frontend/spec/rails_helper.rb

@@ -6,7 +6,7 @@
 require 'capybara-screenshot/rspec'
 require 'rails-controller-testing'
 require 'selenium-webdriver'
-require_relative 'selenium/common/webdriver'
+require_relative 'common/webdriver'
 require 'aspace_helper'
 
 CHROME_OPTS  = ENV.fetch('CHROME_OPTS', '--headless,--disable-gpu,--window-size=1920x1080,--no-sandbox,--disable-dev-shm-usage,--remote-debugging-port=9222').split(',')