Merge remote-tracking branch 'upstream/pull/4978'

diff --git a/app/assets/javascripts/auth_providers.js b/app/assets/javascripts/auth_providers.js
index 75eca253efa9861fb2ea8d503d54c005b6631940..38a7287a0281cc1e0c849b3b22a6b69216b0036d 100644 (file)
--- a/app/assets/javascripts/auth_providers.js
+++ b/app/assets/javascripts/auth_providers.js
@@ -12,11 +12,9 @@ $(document).ready(function () {
   $("#openid_open_url").click(function () {
     $("#openid_url").val("http://");
     $("#login_auth_buttons").hide();
-    $("#login_openid_url").show();
-    $("#openid_login_button").show();
+    $("#openid_login_form").show();
   });
 
   // Hide OpenID field for now
-  $("#login_openid_url").hide();
-  $("#openid_login_button").hide();
+  $("#openid_login_form").hide();
 });

diff --git a/app/views/application/_auth_providers.html.erb b/app/views/application/_auth_providers.html.erb
index ddf143d968b26c6e618a9afb73fae7599edbd69d..96a20fd85740f3266a99b16505606747a65ca83f 100644 (file)
--- a/app/views/application/_auth_providers.html.erb
+++ b/app/views/application/_auth_providers.html.erb
@@ -44,7 +44,7 @@
 
   <%# :tabindex starts high to allow rendering at the bottom of the template %>
   <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %>
-    <div id="login_openid_url" class="mb-3">
+    <div class="mb-3">
       <label for="openid_url" class="form-label">
         <%= image_tag "openid.svg", :size => "36", :alt => "", :class => "align-text-bottom" %>
         <%= t ".openid_url" %>
@@ -54,6 +54,6 @@
       <span class="form-text text-body-secondary">(<a href="<%= t "accounts.edit.openid.link" %>" target="_new"><%= t "accounts.edit.openid.link text" %></a>)</span>
     </div>
 
-    <%= submit_tag t(".openid_login_button"), :tabindex => 21, :id => "openid_login_button", :class => "btn btn-primary" %>
+    <%= submit_tag t(".openid_login_button"), :tabindex => 21, :class => "btn btn-primary" %>
   <% end %>
 </div>

diff --git a/test/system/user_signup_test.rb b/test/system/user_signup_test.rb
index 0835df741779eb05d306ae670639d0ea163d5e1d..0e02b904f7f44a830fa5d2eba043fef1e7c70ba6 100644 (file)
--- a/test/system/user_signup_test.rb
+++ b/test/system/user_signup_test.rb
@@ -8,4 +8,16 @@ class UserSignupTest < ApplicationSystemTestCase
 
     assert_content "Confirm Password"
   end
+
+  test "Show OpenID form when OpenID provider button is clicked" do
+    visit login_path
+
+    assert_no_field "OpenID URL"
+    assert_no_button "Continue"
+
+    click_on "Log in with OpenID"
+
+    assert_field "OpenID URL"
+    assert_button "Continue"
+  end
 end