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

changes copy

Browse Source 
proposal -> investment
This commit is contained in:
Juanjo Bazán
2017-05-10 12:20:38 +02:00
parent 16cb6bf365
commit 3b90a40476
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/locales/budgets.en.yml
View File

@@ -8,13 +8,13 @@ en:
no_balloted_group_yet: "You have not voted on this group yet, go vote!"
remove: Remove vote
voted_html:
one: "You have voted <span>one</span> proposal."
other: "You have voted <span>%{count}</span> proposals."
one: "You have voted <span>one</span> investment."
other: "You have voted <span>%{count}</span> investments."
voted_info_html: "You can change your vote at any time until the close of this phase.<br> No need to invest all the money available."
zero: You have not voted any investment project.
reasons_for_not_balloting:
not_logged_in: You must %{signin} or %{signup} to continue.
not_verified: Only verified users can vote on proposals; %{verify_account}.
not_verified: Only verified users can vote on investments; %{verify_account}.
organization: Organizations are not permitted to vote
not_selected: Unselected investment projects can not be supported
not_enough_money: "Price is higher than the available amount left."

16
spec/features/budgets/ballots_spec.rb
View File

@@ -101,7 +101,7 @@ feature 'Ballots' do
context "Adding and Removing Investments" do
scenario "Add a proposal", :js do
scenario "Add a investment", :js do
investment1 = create(:budget_investment, :selected, heading: new_york, price: 10000)
investment2 = create(:budget_investment, :selected, heading: new_york, price: 20000)
@@ -130,7 +130,7 @@ feature 'Ballots' do
end
end
scenario "Removing a proposal", :js do
scenario "Removing a investment", :js do
investment = create(:budget_investment, :selected, heading: new_york, price: 10000)
ballot = create(:budget_ballot, user: user, budget: budget)
ballot.investments << investment
@@ -335,7 +335,7 @@ feature 'Ballots' do
login_as(user)
visit budget_ballot_path(budget)
expect(page).to have_content("You have voted 5 proposals")
expect(page).to have_content("You have voted 5 investments")
within("#budget_group_#{group1.id}") do
expect(page).to have_content "#{group1.name} - #{heading1.name}"
@@ -372,14 +372,14 @@ feature 'Ballots' do
login_as(user)
visit budget_ballot_path(budget)
expect(page).to have_content("You have voted one proposal")
expect(page).to have_content("You have voted one investment")
within("#budget_investment_#{investment.id}") do
find(".remove-investment-project").trigger('click')
end
expect(current_path).to eq(budget_ballot_path(budget))
expect(page).to have_content("You have voted 0 proposals")
expect(page).to have_content("You have voted 0 investments")
end
scenario 'Removing investments from ballot (sidebar)', :js do
@@ -428,13 +428,13 @@ feature 'Ballots' do
click_link "Check my ballot"
expect(page).to have_content("You have voted one proposal")
expect(page).to have_content("You have voted one investment")
within("#budget_investment_#{investment.id}") do
find(".remove-investment-project").trigger('click')
end
expect(page).to have_content("You have voted 0 proposals")
expect(page).to have_content("You have voted 0 investments")
click_link "Go back"
@@ -464,7 +464,7 @@ feature 'Ballots' do
within("#budget_investment_#{investment.id}") do
find("div.ballot").hover
expect(page).to have_content 'Only verified users can vote on proposals'
expect(page).to have_content 'Only verified users can vote on investments'
expect(page).to have_selector('.in-favor a', visible: false)
end
end