13996: Fix tests.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index aca0669354622a29a00c11efd1b64a54b645efb4..3ad3cac2b27e3f750c8607856d3092d72ff6e669 100644 (file)
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -69,10 +69,6 @@ production:
 test:
   force_ssl: false
   cache_classes: true
-  public_file_server:
-    enabled: true
-    headers:
-      'Cache-Control': public, max-age=3600
   whiny_nils: true
   consider_all_requests_local: true
   action_controller.perform_caching: false

diff --git a/services/api/test/unit/job_test.rb b/services/api/test/unit/job_test.rb
index 5a882625636502fe6f214a40c3365c9f9e871d21..47ef027f3abff8e7f2a2c4a580bbd384cc2d11c0 100644 (file)
--- a/services/api/test/unit/job_test.rb
+++ b/services/api/test/unit/job_test.rb
@@ -672,7 +672,7 @@ class JobTest < ActiveSupport::TestCase
       Job.destroy_all
     end
     assert_equal 0, Job.count
-    assert_equal [], Rails.configuration.disable_api_methods
+    assert_equal [], Rails.configuration.API["DisabledAPIs"]
     check_enable_legacy_jobs_api
     assert_equal Disable_jobs_api_method_list, Rails.configuration.API["DisabledAPIs"]
   end