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

Merge branch 'master' into voting-proposals

Browse Source 
Conflicts:
	app/models/proposal.rb
	app/views/proposals/_proposal.html.erb
	app/views/proposals/index.html.erb
	app/views/proposals/show.html.erb
	spec/support/common_actions.rb
This commit is contained in:
Alberto Garcia Cabeza
2016-09-15 13:58:53 +02:00
parent 7abd31e4bf e0c3f7c029
commit 910b24936d
31 changed files with 597 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spec/support/common_actions.rb
View File

@@ -197,6 +197,11 @@ module CommonActions
create(:proposal, title: "Fire and blood", question: "You talking to me?", cached_votes_up: Proposal.votes_needed_for_success + 1)]
end
def create_archived_proposals
[create(:proposal, title: "This is an expired proposal", created_at: Setting["months_to_archive_proposals"].to_i.months.ago),
create(:proposal, title: "This is an oldest expired proposal", created_at: (Setting["months_to_archive_proposals"].to_i + 2).months.ago)]
end
def tag_names(tag_cloud)
tag_cloud.tags.map(&:name)
end