[ARVADOS] updated: 1.3.0-1838-g30436ed9a

[Git user]

Summary of changes:
 apps/workbench/app/views/users/_show_admin.html.erb | 7 ++++---
 apps/workbench/test/integration/users_test.rb       | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

       via  30436ed9a7bb17ebb3ccc9e6f9938c086917bd69 (commit)
      from  16c9fad8ae207a6228f065e0cf71415509dcf230 (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 30436ed9a7bb17ebb3ccc9e6f9938c086917bd69
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Nov 8 09:43:09 2019 -0500

    15803: Tweak text on user admin page
    
    Fix tests.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/apps/workbench/app/views/users/_show_admin.html.erb b/apps/workbench/app/views/users/_show_admin.html.erb
index 9eaa0167b..89dbac572 100644
--- a/apps/workbench/app/views/users/_show_admin.html.erb
+++ b/apps/workbench/app/views/users/_show_admin.html.erb
@@ -6,9 +6,10 @@ SPDX-License-Identifier: AGPL-3.0 %>
   <div class="col-md-6">
 
     <p>
-      This button sets up an inactive user.  After setup, they will be able to log in.
-      This dialog box also allows you to optionally setup a shell account for this user.
-      The login name is automatically generated from the user's e-mail address.
+      This button sets up a user.  After setup, they will be able use
+      Arvados.  This dialog box also allows you to optionally set up a
+      shell account for this user.  The login name is automatically
+      generated from the user's e-mail address.
     </p>
 
     <%= link_to "Setup account #{'for ' if @object.full_name.present?} #{@object.full_name}", setup_popup_user_url(id: @object.uuid),  {class: 'btn btn-primary', :remote => true, 'data-toggle' =>  "modal", 'data-target' => '#user-setup-modal-window'}  %>
diff --git a/apps/workbench/test/integration/users_test.rb b/apps/workbench/test/integration/users_test.rb
index bedcc06a8..57be9d370 100644
--- a/apps/workbench/test/integration/users_test.rb
+++ b/apps/workbench/test/integration/users_test.rb
@@ -86,7 +86,7 @@ class UsersTest < ActionDispatch::IntegrationTest
 
     click_link 'Advanced'
     click_link 'Metadata'
-    assert page.has_text? 'can_login' # make sure page is rendered / ready
+    assert page.has_text? 'can_read' # make sure page is rendered / ready
     assert page.has_no_text? 'VirtualMachine:'
   end
 
@@ -105,7 +105,7 @@ class UsersTest < ActionDispatch::IntegrationTest
 
     # Setup user
     click_link 'Admin'
-    assert page.has_text? 'This button sets up an inactive user'
+    assert page.has_text? 'This button sets up a user'
 
     click_link 'Setup account for Active User'
 
@@ -220,7 +220,7 @@ class UsersTest < ActionDispatch::IntegrationTest
 
     # Setup user
     click_link 'Admin'
-    assert page.has_text? 'This button sets up an inactive user'
+    assert page.has_text? 'This button sets up a user'
 
     click_link 'Add new group'
 

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


hooks/post-receive
--