From 907c0fc67985a9623de9c2cb7062af1e99a39654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 10 Apr 2021 14:27:31 +0200 Subject: [PATCH] Remove redundant database checks in system tests These tests check what happens from the user's point of view. For instance, we check that after disabling recommendations, they are not shown. What happens in the database is not related to the user experience. Furthermore, checking the database after the browser has started is proving to be a major source for inconsistent data in specs. --- spec/system/admin/geozones_spec.rb | 1 - spec/system/admin/hidden_budget_investments_spec.rb | 2 -- spec/system/admin/hidden_comments_spec.rb | 2 -- spec/system/admin/hidden_debates_spec.rb | 2 -- spec/system/admin/hidden_proposals_spec.rb | 2 -- spec/system/admin/hidden_users_spec.rb | 2 -- spec/system/admin/proposal_notifications_spec.rb | 2 -- spec/system/admin/proposals_spec.rb | 2 -- spec/system/budget_polls/budgets_spec.rb | 12 +++--------- spec/system/debates_spec.rb | 3 --- spec/system/proposals_spec.rb | 3 --- 11 files changed, 3 insertions(+), 30 deletions(-) diff --git a/spec/system/admin/geozones_spec.rb b/spec/system/admin/geozones_spec.rb index 5d1ac9018..1031d0fcf 100644 --- a/spec/system/admin/geozones_spec.rb +++ b/spec/system/admin/geozones_spec.rb @@ -78,7 +78,6 @@ describe "Admin geozones", :admin do expect(page).to have_content "Geozone successfully deleted" expect(page).not_to have_content("Delete me!") - expect(Geozone.where(id: geozone.id)).to be_empty end scenario "Delete geozone with associated element" do diff --git a/spec/system/admin/hidden_budget_investments_spec.rb b/spec/system/admin/hidden_budget_investments_spec.rb index 74abe5b9b..f400c5362 100644 --- a/spec/system/admin/hidden_budget_investments_spec.rb +++ b/spec/system/admin/hidden_budget_investments_spec.rb @@ -40,8 +40,6 @@ describe "Admin hidden budget investments", :admin do click_link("Confirmed") expect(page).to have_content(investment.title) - - expect(investment.reload).to be_confirmed_hide end scenario "Current filter is properly highlighted" do diff --git a/spec/system/admin/hidden_comments_spec.rb b/spec/system/admin/hidden_comments_spec.rb index 1d0b4114c..0832f068a 100644 --- a/spec/system/admin/hidden_comments_spec.rb +++ b/spec/system/admin/hidden_comments_spec.rb @@ -84,8 +84,6 @@ describe "Admin hidden comments", :admin do expect(page).not_to have_content(comment.body) click_link("Confirmed") expect(page).to have_content(comment.body) - - expect(comment.reload).to be_confirmed_hide end scenario "Current filter is properly highlighted" do diff --git a/spec/system/admin/hidden_debates_spec.rb b/spec/system/admin/hidden_debates_spec.rb index e38d704f5..0ce7eb035 100644 --- a/spec/system/admin/hidden_debates_spec.rb +++ b/spec/system/admin/hidden_debates_spec.rb @@ -22,8 +22,6 @@ describe "Admin hidden debates", :admin do expect(page).not_to have_content(debate.title) click_link("Confirmed") expect(page).to have_content(debate.title) - - expect(debate.reload).to be_confirmed_hide end scenario "Current filter is properly highlighted" do diff --git a/spec/system/admin/hidden_proposals_spec.rb b/spec/system/admin/hidden_proposals_spec.rb index 6d281e25f..832d61806 100644 --- a/spec/system/admin/hidden_proposals_spec.rb +++ b/spec/system/admin/hidden_proposals_spec.rb @@ -35,8 +35,6 @@ describe "Admin hidden proposals", :admin do expect(page).not_to have_content(proposal.title) click_link("Confirmed") expect(page).to have_content(proposal.title) - - expect(proposal.reload).to be_confirmed_hide end scenario "Current filter is properly highlighted" do diff --git a/spec/system/admin/hidden_users_spec.rb b/spec/system/admin/hidden_users_spec.rb index 09d6cb102..13c2da4bc 100644 --- a/spec/system/admin/hidden_users_spec.rb +++ b/spec/system/admin/hidden_users_spec.rb @@ -37,8 +37,6 @@ describe "Admin hidden users", :admin do expect(page).not_to have_content(user.username) click_link("Confirmed") expect(page).to have_content(user.username) - - expect(user.reload).to be_confirmed_hide end scenario "Current filter is properly highlighted" do diff --git a/spec/system/admin/proposal_notifications_spec.rb b/spec/system/admin/proposal_notifications_spec.rb index 21b81f71b..c3807ad2f 100644 --- a/spec/system/admin/proposal_notifications_spec.rb +++ b/spec/system/admin/proposal_notifications_spec.rb @@ -31,8 +31,6 @@ describe "Admin proposal notifications", :admin do expect(page).not_to have_content(proposal_notification.title) click_link("Confirmed") expect(page).to have_content(proposal_notification.title) - - expect(proposal_notification.reload).to be_confirmed_hide end scenario "Current filter is properly highlighted" do diff --git a/spec/system/admin/proposals_spec.rb b/spec/system/admin/proposals_spec.rb index 055f47d6c..5258f05b6 100644 --- a/spec/system/admin/proposals_spec.rb +++ b/spec/system/admin/proposals_spec.rb @@ -80,7 +80,6 @@ describe "Admin proposals", :admin do expect(page).to have_content "Proposal updated successfully" expect(find_field("Mark as selected")).to be_checked - expect(proposal.reload.selected?).to be true end scenario "Unselect a proposal" do @@ -93,7 +92,6 @@ describe "Admin proposals", :admin do expect(page).to have_content "Proposal updated successfully" expect(find_field("Mark as selected")).not_to be_checked - expect(proposal.reload.selected?).to be false end end end diff --git a/spec/system/budget_polls/budgets_spec.rb b/spec/system/budget_polls/budgets_spec.rb index 548488776..39355040c 100644 --- a/spec/system/budget_polls/budgets_spec.rb +++ b/spec/system/budget_polls/budgets_spec.rb @@ -15,15 +15,12 @@ describe "Admin Budgets", :admin do expect(page).to have_content(budget.name) expect(page).to have_content(balloting_phase.starts_at.to_date) expect(page).to have_content(balloting_phase.ends_at.to_date) - - expect(Poll.count).to eq(1) - expect(Poll.last.budget).to eq(budget) end scenario "Create poll in current locale if the budget does not have a poll associated" do - budget = create(:budget, - name_en: "Budget for climate change", - name_fr: "Budget pour le changement climatique") + create(:budget, + name_en: "Budget for climate change", + name_fr: "Budget pour le changement climatique") visit admin_budgets_path select("Français", from: "locale-switcher") @@ -32,9 +29,6 @@ describe "Admin Budgets", :admin do expect(page).to have_current_path(/admin\/polls\/\d+/) expect(page).to have_content("Budget pour le changement climatique") - - expect(Poll.count).to eq(1) - expect(Poll.last.budget).to eq(budget) end scenario "Display link to poll if the budget has a poll associated" do diff --git a/spec/system/debates_spec.rb b/spec/system/debates_spec.rb index bb5e66138..4064d5a2d 100644 --- a/spec/system/debates_spec.rb +++ b/spec/system/debates_spec.rb @@ -529,12 +529,9 @@ describe "Debates" do expect(page).not_to have_css(".recommendation", count: 3) expect(page).to have_content("Recommendations for debates are now disabled for this account") - user.reload - visit account_path expect(find("#account_recommended_debates")).not_to be_checked - expect(user.recommended_debates).to be(false) end end end diff --git a/spec/system/proposals_spec.rb b/spec/system/proposals_spec.rb index 6948474c8..b4ced38a1 100644 --- a/spec/system/proposals_spec.rb +++ b/spec/system/proposals_spec.rb @@ -929,12 +929,9 @@ describe "Proposals" do expect(page).not_to have_css(".recommendation", count: 3) expect(page).to have_content("Recommendations for proposals are now disabled for this account") - user.reload - visit account_path expect(find("#account_recommended_proposals")).not_to be_checked - expect(user.recommended_proposals).to be(false) end end end