[ARVADOS] updated: a00b31ed1a7073f17d3ed3810a0fe1e54fdcb9c0

git at public.curoverse.com git at public.curoverse.com
Fri Dec 4 09:21:22 EST 2015


Summary of changes:
 .../app/views/pipeline_instances/_running_component.html.erb       | 2 +-
 apps/workbench/test/integration/anonymous_access_test.rb           | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

       via  a00b31ed1a7073f17d3ed3810a0fe1e54fdcb9c0 (commit)
      from  d1fd19ae98fcedc33581d52dd91bff082fed009e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a00b31ed1a7073f17d3ed3810a0fe1e54fdcb9c0
Author: radhika <radhika at curoverse.com>
Date:   Fri Dec 4 09:19:33 2015 -0500

    7753: The name "Job log" has a little problem; on screen small screen sizes, "Job log" is displayed in two lines even when the rest of the items are displayed in single line due to the limited real estate in the panel header.

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 d4a87b3..6cfb017 100644
--- 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 be9799c..5a685b3 100644
--- 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

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list