From 5bf968d2b24fdafacce3ad2decea6a600f2afdb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Mon, 25 May 2020 18:07:18 +0200 Subject: [PATCH] Don't use confirm dialog in admin homepage form In this case the confirmation dialog isn't really necessary since the action to enable/disable the setting can easily be undone. Furthermore, these tests were failing with Chrome 83, probably because we use `confirm_dialog` and then we use `visit` without checking the page in between. In theory we shouldn't need to check the page in between because the request generated by `confirm_dialog` is a synchronous one and so `visit` isn't executed after the previous request has finished, but apparently this behavior has changed in Chrome 83. We could add an expectation before executing the `visit` method, but that wouldn't improve the usability of the application. --- app/views/admin/homepage/_setting.html.erb | 3 +-- spec/system/admin/homepage/homepage_spec.rb | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/views/admin/homepage/_setting.html.erb b/app/views/admin/homepage/_setting.html.erb index 15040f685..f875e3e7d 100644 --- a/app/views/admin/homepage/_setting.html.erb +++ b/app/views/admin/homepage/_setting.html.erb @@ -5,7 +5,6 @@ value: (setting.enabled? ? "" : "active") %> <%= f.submit(t("admin.settings.index.features.#{setting.enabled? ? "disable" : "enable"}"), - class: "button #{setting.enabled? ? "hollow alert" : "success"}", - data: { confirm: t("admin.actions.confirm") }) %> + class: "button #{setting.enabled? ? "hollow alert" : "success"}") %> <% end %> diff --git a/spec/system/admin/homepage/homepage_spec.rb b/spec/system/admin/homepage/homepage_spec.rb index 94703b3e7..e2ba36f7a 100644 --- a/spec/system/admin/homepage/homepage_spec.rb +++ b/spec/system/admin/homepage/homepage_spec.rb @@ -36,7 +36,7 @@ describe "Homepage" do within("#widget_feed_#{proposals_feed.id}") do select "1", from: "widget_feed_limit" - accept_confirm { click_button "Enable" } + click_button "Enable" end visit root_path @@ -55,7 +55,7 @@ describe "Homepage" do visit admin_homepage_path within("#widget_feed_#{debates_feed.id}") do select "2", from: "widget_feed_limit" - accept_confirm { click_button "Enable" } + click_button "Enable" end visit root_path @@ -76,12 +76,12 @@ describe "Homepage" do within("#widget_feed_#{proposals_feed.id}") do select "3", from: "widget_feed_limit" - accept_confirm { click_button "Enable" } + click_button "Enable" end within("#widget_feed_#{debates_feed.id}") do select "3", from: "widget_feed_limit" - accept_confirm { click_button "Enable" } + click_button "Enable" end visit root_path @@ -106,7 +106,7 @@ describe "Homepage" do visit admin_homepage_path within("#widget_feed_#{processes_feed.id}") do select "3", from: "widget_feed_limit" - accept_confirm { click_button "Enable" } + click_button "Enable" end visit root_path