[ARVADOS] updated: f7cc825b6a7a526a95e9f889ba94f4122f191889

git at public.curoverse.com git at public.curoverse.com
Fri Feb 6 07:50:33 EST 2015


Summary of changes:
 apps/workbench/app/helpers/application_helper.rb   |  4 +-
 .../jobs/_rerun_job_with_options_popup.html.erb    |  2 +-
 .../app/views/pipeline_instances/show.html.erb     |  4 +-
 .../app/views/users/_add_ssh_key_popup.html.erb    |  2 +-
 .../app/views/users/_setup_popup.html.erb          |  2 +-
 .../test/integration/pipeline_instances_test.rb    | 43 ++++++++++++++++++----
 .../test/integration/user_manage_account_test.rb   |  9 +++++
 services/api/lib/current_api_client.rb             | 21 +++++++++--
 services/api/test/fixtures/pipeline_templates.yml  | 19 ++++++++++
 9 files changed, 87 insertions(+), 19 deletions(-)

       via  f7cc825b6a7a526a95e9f889ba94f4122f191889 (commit)
       via  a41baffe4f38019cb5b36875c5e0c838ef9201e5 (commit)
       via  e5b8f6826a2034c0c7d7142cff3fb02f64fb8831 (commit)
       via  12dee1ebfd6a3fca40c19d751459ba6a071c0a3d (commit)
       via  36d6d1609ef342268cc87fc8bfce51bcf7199929 (commit)
       via  e20040092b47f79365637dd8e26156d95ab5c6ee (commit)
      from  c5fa3f7b2faea363cf73c7e4a2880086c7c9e4f0 (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 f7cc825b6a7a526a95e9f889ba94f4122f191889
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Fri Feb 6 07:49:27 2015 -0500

    4951: add test assertion to verify that request access button was no longer displayed after a request was made.

diff --git a/apps/workbench/test/integration/user_manage_account_test.rb b/apps/workbench/test/integration/user_manage_account_test.rb
index 599a577..a640728 100644
--- a/apps/workbench/test/integration/user_manage_account_test.rb
+++ b/apps/workbench/test/integration/user_manage_account_test.rb
@@ -139,5 +139,14 @@ class UserManageAccountTest < ActionDispatch::IntegrationTest
     assert_text 'You do not have access to any virtual machines'
     click_button 'Request shell access'
     assert_text 'Request sent for shell access'
+
+    # revisit the page and verify that the Request button is no longer shown
+    within('.navbar-fixed-top') do
+      find('a', text: 'spectator').click
+      within('.dropdown-menu') do
+        find('a', text: 'Manage account').click
+      end
+    end
+    assert_text 'You do not have access to any virtual machines. A request was sent on your behalf.'
   end
 end

commit a41baffe4f38019cb5b36875c5e0c838ef9201e5
Merge: c5fa3f7 e5b8f68
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Fri Feb 6 07:36:15 2015 -0500

    Merge branch 'master' into 4951-request-vm


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list