14717: Fixups since tests now use config.yml

[arvados.git] / apps / workbench / test / integration / jobs_test.rb

diff --git a/apps/workbench/test/integration/jobs_test.rb b/apps/workbench/test/integration/jobs_test.rb
index 4b89b5daa97d179df8f5fb1081dbbd9183193602..5dcdab748f6b1631d722850eca3295315c10ab0a 100644 (file)
--- a/apps/workbench/test/integration/jobs_test.rb
+++ b/apps/workbench/test/integration/jobs_test.rb
@@ -8,8 +8,6 @@ require 'tmpdir'
 require 'integration_helper'
 
 class JobsTest < ActionDispatch::IntegrationTest
-  include KeepWebConfig
-
   setup do
       need_javascript
   end
@@ -40,10 +38,11 @@ class JobsTest < ActionDispatch::IntegrationTest
   end
 
   test 'view partial job log' do
+    need_selenium 'to be able to see the CORS response headers (PhantomJS 1.9.8 does not)'
     use_keep_web_config
 
     # This config will be restored during teardown by ../test_helper.rb:
-    Rails.configuration.log_viewer_max_bytes = 100
+    Rails.configuration.Workbench.LogViewerMaxBytes = 100
 
     logdata = fakepipe_with_log_data.read
     job_uuid = api_fixture('jobs')['running']['uuid']
@@ -62,7 +61,7 @@ class JobsTest < ActionDispatch::IntegrationTest
   test 'view log via keep-web redirect' do
     use_keep_web_config
 
-    token = api_fixture('api_client_authorizations')['active']['api_token']
+    token = api_token('active')
     logdata = fakepipe_with_log_data.read
     logblock = `echo -n #{logdata.shellescape} | ARVADOS_API_TOKEN=#{token.shellescape} arv-put --no-progress --raw -`.strip
     assert $?.success?, $?