X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a31816b03c8249178d51621524f05437f5f9478a..035b113f60302f6d9c265e6e3a63dbb3c5873153:/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 1ad3296071..bfed03b14b 100644
--- a/apps/workbench/test/integration/jobs_test.rb
+++ b/apps/workbench/test/integration/jobs_test.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 require 'fileutils'
 require 'tmpdir'
 
@@ -35,37 +39,25 @@ class JobsTest < ActionDispatch::IntegrationTest
     assert_selector 'a[href="/"]', text: 'Go to dashboard'
   end
 
-  test "view job log" do
-    job = api_fixture('jobs')['job_with_real_log']
-
-    IO.expects(:popen).returns(fakepipe_with_log_data)
-
-    visit page_with_token("active", "/jobs/#{job['uuid']}")
-    assert page.has_text? job['script_version']
-
-    find(:xpath, "//a[@href='#Log']").click
-    wait_for_ajax
-    assert page.has_text? 'Started at'
-    assert page.has_text? 'Finished at'
-    assert page.has_text? 'log message 1'
-    assert page.has_text? 'log message 2'
-    assert page.has_text? 'log message 3'
-    assert page.has_no_text? 'Showing only 100 bytes of this log'
-  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
 
-    IO.expects(:popen).returns(fakepipe_with_log_data)
-    job = api_fixture('jobs')['job_with_real_log']
-
-    visit page_with_token("active", "/jobs/#{job['uuid']}")
-    assert page.has_text? job['script_version']
-
-    find(:xpath, "//a[@href='#Log']").click
+    logdata = fakepipe_with_log_data.read
+    job_uuid = api_fixture('jobs')['running']['uuid']
+    logcollection = upload_data_and_get_collection(logdata, 'active', "#{job_uuid}.log.txt")
+    job = nil
+    use_token 'active' do
+      job = Job.find job_uuid
+      job.update_attributes log: logcollection.portable_data_hash
+    end
+    visit page_with_token 'active', '/jobs/'+job.uuid
+    find('a[href="#Log"]').click
     wait_for_ajax
-    assert page.has_text? 'Showing only 100 bytes of this log'
+    assert_text 'Showing only 100 bytes of this log'
   end
 
   test 'view log via keep-web redirect' do
@@ -101,7 +93,7 @@ class JobsTest < ActionDispatch::IntegrationTest
       if expect_options
         assert_text 'supplied_script_version: master'
       else
-        assert_no_text 'supplied_script_version: (none)'
+        assert_no_text 'supplied_script_version'
       end
 
       assert_triggers_dom_event 'shown.bs.modal' do
@@ -129,7 +121,7 @@ class JobsTest < ActionDispatch::IntegrationTest
 
   [
     ['active', true],
-    ['job_reader', false],
+    ['job_reader2', false],
   ].each do |user, readable|
     test "view job with components as #{user} user" do
       job = api_fixture('jobs')['running_job_with_components']
@@ -142,26 +134,28 @@ class JobsTest < ActionDispatch::IntegrationTest
       assert page.has_text? job['script_version']
       assert page.has_no_text? 'script_parameters'
 
+      # The job_reader2 is allowed to read job, component2, and component2_child1,
+      # and component2_child2 only as a component of the pipeline component2
       if readable
         assert page.has_link? 'component1'
         assert page.has_link? 'component2'
       else
-        # children are not readable by user
         assert page.has_no_link? 'component1'
-        assert page.has_no_link? 'component2'
-        return
+        assert page.has_link? 'component2'
       end
 
-      click_link('component1')
-      within('#collapse1') do
-        assert(has_text? component1['uuid'])
-        assert(has_text? component1['script_version'])
-        assert(has_text? 'script_parameters')
+      if readable
+        click_link('component1')
+        within('.panel-collapse') do
+          assert(has_text? component1['uuid'])
+          assert(has_text? component1['script_version'])
+          assert(has_text? 'script_parameters')
+        end
+        click_link('component1')
       end
-      click_link('component1')
 
       click_link('component2')
-      within('#collapse2') do
+      within('.panel-collapse') do
         assert(has_text? component2['uuid'])
         assert(has_text? component2['script_version'])
         assert(has_no_text? 'script_parameters')
@@ -169,16 +163,20 @@ class JobsTest < ActionDispatch::IntegrationTest
         assert(has_link? 'running')
 
         click_link('previous')
-        within('#collapse3') do
+        within('.panel-collapse') do
           assert(has_text? component2_child1['uuid'])
           assert(has_text? component2_child1['script_version'])
         end
         click_link('previous')
 
         click_link('running')
-        within('#collapse4') do
+        within('.panel-collapse') do
           assert(has_text? component2_child2['uuid'])
-          assert(has_text? component2_child2['script_version'])
+          if readable
+            assert(has_text? component2_child2['script_version'])
+          else
+            assert(has_no_text? component2_child2['script_version'])
+          end
         end
       end
     end