[ARVADOS] updated: f74b087ce5ecdc2318e11d276e0d2b7ebefd13f3

git at public.curoverse.com git at public.curoverse.com
Tue Feb 10 14:39:48 EST 2015


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

       via  f74b087ce5ecdc2318e11d276e0d2b7ebefd13f3 (commit)
      from  545879af77d7ae31e079b43fa9c5bb83cce242a7 (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 f74b087ce5ecdc2318e11d276e0d2b7ebefd13f3
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Tue Feb 10 14:39:16 2015 -0500

    5183: revert back previous update and add an assertion to check if the expected radio button is selected.

diff --git a/apps/workbench/test/integration/jobs_test.rb b/apps/workbench/test/integration/jobs_test.rb
index 9a5ea15..047db87 100644
--- a/apps/workbench/test/integration/jobs_test.rb
+++ b/apps/workbench/test/integration/jobs_test.rb
@@ -80,7 +80,7 @@ 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
+      need_selenium
 
       job = api_fixture('jobs')[job_name]
       visit page_with_token 'active', '/jobs/'+job['uuid']
@@ -98,6 +98,8 @@ class JobsTest < ActionDispatch::IntegrationTest
         assert_selector 'a,button', text: 'Cancel'
         if use_latest
           page.choose("job_script_version_#{job['supplied_script_version']}")
+          latest = all(:xpath, '//input[@id="job_script_version_master"]')[0]
+          assert_equal true, latest.selected?
         end
         click_on "Run now"
       end
@@ -106,7 +108,11 @@ class JobsTest < ActionDispatch::IntegrationTest
       # server has no git repository to check against.  For now, check
       # that the correct script version is mentioned in the
       # Fiddlesticks error message.
-      assert_text "does not resolve to a commit"
+      if expect_options && use_latest
+        assert_text "Script version #{job['supplied_script_version']} does not resolve to a commit"
+      else
+        assert_text "Script version #{job['script_version']} does not resolve to a commit"
+      end
     end
   end
 end

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list