From fa33859c580e8f9f61df95f5dae2ebca2457eeeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= Date: Fri, 26 Feb 2016 11:01:35 +0100 Subject: [PATCH] fights a flaky test --- .../admin/spending_proposals_controller.rb | 16 ++++++++-------- spec/features/admin/spending_proposals_spec.rb | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/controllers/admin/spending_proposals_controller.rb b/app/controllers/admin/spending_proposals_controller.rb index f01bcfa6d..f2dc2da18 100644 --- a/app/controllers/admin/spending_proposals_controller.rb +++ b/app/controllers/admin/spending_proposals_controller.rb @@ -29,14 +29,14 @@ class Admin::SpendingProposalsController < Admin::BaseController private def geozone_filter(geozone) - case geozone - when nil - @spending_proposals - when 'all' - @spending_proposals.where(geozone_id: nil) - else - @spending_proposals.where(geozone_id: params[:geozone_id].presence) - end + case geozone + when nil + @spending_proposals + when 'all' + @spending_proposals.where(geozone_id: nil) + else + @spending_proposals.where(geozone_id: params[:geozone_id].presence) + end end end diff --git a/spec/features/admin/spending_proposals_spec.rb b/spec/features/admin/spending_proposals_spec.rb index e5f77808c..8e1c19c0e 100644 --- a/spec/features/admin/spending_proposals_spec.rb +++ b/spec/features/admin/spending_proposals_spec.rb @@ -158,9 +158,9 @@ feature 'Admin spending proposals' do expect(page).to have_select('spending_proposal[administrator_id]', selected: 'Undefined') select 'Ana (ana@admins.org)', from: 'spending_proposal[administrator_id]' - expect(page).to have_select('spending_proposal[administrator_id]', selected: 'Ana (ana@admins.org)') - visit admin_spending_proposal_path(spending_proposal) + visit admin_spending_proposals_path + click_link spending_proposal.title expect(page).to have_select('spending_proposal[administrator_id]', selected: 'Ana (ana@admins.org)') end