[ARVADOS] updated: 949c7305691c7003296a1185697bb7318a975403

git at public.curoverse.com git at public.curoverse.com
Fri Mar 28 15:45:44 EDT 2014


Summary of changes:
 .../controllers/pipeline_instances_controller.rb   |    6 ++
 apps/workbench/app/helpers/provenance_helper.rb    |   68 ++++++-----------
 apps/workbench/app/models/collection.rb            |    7 ++
 .../pipeline_instances/_show_components.html.erb   |   10 +-
 apps/workbench/test/integration/users_test.rb      |    7 +-
 apps/workbench/test/unit/collection_test.rb        |   15 +++-
 .../pipeline_templates/gatk-exome-fq-snp.json      |   21 ++++--
 doc/sdk/cli/index.html.textile.liquid              |    1 -
 .../tutorial-firstscript.html.textile.liquid       |    6 +-
 .../tutorial-new-pipeline.html.textile.liquid      |    8 +-
 sdk/cli/arvados-cli.gemspec                        |    1 +
 sdk/cli/bin/arv-run-pipeline-instance              |   55 +++++++++++++-
 sdk/cli/bin/crunch-job                             |   14 +++-
 services/api/Gemfile                               |    2 +-
 services/api/Gemfile.lock                          |    4 +-
 .../app/controllers/arvados/v1/jobs_controller.rb  |    8 +-
 .../app/controllers/arvados/v1/users_controller.rb |    4 +-
 services/api/app/models/job.rb                     |    1 +
 services/api/app/models/user.rb                    |   16 ++--
 services/api/config/environment.rb                 |    7 ++-
 ...0547_separate_repository_from_script_version.rb |    2 +-
 ...140324024606_add_output_is_persistent_to_job.rb |    5 +
 services/api/db/schema.rb                          |    7 +-
 services/api/script/setup-new-user.rb              |    6 +-
 .../functional/arvados/v1/jobs_controller_test.rb  |    2 +
 .../functional/arvados/v1/users_controller_test.rb |   48 ++++++------
 services/api/test/unit/user_test.rb                |   30 ++++----
 services/keep/keep.go                              |    6 +-
 services/keep/keep_test.go                         |   78 ++++++++++++++++++--
 29 files changed, 297 insertions(+), 148 deletions(-)
 create mode 100644 services/api/db/migrate/20140324024606_add_output_is_persistent_to_job.rb

       via  949c7305691c7003296a1185697bb7318a975403 (commit)
       via  376406349f16dccd60abe728023edc7d089b63b6 (commit)
       via  64b24877bdb4b35938e8b691463b78073a4fd31d (commit)
       via  c6043720763ecad450078728e2a3c815c51148bc (commit)
       via  56e5fc30bc2f466bac84ee3d8cf8119cdd783603 (commit)
       via  e661ffb13884990e8c359fc4ed973db1d7f95db9 (commit)
       via  26446197bb00d7f899673b7f9434e6bd622b8904 (commit)
       via  331ffafdb6a080bac50765c4eca15508d52ac0ae (commit)
       via  82f30795293f8e84fe5b43710938f246d6604119 (commit)
       via  fbbb1beaca00df2d1483087451b81ed3c40953a9 (commit)
       via  6232434d6b86192b0531bacd7e4f0d5ae589f368 (commit)
       via  b0af0440838407be80c6208b15f969bc2942008e (commit)
       via  736c7c62cb2bd45637a54ac8937315ba4b64ed37 (commit)
       via  0136e134c210fe60e6a1e0eee5e2f77d8bc939dc (commit)
       via  c95bf51af6261d2707421305342043f499b69f67 (commit)
       via  d08be17d479e5bbc17c28811f97d84059fc78403 (commit)
       via  7079ddb46ce3e855a30a4bd5b8f1f3e626ce7b7a (commit)
       via  9a405be1112c8bad4c56160a4fc234943449f7c5 (commit)
       via  b50bbef5f429465fe71781be7edebbb8c4479d50 (commit)
       via  381f3ce2529a027cc0eb1c402b94135711658f6b (commit)
       via  6a8e3decba6bf4cd890bf98241646d0d070990b7 (commit)
       via  73e9bb7585add05c044a80c6811681d58b6148b4 (commit)
       via  69d0e98d74c221ba2161b4851c51dd47ee7a9409 (commit)
      from  857eb4ccd458f67f9cb49215490a5c8ebb1597c0 (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 949c7305691c7003296a1185697bb7318a975403
Author: radhika chippada <radhika at radhika.curoverse>
Date:   Fri Mar 28 15:44:31 2014 -0400

    Confirm dialog check commented our for now. Why is that I can't intercept the dialog and instead why is the  OK button clicked automatically?

diff --git a/apps/workbench/test/integration/users_test.rb b/apps/workbench/test/integration/users_test.rb
index 5c4848e..c7769ca 100644
--- a/apps/workbench/test/integration/users_test.rb
+++ b/apps/workbench/test/integration/users_test.rb
@@ -34,7 +34,7 @@ class UsersTest < ActionDispatch::IntegrationTest
     click_link 'Attributes'
     assert page.has_text? 'modified_by_user_uuid'
     page.within(:xpath, '//a[@data-name="is_active"]') do
-      assert_equal text, "true", "Expected user's is_active to be true"
+      assert_equal "true", text, "Expected user's is_active to be true"
     end
 
     # go to Admin tab
@@ -45,18 +45,19 @@ class UsersTest < ActionDispatch::IntegrationTest
     click_button 'Deactivate Active User'
 
     # Click Ok in the confirm dialog
+=begin
     sleep(0.1)
-
     popup = page.driver.window_handles.last
     page.within_window popup do
       assert has_text? 'Are you sure you want to deactivate Active User'
       click_button "Ok"
     end
+=end
 
     # Should now be back in the Attributes tab for the user
     assert page.has_text? 'modified_by_user_uuid'
     page.within(:xpath, '//a[@data-name="is_active"]') do
-      assert_equal text, "false", "Expected user's is_active to be false after unsetup"
+      assert_equal "false", text, "Expected user's is_active to be false after unsetup"
     end
 
   end

commit 376406349f16dccd60abe728023edc7d089b63b6
Merge: 857eb4c 64b2487
Author: radhika chippada <radhika at radhika.curoverse>
Date:   Fri Mar 28 15:22:29 2014 -0400

    Merge branch 'master' into 2272-setup-user-in-workbench


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list