7709: Upgrade to rails4, fix some of the compatibility issues.

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

diff --git a/services/api/test/integration/api_client_authorizations_scopes_test.rb b/services/api/test/integration/api_client_authorizations_scopes_test.rb
index 20f83dc0ffce532856ab75df3af5b08193496edc..17c7516b79cd4247f990d359b854832062d75fce 100644 (file)
--- a/services/api/test/integration/api_client_authorizations_scopes_test.rb
+++ b/services/api/test/integration/api_client_authorizations_scopes_test.rb
@@ -4,11 +4,11 @@
 
 require 'test_helper'
 
-class Arvados::V1::ApiTokensScopeTest < ActionController::IntegrationTest
+class ApiTokensScopeTest < ActionDispatch::IntegrationTest
   fixtures :all
 
   def v1_url(*parts)
-    (['arvados', 'v1'] + parts).join('/')
+    (['', 'arvados', 'v1'] + parts).join('/')
   end
 
   test "user list token can only list users" do
@@ -63,7 +63,7 @@ class Arvados::V1::ApiTokensScopeTest < ActionController::IntegrationTest
     req_args = [{}, auth(:admin_noscope)]
     get(v1_url('logs'), *req_args)
     assert_response 403
-    get(v1_url('logs', logs(:log1).uuid), *req_args)
+    get(v1_url('logs', logs(:noop).uuid), *req_args)
     assert_response 403
     post(v1_url('logs'), *req_args)
     assert_response 403