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

Merge pull request #615 from AyuntamientoMadrid/default-print-order

Browse Source 
defaults proposal print list to confidence_score
This commit is contained in:
Raimond Garcia
2015-10-19 10:10:20 +02:00
parent 31410b8c8b 2a4495fd36
commit eeb5610cb8
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/management/proposals_controller.rb
View File

@@ -6,7 +6,7 @@ class Management::ProposalsController < Management::BaseController
before_action :set_proposal, only: [:vote, :show]
before_action :parse_search_terms, only: :index
has_orders %w{hot_score confidence_score created_at most_commented random}, only: [:index, :print]
has_orders %w{confidence_score hot_score created_at most_commented random}, only: [:index, :print]
def vote
@proposal.register_vote(current_user, 'yes')

15
spec/features/management/proposals_spec.rb
View File

@@ -117,8 +117,8 @@ feature 'Proposals' do
end
scenario "Filtering proposals to be printed", :js do
create(:proposal, title: 'Best proposal').update_column(:confidence_score, 10)
create(:proposal, title: 'Worst proposal').update_column(:confidence_score, 2)
create(:proposal, title: 'Best proposal').update_column(:confidence_score, 10)
create(:proposal, title: 'Medium proposal').update_column(:confidence_score, 5)
user = create(:user, :level_two)
@@ -126,8 +126,6 @@ feature 'Proposals' do
click_link "Print proposals"
select 'most supported', from: 'order-selector'
expect(page).to have_selector('.js-order-selector[data-order="confidence_score"]')
within '#proposals' do
@@ -135,8 +133,17 @@ feature 'Proposals' do
expect('Medium proposal').to appear_before('Worst proposal')
end
expect(current_url).to include('order=confidence_score')
select 'newest', from: 'order-selector'
expect(page).to have_selector('.js-order-selector[data-order="created_at"]')
expect(current_url).to include('order=created_at')
expect(current_url).to include('page=1')
within '#proposals' do
expect('Medium proposal').to appear_before('Best proposal')
expect('Best proposal').to appear_before('Worst proposal')
end
end
end