From: Tom Hughes <tom@compton.nu>
Date: Thu, 3 Sep 2020 22:52:59 +0000 (+0100)
Subject: Convert logout form to use bootstrap
X-Git-Tag: live~2752^2~2
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c11142d5c0bd0fc2958f65225dde9243f1d00b12

Convert logout form to use bootstrap
---

diff --git a/app/views/users/logout.html.erb b/app/views/users/logout.html.erb
index 41493e824..3ae4d14f6 100644
--- a/app/views/users/logout.html.erb
+++ b/app/views/users/logout.html.erb
@@ -2,7 +2,7 @@
   <h1><%= t ".heading" %></h1>
 <% end %>
 
-<%= form_tag({ :action => "logout" }, { :class => "standard-form" }) do %>
-  <%= hidden_field_tag("referer", h(params[:referer])) %>
-  <%= submit_tag t(".logout_button") %>
+<%= bootstrap_form_tag do |f| %>
+  <%= f.hidden_field :referer, :value => params[:referer] %>
+  <%= f.primary t(".logout_button") %>
 <% end %>
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 91ef7222f..1cd9c5dda 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -422,7 +422,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     get logout_path
     assert_response :success
     assert_template :logout
-    assert_select "input[name=referer][value=?]", ""
+    assert_select "input[name=referer]:not([value])"
   end
 
   def test_logout_fallback_with_referer