consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fights a flaky test

Browse Source
This commit is contained in:
Juanjo Bazán
2016-02-26 11:01:35 +01:00
committed by Juanjo Bazán
parent 0d48d4295c
commit fa33859c58
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/admin/spending_proposals_controller.rb
View File

@@ -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

4
spec/features/admin/spending_proposals_spec.rb
View File

@@ -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