Merge branch 'master' into 5200-anonymous-download

[arvados.git] / services / api / test / integration / errors_test.rb

diff --git a/services/api/test/integration/errors_test.rb b/services/api/test/integration/errors_test.rb
index 3a58e4840bb20f54beac9d5d39eb319e9188d8ee..984f81fe51ea796f4a4c83064743ce4247221773 100644 (file)
--- a/services/api/test/integration/errors_test.rb
+++ b/services/api/test/integration/errors_test.rb
@@ -8,7 +8,7 @@ class ErrorsTest < ActionDispatch::IntegrationTest
       get path, {:format => :json}, auth(:active)
       assert_nil assigns(:objects)
       assert_nil assigns(:object)
-      assert_not_nil jresponse['errors']
+      assert_not_nil json_response['errors']
       assert_response 404
     end
   end
@@ -19,7 +19,7 @@ class ErrorsTest < ActionDispatch::IntegrationTest
       # Generally, new routes should appear under /arvados/v1/. If
       # they appear elsewhere, that might have been caused by default
       # rails generator behavior that we don't want.
-      assert_match(/^\/(|\*a|arvados\/v1\/.*|auth\/.*|login|logout|discovery\/.*|static\/.*|themes\/.*)(\(\.:format\))?$/,
+      assert_match(/^\/(|\*a|arvados\/v1\/.*|auth\/.*|login|logout|database\/reset|discovery\/.*|static\/.*|themes\/.*)(\(\.:format\))?$/,
                    route.path.spec.to_s,
                    "Unexpected new route: #{route.path.spec}")
     end