7753: The name "Job log" has a little problem; on screen small screen sizes, "Job...

diff --git a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
index d4a87b3725f6fc5573b0fdd7d26fa922890190a5..6cfb01772cff8d99682e0a1110e549e038fc1f71 100644 (file)
--- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
@@ -24,7 +24,7 @@
             <% if current_job[:log] %>
                 <% logCollection = Collection.find? current_job[:log] %>
                 <% if logCollection %>
-                  <%= link_to "Job log", job_path(current_job[:uuid], anchor: "Log") %>
+                  <%= link_to "Log", job_path(current_job[:uuid], anchor: "Log") %>
                 <% else %>
                   Log unavailable
                 <% end %>

diff --git a/apps/workbench/test/integration/anonymous_access_test.rb b/apps/workbench/test/integration/anonymous_access_test.rb
index be9799c2a61b7e60710fd35f80be26bcc7b4589f..5a685b3ca7c22cdaef7dc29262728798b1a630c6 100644 (file)
--- a/apps/workbench/test/integration/anonymous_access_test.rb
+++ b/apps/workbench/test/integration/anonymous_access_test.rb
@@ -237,6 +237,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
 
       if objects_readable
         assert_selector 'a[href="#Log"]', text: 'Log'
+
         assert_no_selector 'a[data-toggle="disabled"]', text: 'Log'
         assert_no_text 'Output data not available'
         if pipeline_page
@@ -244,13 +245,13 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
           job_id = object['components']['foo']['job']['uuid']
           assert_selector 'a', text: job_id
           if object['components']['foo']['job']['log']
-            assert_selector "a[href=\"/jobs/#{job_id}#Log\"]", text: 'Job log'
+            assert_selector "a[href=\"/jobs/#{job_id}#Log\"]", text: 'Log'
           end
 
           # We'd like to test the Log tab on job pages too, but we can't right
           # now because Poltergeist 1.x doesn't support JavaScript's
           # Function.prototype.bind, which is used by job_log_graph.js.
-          click_link "Log"
+          find(:xpath, "//a[@href='#Log']").click
           assert_text expect_log_text
         end
       else
@@ -262,7 +263,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
           assert_no_text 'This pipeline was created from'  # template is not readable
           assert_no_selector 'a', text: object['components']['foo']['job']['uuid']
         end
-        click_link "Log"
+        find(:xpath, "//a[@href='#Log']").click
         assert_text 'Output data not available'
         assert_no_text expect_log_text
       end