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

Merge pull request #4802 from consul/typos

Browse Source 
Fix typos in the English version
This commit is contained in:
Javi Martín
2022-06-01 14:45:50 +02:00
committed by GitHub
parent 0141c51f5f cd3b196a04
commit 5c317927c0
33 changed files with 104 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/views/account/show.html.erb
View File

@@ -94,15 +94,15 @@
<p><%= t("account.show.user_permission_info") %></p>
<ul>
<li><span class="icon-check"></span>&nbsp;<%= t("account.show.user_permission_debates") %></li>
<li><span class="icon-check"></span>&nbsp;<%= t("account.show.user_permission_proposal") %></li>
<li><span class="icon-check"></span>&nbsp;<%= t("verification.user_permission_debates") %></li>
<li><span class="icon-check"></span>&nbsp;<%= t("verification.user_permission_proposal") %></li>
<li>
<% if current_user.level_two_or_three_verified? %>
<span class="icon-check"></span>
<% else %>
<span class="icon-x"></span>
<% end %>
<%= t("account.show.user_permission_support_proposal") %>
<%= t("verification.user_permission_support_proposal") %>
</li>
<li>
<% if current_user.level_three_verified? %>
@@ -110,13 +110,10 @@
<% else %>
<span class="icon-x"></span>
<% end %>
<%= t("account.show.user_permission_votes") %>
<%= t("verification.user_permission_votes") %>
</li>
</ul>
<p>
<span><%= t("account.show.user_permission_verify_info") %></span>
</p>
<p>
<%= t("account.show.user_permission_verify") %>
</p>

4
app/views/management/_user_permissions.html.erb
View File

@@ -7,10 +7,10 @@
<p><%= message %></p>
<ul>
<% [:debates, :create_proposals, :support_proposals, :vote_proposals].each do |permission| %>
<% [:debates, :proposal, :support_proposal, :votes].each do |permission| %>
<li>
<span class="<%= permissions.include?(permission) ? "icon-check" : "icon-x" %>"></span>
<%= t("management.permissions.#{permission}") %>
<%= t("verification.user_permission_#{permission}") %>
</li>
<% end %>
</ul>

2
app/views/management/document_verifications/invalid_document.html.erb
View File

@@ -8,7 +8,7 @@
<%= render "management/user_permissions",
message: t("management.document_verifications.not_in_census_info"),
permissions: [:debates, :create_proposals] %>
permissions: [:debates, :proposal] %>
<p>
<%= sanitize(t("management.document_verifications.has_no_account",

2
app/views/management/document_verifications/new.html.erb
View File

@@ -4,7 +4,7 @@
<%= render "management/user_permissions",
message: t("management.document_verifications.in_census_has_following_permissions"),
permissions: [:debates, :create_proposals, :support_proposals] %>
permissions: [:debates, :proposal, :support_proposal] %>
<%= form_for @document_verification,
as: :document_verification,

2
app/views/management/document_verifications/verified.html.erb
View File

@@ -4,6 +4,6 @@
<%= render "management/user_permissions",
message: t("management.document_verifications.in_census_has_following_permissions"),
permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %>
permissions: [:debates, :proposal, :support_proposal, :votes] %>
<a href="javascript:window.print();" class="button warning"><%= t("management.print_info") %></a>

2
app/views/management/email_verifications/sent.html.erb
View File

@@ -4,7 +4,7 @@
<%= render "management/user_permissions",
message: t("management.email_verifications.document_found_in_census"),
permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %>
permissions: [:debates, :proposal, :support_proposal, :votes] %>
<p>
<a href="javascript:window.print();" class="button warning"><%= t("management.print_info") %></a>

2
app/views/management/users/new.html.erb
View File

@@ -25,6 +25,6 @@
<div class="callout">
<%= render "management/user_permissions",
message: t("management.document_verifications.in_census_has_following_permissions"),
permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %>
permissions: [:debates, :proposal, :support_proposal, :votes] %>
</div>
</div>

2
app/views/management/users/show.html.erb
View File

@@ -6,6 +6,6 @@
<%= render "management/user_permissions",
message: t("management.document_verifications.in_census_has_following_permissions"),
permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %>
permissions: [:debates, :proposal, :support_proposal, :votes] %>
<a href="javascript:window.print();" class="button warning radius"><%= t("management.print_info") %></a>

8
config/locales/en/activerecord.yml
View File

@@ -256,7 +256,7 @@ en:
question: "Question"
description: "Description"
responsible_name: "Full name of the person submitting the proposal"
retired_reason: "Reason to retire the proposal"
retired_reason: "Reason to withdraw the proposal"
selected: "Mark as selected"
terms_of_service: "Terms of service"
video_url: "External video URL"
@@ -276,15 +276,15 @@ en:
email_on_comment: "Notify me by email when someone comments on my contents"
email_on_comment_reply: "Notify me by email when someone replies to my comments"
email_on_direct_message: "Receive emails about direct messages"
newsletter: "Receive by email website relevant information"
newsletter: "Receive relevant information by email"
official_position: "Official position"
official_position_badge: "Show official position badge"
official_level: "Official level"
phone_number: "Phone number"
public_activity: "Keep my list of activities public"
public_interests: "Keep the elements I follow public"
recommended_debates: "Show debates recommendations"
recommended_proposals: "Show proposals recommendations"
recommended_debates: "Recommend debates to me"
recommended_proposals: "Recommend proposals to me"
redeemable_code: "Verification code received via email"
direct_message:
title: "Title"

2
config/locales/en/admin.yml
View File

@@ -807,7 +807,7 @@ en:
segment_recipient:
all_users: All users
administrators: Administrators
all_proposal_authors: Proposal authors (including archived and retired)
all_proposal_authors: Proposal authors (including archived and withdrawn)
proposal_authors: Proposal authors
investment_authors: Investment authors in the current budget
feasible_and_undecided_investment_authors: "Authors of some investment in the current budget that does not comply with: [valuation finished unfesasible]"

50
config/locales/en/general.yml
View File

@@ -1,7 +1,7 @@
en:
account:
show:
change_credentials_link: Change my credentials
change_credentials_link: Change my login details
erase_account_link: Erase my account
finish_verification: Complete verification
notifications: Notifications
@@ -11,14 +11,9 @@ en:
save_changes_submit: Save changes
recommendations: Recommendations
title: My account
user_permission_debates: Participate on debates
user_permission_info: With your account you can...
user_permission_proposal: Create new proposals
user_permission_support_proposal: Support proposals
user_permission_title: Participation
user_permission_verify: To perform all the actions verify your account.
user_permission_verify_info: "* Only for users on Census."
user_permission_votes: Participate on final voting
verified_account: Account verified
verify_my_account: Verify my account
application:
@@ -102,7 +97,7 @@ en:
recommendations:
without_results: There are no debates related to your interests
without_interests: Follow proposals so we can give you recommendations
disable: "Debates recommendations will stop showing if you dismiss them. You can enable them again in 'My account' page"
disable: "Recommendations for debates will stop showing if you dismiss them. You can enable them again in 'My account' page"
actions:
success: "Recommendations for debates are now disabled for this account"
error: "An error has occured. Please go to 'My account' page to manually disable recommendations for debates"
@@ -115,9 +110,9 @@ en:
section_header:
icon_alt: Debates icon
title: Debates
help: Help about debates
help: Help with debates
section_footer:
title: Help about debates
title: Help with debates
description: Start a debate to share opinions with others about the topics you are concerned about.
help_text_1: "The space for citizen debates is aimed at anyone who can expose issues of their concern and those who want to share opinions with other people."
help_text_2: 'To open a debate you need to sign up on %{org}. Users can also comment on open debates and rate them with the "I agree" or "I disagree" buttons found in each of them.'
@@ -195,7 +190,7 @@ en:
proposal_header:
published: Published
draft: Draft
retired: Retired
retired: Withdrawn
proposal_totals:
active_resources: Active resources
community: Participants in your community
@@ -312,11 +307,11 @@ en:
submit_button: Save changes
show_link: View proposal
retire_form:
title: Retire proposal
warning: "If you retire the proposal it would still accept supports, but will be removed from the main list and a message will be visible to all users stating that the author considers the proposal should not be supported anymore"
title: Withdraw proposal
warning: "If you withdraw the proposal it will still accept supports, but will be removed from the main list and a message will be visible to all users stating that the author considers the proposal should not be supported anymore"
retired_reason_blank: Choose an option
retired_explanation_placeholder: Explain shortly why you think this proposal should not receive more supports
submit_button: Retire proposal
submit_button: Withdraw proposal
retire_options:
duplicated: Duplicated
started: Already underway
@@ -347,12 +342,12 @@ en:
recommendations:
without_results: There are not proposals related to your interests
without_interests: Follow proposals so we can give you recommendations
disable: "Proposals recommendations will stop showing if you dismiss them. You can enable them again in 'My account' page"
disable: "Recommendations for proposals will stop showing if you dismiss them. You can enable them again in 'My account' page"
actions:
success: "Recommendations for proposals are now disabled for this account"
error: "An error has occured. Please go to 'My account' page to manually disable recommendations for proposals"
retired_proposals: Retired proposals
retired_proposals_link: "Proposals retired by the author"
retired_proposals: Withdrawn proposals
retired_proposals_link: "Proposals withdrawn by the author"
selected_proposals: Selected proposals
selected_proposals_link: View selected proposals
archived_proposals: Archived proposals
@@ -378,9 +373,9 @@ en:
section_header:
icon_alt: Proposals icon
title: Proposals
help: Help about proposals
help: Help with proposals
section_footer:
title: Help about proposals
title: Help with proposals
description: Citizens' proposals are an opportunity for neighbours and collectives to decide directly how they want their city to be, after getting sufficient support and submitting to a citizens' vote.
new:
form:
@@ -392,7 +387,7 @@ en:
recommendations_title: Recommendations for creating a proposal
start_new: Create new proposal
notice:
retired: Proposal retired
retired: The proposal has been withdrawn
published: The proposal has been published
proposal:
created: "You've created a proposal!"
@@ -436,7 +431,7 @@ en:
milestones_tab: Milestones
retired_warning: "The author considers this proposal should not receive more supports."
retired_warning_link_to_explanation: Read the explanation before voting for it.
retired: Proposal retired by the author
retired: Proposal withdrawn by the author
share: Share
no_notifications: "This proposal has no notifications."
embed_video_title: "Video on %{proposal}"
@@ -476,7 +471,7 @@ en:
title: Edition
edit_proposal_link: Edit proposal
publish: Publish proposal
retire: Retire proposal
retire: Withdraw proposal
new_request:
links: Links
resources:
@@ -610,9 +605,9 @@ en:
section_header:
icon_alt: Voting icon
title: Voting
help: Help about voting
help: Help with voting
section_footer:
title: Help about voting
title: Help with voting
description: Citizens' polls are a participatory mechanism by which citizens with voting rights can make direct decisions
no_polls: "There are no open votings."
show:
@@ -837,12 +832,12 @@ en:
send_private_message: "Send private message"
delete_alert: "Are you sure you want to delete your investment project? This action can't be undone"
proposals:
retired: "Retired proposal"
retired: "Withdrawn proposal"
draft: Draft
published: Published
see: "See proposal"
actions: Actions
retired_help_text: Dashboard not available for retired proposals
retired_help_text: Dashboard not available for withdrawn proposals
votes:
agree: I agree
agree_label: "I agree with %{title}"
@@ -893,14 +888,9 @@ en:
go_to_index: Not now, go to index page
start_using_consul: Go to index page
title: Participate
user_permission_debates: Participate on debates
user_permission_info: With your account you can...
user_permission_proposal: Create new proposals
user_permission_support_proposal: Support proposals*
user_permission_verify: "To perform the following actions verify your account."
user_permission_verify_info: "* Only for users on Census."
user_permission_verify_my_account: Verify my account
user_permission_votes: Participate on final voting
invisible_captcha:
sentence_for_humans: "If you are human, ignore this field"
timestamp_error_message: "Sorry, that was too quick! Please resubmit."

4
config/locales/en/legislation.yml
View File

@@ -64,9 +64,9 @@ en:
section_header:
icon_alt: Collaborative legislation icon
title: Collaborative legislation
help: Help about collaborative legislation
help: Help with collaborative legislation
section_footer:
title: Help about collaborative legislation
title: Help with collaborative legislation
description: Participate in the debates and processes prior to the approval of new regulations or strategies. Your opinion will be considered.
phase_not_open:
not_open: This phase is not open yet

5
config/locales/en/management.yml
View File

@@ -64,11 +64,6 @@ en:
users: Users management
user_invites: Send invitations
select_user: Select user
permissions:
create_proposals: Create proposals
debates: Engage in debates
support_proposals: Support proposals
vote_proposals: Vote proposals
print:
proposals_info: Create your proposal on http://url.consul
proposals_title: "Proposals:"

8
config/locales/en/verification.yml
View File

@@ -26,7 +26,7 @@ en:
errors:
incorrect_code: Verification code incorrect
new:
explanation: "For participate on final voting you can:"
explanation: "In order to vote for budget projects you can:"
go_to_index: See proposals
office: Verify in any Citizen Support Offices
send_letter: Send me a letter with the code
@@ -87,11 +87,11 @@ en:
step_1: Residence
step_2: Confirmation code
step_3: Final verification
user_permission_debates: Participate on debates
user_permission_debates: Participate in debates
user_permission_info: Verifying your information you'll be able to...
user_permission_proposal: Create new proposals
user_permission_support_proposal: Support proposals*
user_permission_votes: Participate on final voting*
user_permission_support_proposal: Support proposals
user_permission_votes: Vote for budget projects
verified_user:
form:
submit_button: Send code

10
config/locales/es/general.yml
View File

@@ -11,14 +11,9 @@ es:
save_changes_submit: Guardar cambios
recommendations: Recomendaciones
title: Mi cuenta
user_permission_debates: Participar en debates
user_permission_info: Con tu cuenta ya puedes...
user_permission_proposal: Crear nuevas propuestas
user_permission_support_proposal: Apoyar propuestas*
user_permission_title: Participación
user_permission_verify: Para poder realizar todas las acciones, verifica tu cuenta.
user_permission_verify_info: "* Sólo usuarios empadronados."
user_permission_votes: Participar en las votaciones finales*
verified_account: Cuenta verificada
verify_my_account: Verificar mi cuenta
application:
@@ -893,14 +888,9 @@ es:
go_to_index: Ahora no, ir a la página de inicio
start_using_consul: Ir a la página de inicio
title: Empieza a participar
user_permission_debates: Participar en debates
user_permission_info: Con tu cuenta ya puedes...
user_permission_proposal: Crear nuevas propuestas
user_permission_support_proposal: Apoyar propuestas*
user_permission_verify: "Para poder realizar las siguientes acciones, verifica tu cuenta."
user_permission_verify_info: "* Sólo usuarios empadronados."
user_permission_verify_my_account: Verificar mi cuenta
user_permission_votes: Participar en las votaciones finales*
invisible_captcha:
sentence_for_humans: "Si eres humano, por favor ignora este campo"
timestamp_error_message: "Eso ha sido demasiado rápido. Por favor, reenvía el formulario."

5
config/locales/es/management.yml
View File

@@ -64,11 +64,6 @@ es:
users: Gestión de usuarios
user_invites: Enviar invitaciones
select_user: Seleccionar usuario
permissions:
create_proposals: Crear nuevas propuestas
debates: Participar en debates
support_proposals: Apoyar propuestas
vote_proposals: Participar en las votaciones finales
print:
proposals_info: Haz tu propuesta en http://url.consul
proposals_title: "Propuestas:"

4
config/locales/es/verification.yml
View File

@@ -26,7 +26,7 @@ es:
errors:
incorrect_code: Código de verificación incorrecto
new:
explanation: "Para participar en las votaciones finales puedes:"
explanation: "Para votar proyectos en los presupuestos participativos puedes:"
go_to_index: Ver propuestas
office: Verificarte presencialmente en cualquier Oficina de Atención al Ciudadano
send_letter: Solicitar una carta por correo postal
@@ -91,7 +91,7 @@ es:
user_permission_info: Al verificar tus datos podrás...
user_permission_proposal: Crear nuevas propuestas
user_permission_support_proposal: Apoyar propuestas
user_permission_votes: Participar en las votaciones finales*
user_permission_votes: Votar proyectos en los presupuestos participativos
verified_user:
form:
submit_button: Enviar código

10
db/pages/welcome_level_three_verified.rb
View File

@@ -3,14 +3,12 @@ def generate_content(page)
page.content = "<p>#{I18n.t("welcome.welcome.user_permission_info")}</p>
<ul>
<li>#{I18n.t("welcome.welcome.user_permission_debates")}</li>
<li>#{I18n.t("welcome.welcome.user_permission_proposal")}</li>
<li>#{I18n.t("welcome.welcome.user_permission_support_proposal")}</li>
<li>#{I18n.t("welcome.welcome.user_permission_votes")}</li>
<li>#{I18n.t("verification.user_permission_debates")}</li>
<li>#{I18n.t("verification.user_permission_proposal")}</li>
<li>#{I18n.t("verification.user_permission_support_proposal")}</li>
<li>#{I18n.t("verification.user_permission_votes")}</li>
</ul>
<p>#{I18n.t("welcome.welcome.user_permission_verify_info")}</p>
<p>#{I18n.t("account.show.verified_account")}</p>
<p><a href='/'>#{I18n.t("welcome.welcome.start_using_consul")}</a></p>"

10
db/pages/welcome_level_two_verified.rb
View File

@@ -3,18 +3,16 @@ def generate_content(page)
page.content = "<p>#{I18n.t("welcome.welcome.user_permission_info")}</p>
<ul>
<li>#{I18n.t("welcome.welcome.user_permission_debates")}</li>
<li>#{I18n.t("welcome.welcome.user_permission_proposal")}</li>
<li>#{I18n.t("welcome.welcome.user_permission_support_proposal")}</li>
<li>#{I18n.t("verification.user_permission_debates")}</li>
<li>#{I18n.t("verification.user_permission_proposal")}</li>
<li>#{I18n.t("verification.user_permission_support_proposal")}</li>
</ul>
<p>#{I18n.t("welcome.welcome.user_permission_verify")}</p>
<ul>
<li>#{I18n.t("welcome.welcome.user_permission_votes")}</li>
<li>#{I18n.t("verification.user_permission_votes")}</li>
</ul>
<p>#{I18n.t("welcome.welcome.user_permission_verify_info")}</p>
<a href='/verification' class='button success radius expand'>
#{I18n.t("welcome.welcome.user_permission_verify_my_account")}
</a>

10
db/pages/welcome_not_verified.rb
View File

@@ -3,18 +3,16 @@ def generate_content(page)
page.content = "<p>#{I18n.t("welcome.welcome.user_permission_info")}</p>
<ul>
<li>#{I18n.t("welcome.welcome.user_permission_debates")}</li>
<li>#{I18n.t("welcome.welcome.user_permission_proposal")}</li>
<li>#{I18n.t("verification.user_permission_debates")}</li>
<li>#{I18n.t("verification.user_permission_proposal")}</li>
</ul>
<p>#{I18n.t("welcome.welcome.user_permission_verify")}</p>
<ul>
<li>#{I18n.t("welcome.welcome.user_permission_support_proposal")}</li>
<li>#{I18n.t("welcome.welcome.user_permission_votes")}</li>
<li>#{I18n.t("verification.user_permission_support_proposal")}</li>
<li>#{I18n.t("verification.user_permission_votes")}</li>
</ul>
<p>#{I18n.t("welcome.welcome.user_permission_verify_info")}</p>
<a href='/verification' class='button success radius expand'>
#{I18n.t("welcome.welcome.user_permission_verify_my_account")}
</a>

2
spec/components/subscriptions/edit_component_spec.rb
View File

@@ -10,7 +10,7 @@ describe Subscriptions::EditComponent do
expect(page).to have_content "Notifications"
expect(page).to have_field "Notify me by email when someone comments on my contents", type: :checkbox
expect(page).to have_field "Notify me by email when someone replies to my comments", type: :checkbox
expect(page).to have_field "Receive by email website relevant information", type: :checkbox
expect(page).to have_field "Receive relevant information by email", type: :checkbox
expect(page).to have_field "Receive a summary of proposal notifications", type: :checkbox
expect(page).to have_field "Receive emails about direct messages", type: :checkbox
expect(page).to have_button "Save changes"

2
spec/models/related_content_spec.rb
View File

@@ -91,7 +91,7 @@ describe RelatedContent do
expect(parent_relationable.relationed_contents).to eq [child_relationable]
end
it "returns related contents without retired proposals" do
it "returns related contents without withdrawn proposals" do
create(
:related_content,
parent_relationable: parent_relationable,

31
spec/system/account_spec.rb
View File

@@ -53,7 +53,7 @@ describe "Account" do
scenario "Edit email address" do
visit account_path
click_link "Change my credentials"
click_link "Change my login details"
fill_in "user_email", with: "new_user_email@example.com"
fill_in "user_password", with: "new_password"
fill_in "user_password_confirmation", with: "new_password"
@@ -80,7 +80,7 @@ describe "Account" do
expect(page).to have_content "You have been signed in successfully."
visit account_path
click_link "Change my credentials"
click_link "Change my login details"
expect(page).to have_selector("input[value='new_user_email@example.com']")
end
@@ -150,8 +150,7 @@ describe "Account" do
expect(page).to have_current_path(account_path, ignore_query: true)
expect(page).to have_link("Change my credentials")
click_link "Change my credentials"
click_link "Change my login details"
click_button "Update"
expect(page).to have_content error_message
@@ -199,31 +198,27 @@ describe "Account" do
scenario "are enabled by default" do
visit account_path
expect(page).to have_content("Recommendations")
expect(page).to have_content("Show debates recommendations")
expect(page).to have_content("Show proposals recommendations")
expect(find("#account_recommended_debates")).to be_checked
expect(find("#account_recommended_proposals")).to be_checked
expect(page).to have_content "Recommendations"
expect(page).to have_field "Recommend debates to me", checked: true
expect(page).to have_field "Recommend proposals to me", checked: true
end
scenario "can be disabled through 'My account' page" do
visit account_path
expect(page).to have_content("Recommendations")
expect(page).to have_content("Show debates recommendations")
expect(page).to have_content("Show proposals recommendations")
expect(find("#account_recommended_debates")).to be_checked
expect(find("#account_recommended_proposals")).to be_checked
expect(page).to have_content "Recommendations"
expect(page).to have_field "Recommend debates to me", checked: true
expect(page).to have_field "Recommend proposals to me", checked: true
uncheck "account_recommended_debates"
uncheck "account_recommended_proposals"
uncheck "Recommend debates to me"
uncheck "Recommend proposals to me"
click_button "Save changes"
expect(page).to have_content "Changes saved"
expect(find("#account_recommended_debates")).not_to be_checked
expect(find("#account_recommended_proposals")).not_to be_checked
expect(page).to have_field "Recommend debates to me", checked: false
expect(page).to have_field "Recommend proposals to me", checked: false
visit debates_path

8
spec/system/admin/site_customization/information_texts_spec.rb
View File

@@ -5,10 +5,10 @@ describe "Admin custom information texts", :admin do
visit admin_site_customization_information_texts_path
click_link "Basic customization"
expect(page).to have_content "Help about debates"
expect(page).to have_content "Help about proposals"
expect(page).to have_content "Help about voting"
expect(page).to have_content "Help about collaborative legislation"
expect(page).to have_content "Help with debates"
expect(page).to have_content "Help with proposals"
expect(page).to have_content "Help with voting"
expect(page).to have_content "Help with collaborative legislation"
expect(page).to have_content "Help with participatory budgets"
within("#information-texts-tabs") { click_link "Debates" }

2
spec/system/dashboard/dashboard_spec.rb
View File

@@ -9,7 +9,7 @@ describe "Proposal's dashboard" do
expect(page).to have_link("Edit my proposal")
expect(page).to have_link("Edit proposal")
expect(page).to have_link("Retire proposal")
expect(page).to have_link("Withdraw proposal")
expect(page).to have_link("Publish proposal")
expect(page).to have_link("Polls")
expect(page).to have_link("E-mail")

2
spec/system/emails_spec.rb
View File

@@ -497,7 +497,7 @@ describe "Emails" do
expect(email).to have_body_text("To unsubscribe from these emails, visit")
expect(email).to have_body_text(
edit_subscriptions_path(token: user_with_newsletter_in_segment_2.subscriptions_token))
expect(email).to have_body_text('and uncheck "Receive by email website relevant information"')
expect(email).to have_body_text('and uncheck "Receive relevant information by email"')
end
end

2
spec/system/management/document_verifications_spec.rb
View File

@@ -20,7 +20,7 @@ describe "DocumentVerifications" do
fill_in "document_verification_document_number", with: user.document_number
click_button "Check document"
expect(page).to have_content "Vote proposals"
expect(page).to have_content "Vote for budget projects"
click_button "Verify"

2
spec/system/management/managed_users_spec.rb
View File

@@ -34,7 +34,7 @@ describe "Managed User" do
fill_in "document_verification_document_number", with: user.document_number
click_button "Check document"
expect(page).to have_content "Vote proposals"
expect(page).to have_content "Vote for budget projects"
click_button "Verify"

2
spec/system/proposal_notifications_spec.rb
View File

@@ -310,7 +310,7 @@ describe "Proposal Notifications" do
expect(page).to have_content "This resource is not available anymore"
end
scenario "Proposal retired by author" do
scenario "Proposal withdrawn by its author" do
author = create(:user)
user = create(:user)
proposal = create(:proposal, :retired, author: author, followers: [user])

26
spec/system/proposals_spec.rb
View File

@@ -585,8 +585,8 @@ describe "Proposals" do
end
end
context "Retired proposals" do
scenario "Retire" do
context "Withdrawn proposals" do
scenario "Withdraw" do
proposal = create(:proposal)
login_as(proposal.author)
@@ -599,20 +599,20 @@ describe "Proposals" do
click_link "Edit my proposal"
end
within_window(window_opened_by { click_link "Retire proposal" }) do
within_window(window_opened_by { click_link "Withdraw proposal" }) do
expect(page).to have_current_path(retire_form_proposal_path(proposal))
select "Duplicated", from: "proposal_retired_reason"
fill_in "Explanation", with: "There are three other better proposals with the same subject"
click_button "Retire proposal"
click_button "Withdraw proposal"
expect(page).to have_content "Proposal retired"
expect(page).to have_content "The proposal has been withdrawn"
end
visit proposal_path(proposal)
expect(page).to have_content proposal.title
expect(page).to have_content "Proposal retired by the author"
expect(page).to have_content "Proposal withdrawn by the author"
expect(page).to have_content "Duplicated"
expect(page).to have_content "There are three other better proposals with the same subject"
end
@@ -623,13 +623,13 @@ describe "Proposals" do
visit retire_form_proposal_path(proposal)
click_button "Retire proposal"
click_button "Withdraw proposal"
expect(page).not_to have_content "Proposal retired"
expect(page).not_to have_content "The proposal has been withdrawn"
expect(page).to have_content "can't be blank", count: 2
end
scenario "Index do not list retired proposals by default" do
scenario "Index does not list withdrawn proposals by default" do
Setting["feature.featured_proposals"] = true
create_featured_proposals
not_retired = create(:proposal)
@@ -644,20 +644,20 @@ describe "Proposals" do
end
end
scenario "Index has a link to retired proposals list" do
scenario "Index has a link to the list of withdrawn proposals" do
not_retired = create(:proposal)
retired = create(:proposal, :retired)
visit proposals_path
expect(page).not_to have_content retired.title
click_link "Proposals retired by the author"
click_link "Proposals withdrawn by the author"
expect(page).to have_content retired.title
expect(page).not_to have_content not_retired.title
end
scenario "Retired proposals index interface elements" do
scenario "Withdrawn proposals index interface elements" do
visit proposals_path(retired: "all")
expect(page).not_to have_content "Advanced search"
@@ -665,7 +665,7 @@ describe "Proposals" do
expect(page).not_to have_content "Districts"
end
scenario "Retired proposals index has links to filter by retired_reason" do
scenario "Withdrawn proposals index has links to filter by retired_reason" do
unfeasible = create(:proposal, :retired, retired_reason: "unfeasible")
duplicated = create(:proposal, :retired, retired_reason: "duplicated")

12
spec/system/site_customization/information_texts_spec.rb
View File

@@ -6,25 +6,25 @@ describe "Custom information texts", :admin do
proposal_key = "proposals.index.section_footer.title"
visit admin_site_customization_information_texts_path(tab: "debates")
fill_in "contents[content_#{debate_key}]values[value_en]", with: "Custom help about debates"
fill_in "contents[content_#{debate_key}]values[value_en]", with: "Custom help with debates"
click_button "Save"
visit admin_site_customization_information_texts_path(tab: "proposals")
fill_in "contents[content_#{proposal_key}]values[value_en]", with: "Custom help about proposals"
fill_in "contents[content_#{proposal_key}]values[value_en]", with: "Custom help with proposals"
click_button "Save"
visit debates_path
within("#section_help") do
expect(page).to have_content "Custom help about debates"
expect(page).not_to have_content "Help about debates"
expect(page).to have_content "Custom help with debates"
expect(page).not_to have_content "Help with debates"
end
visit proposals_path
within("#section_help") do
expect(page).to have_content "Custom help about proposals"
expect(page).not_to have_content "Help about proposals"
expect(page).to have_content "Custom help with proposals"
expect(page).not_to have_content "Help with proposals"
end
end

4
spec/system/subscriptions_spec.rb
View File

@@ -35,7 +35,7 @@ describe "Subscriptions" do
check "Notify me by email when someone comments on my contents"
uncheck "Notify me by email when someone replies to my comments"
uncheck "Receive by email website relevant information"
uncheck "Receive relevant information by email"
check "Receive a summary of proposal notifications"
uncheck "Receive emails about direct messages"
click_button "Save changes"
@@ -43,7 +43,7 @@ describe "Subscriptions" do
expect(page).to have_content "Changes saved"
expect(page).to have_field "Notify me by email when someone comments on my contents", checked: true
expect(page).to have_field "Notify me by email when someone replies to my comments", checked: false
expect(page).to have_field "Receive by email website relevant information", checked: false
expect(page).to have_field "Receive relevant information by email", checked: false
expect(page).to have_field "Receive a summary of proposal notifications", checked: true
expect(page).to have_field "Receive emails about direct messages", checked: false
end

4
spec/system/users_spec.rb
View File

@@ -349,7 +349,7 @@ describe "Users" do
expect(page).to have_content proposal.title
end
scenario "Retired proposals do not have a link to the dashboard" do
scenario "Withdrawn proposals do not have a link to the dashboard" do
proposal = create(:proposal, :retired, author: user)
login_as user
@@ -357,7 +357,7 @@ describe "Users" do
expect(page).to have_content proposal.title
expect(page).not_to have_link "Dashboard"
expect(page).to have_content("Dashboard not available for retired proposals")
expect(page).to have_content "Dashboard not available for withdrawn proposals"
end
scenario "Published proposals have a link to the dashboard" do