[ARVADOS] updated: 2.1.0-795-gbf932e00f

[Git user]

Summary of changes:
 apps/workbench/app/views/users/welcome.html.erb            | 4 ++--
 apps/workbench/test/integration/application_layout_test.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

       via  bf932e00f0efcce7ed6cd660f5483ffd79359c60 (commit)
      from  c10061b6de6b85e7c445723a0f32a717ee76fe85 (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 bf932e00f0efcce7ed6cd660f5483ffd79359c60
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri May 14 17:34:00 2021 -0400

    17499: Fixing tests WIP
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/apps/workbench/app/views/users/welcome.html.erb b/apps/workbench/app/views/users/welcome.html.erb
index 8d3e42e4e..0b98909e6 100644
--- a/apps/workbench/app/views/users/welcome.html.erb
+++ b/apps/workbench/app/views/users/welcome.html.erb
@@ -19,7 +19,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
         }).then(function(resp) {
           if (!resp.ok) {
             resp.json().then(function(respj) {
-              document.getElementById('login-authenticate-error').innerHTML = `<p>${respj.errors[0]}</p>`;
+              document.getElementById('login-authenticate-error').innerHTML = "<p>"+respj.errors[0]+"</p>";
             });
             return;
            }
@@ -68,7 +68,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
 			     oninput="clear_authenticate_error()"></input></p>
         <input type="hidden" name="return_to" value="<%= "#{Rails.configuration.Services.Workbench1.ExternalURL}" %>" id="login-return-to">
         <span style="color: red"><p id="login-authenticate-error"></p></span>
-        <button type="submit" class="btn btn-primary">Login</button>
+        <button type="submit" class="btn btn-primary">Log in</button>
         </form>
       <% end %>
 
diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index e28809e13..235fb0d48 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -20,9 +20,9 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
 
     if !user
       assert page.has_text?('Please log in'), 'Not found text - Please log in'
-      assert page.has_text?('The "Log in" button below will show you a Google sign-in page'), 'Not found text - google sign in page'
+      assert page.has_text?('If you have never used Arvados Workbench before'), 'Not found text - If you have never'
       assert page.has_no_text?('My projects'), 'Found text - My projects'
-      assert page.has_link?("Log in to #{Rails.configuration.Workbench.SiteName}"), 'Not found text - log in to'
+      assert page.has_link?(/Log in/), 'Not found text - log in to'
     elsif user['is_active']
       if profile_config && !has_profile
         assert page.has_text?('Save profile'), 'No text - Save profile'

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


hooks/post-receive
--