[ARVADOS] updated: d4b03f2476f0ea6b30baad78672b31938846853e

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/integration/jobs_test.rb | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

       via  d4b03f2476f0ea6b30baad78672b31938846853e (commit)
      from  ff3e4c60ffa088479cd0a97b314b4af06b0d67ba (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 d4b03f2476f0ea6b30baad78672b31938846853e
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Feb 12 10:57:36 2015 -0500

    Fix undependable test (incorrectly assumed a particular job would be on the first page of /jobs). No issue #

diff --git a/apps/workbench/test/integration/jobs_test.rb b/apps/workbench/test/integration/jobs_test.rb
index 9ab98a0..29bccd9 100644
--- a/apps/workbench/test/integration/jobs_test.rb
+++ b/apps/workbench/test/integration/jobs_test.rb
@@ -4,6 +4,9 @@ require 'tmpdir'
 require 'integration_helper'
 
 class JobsTest < ActionDispatch::IntegrationTest
+  setup do
+      need_javascript
+  end
 
   def fakepipe_with_log_data
     content =
@@ -14,13 +17,8 @@ class JobsTest < ActionDispatch::IntegrationTest
   end
 
   test "add job description" do
-    need_javascript
-    visit page_with_token("active", "/jobs")
-
-    # go to job running the script "doesnotexist"
-    within first('tr', text: 'doesnotexist') do
-      find("a").click
-    end
+    job = api_fixture('jobs')['nearly_finished_job']
+    visit page_with_token("active", "/jobs/#{job['uuid']}")
 
     # edit job description
     within('.arv-description-as-subtitle') do
@@ -28,18 +26,14 @@ class JobsTest < ActionDispatch::IntegrationTest
       find('.editable-input textarea').set('*Textile description for job* - "Go to dashboard":/')
       find('.editable-submit').click
     end
-    wait_for_ajax
 
     # Verify edited description
-    assert page.has_no_text? '*Textile description for job*'
-    assert page.has_text? 'Textile description for job'
-    assert page.has_link? 'Go to dashboard'
-    click_link 'Go to dashboard'
-    assert page.has_text? 'Active pipelines'
+    assert_no_text '*Textile description for job*'
+    assert_text 'Textile description for job'
+    assert_selector 'a[href="/"]', text: 'Go to dashboard'
   end
 
   test "view job log" do
-    need_javascript
     job = api_fixture('jobs')['job_with_real_log']
 
     IO.expects(:popen).returns(fakepipe_with_log_data)
@@ -58,7 +52,6 @@ class JobsTest < ActionDispatch::IntegrationTest
   end
 
   test 'view partial job log' do
-    need_javascript
     # This config will be restored during teardown by ../test_helper.rb:
     Rails.configuration.log_viewer_max_bytes = 100
 
@@ -80,8 +73,6 @@ class JobsTest < ActionDispatch::IntegrationTest
   ].each do |job_name, expect_options, use_latest|
     test "Rerun #{job_name} job, expect options #{expect_options},
           and use latest version option #{use_latest}" do
-      need_javascript
-
       job = api_fixture('jobs')[job_name]
       visit page_with_token 'active', '/jobs/'+job['uuid']
 

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


hooks/post-receive
--