Merge branch 'master' into 2919-provenance-graph-cutoff

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 51c96d7fc87d1cf5be336b4bd4815460f471d48d..64c50985c85e885a2059d9c7bd3c41806be4e105 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -191,3 +191,6 @@ table.table-fixed-header-row tbody {
     border-right: 1px solid #ffffff;
     background: #ffffff;
 }
+svg text {
+    font-size: 6pt;
+}
\ No newline at end of file

diff --git a/apps/workbench/app/views/application/_svg_div.html.erb b/apps/workbench/app/views/application/_svg_div.html.erb
index ddbbf20d296e15b72309a27d7630d67cb4b9a8b8..20269621f3f6b9b166b7b11aa79001682302c570 100644 (file)
--- a/apps/workbench/app/views/application/_svg_div.html.erb
+++ b/apps/workbench/app/views/application/_svg_div.html.erb
@@ -7,7 +7,7 @@
  border-width: 1px;
  border-color: gray;
  position: absolute;
- left: 1px;
+ left: 225px;
  right: 1px;
 }
 path:hover {

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index e3449f6e98a58d01ae857ed93caee810e84e37e5..b676dc74fc316da7f3c6cd2d15d64f09b56261e2 100644 (file)
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -52,5 +52,9 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
 
     # Pipeline is stopped. We have the option to resume it.
     page.assert_selector 'a,button', text: 'Run'
+
+    # Go over to the graph tab
+    click_link 'Graph'
+    assert page.has_css? 'div#provenance_graph'
   end
 end