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

Merge branch 'master' into legislation-module-stable

Browse Source
This commit is contained in:
Amaia Castro
2017-01-17 15:45:33 +01:00
parent ac810dbbcc 6c227547e2
commit 6c36fde6cc
13 changed files with 247 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@@ -10,5 +10,8 @@ before_script:
script:
- "bundle exec rake knapsack:rspec"
env:
- CI_NODE_TOTAL=2 CI_NODE_INDEX=0
- CI_NODE_TOTAL=2 CI_NODE_INDEX=1
global:
- CI_NODE_TOTAL=2
matrix:
- CI_NODE_INDEX=0
- CI_NODE_INDEX=1

5
app/assets/stylesheets/participation.scss
View File

@@ -895,6 +895,11 @@
.info {
background: #6A2A72;
p {
margin-bottom: 0;
text-transform: uppercase;
}
@include breakpoint(medium) {
border-top: rem-calc(6) solid #54225C;
}

1
app/controllers/budgets_controller.rb
View File

@@ -2,7 +2,6 @@ class BudgetsController < ApplicationController
include FeatureFlags
feature_flag :budgets
load_and_authorize_resource
respond_to :html, :js

20
app/views/budgets/groups/show.html.erb
View File

@@ -7,6 +7,14 @@
</div>
</div>
<% if params[:unfeasible] %>
<div class="row margin-top">
<div class="small-12 column">
<h3><%= t("budgets.groups.show.unfeasible_title") %></h3>
</div>
</div>
<% end %>
<div class="row margin-top">
<div id="select-district" class="small-12 medium-7 column select-district">
<div class="row">
@@ -16,7 +24,8 @@
<span id="<%= dom_id(heading) %>"
class="<%= css_for_ballot_heading(heading) %>">
<%= link_to heading.name,
budget_investments_path(heading_id: heading.id),
budget_investments_path(heading_id: heading.id,
unfeasible: params[:unfeasible]),
data: { no_turbolink: true } %><br>
</span>
<% end %>
@@ -29,3 +38,12 @@
<%= image_tag "map.jpg" %>
</div>
</div>
<% if params[:unfeasible].blank? %>
<div class="row margin-top">
<div class="small-12 column">
<small><%= link_to t("budgets.groups.show.unfeasible"),
budget_path(@budget, unfeasible: 1) %></small>
</div>
</div>
<% end %>

2
app/views/budgets/investments/_header.html.erb
View File

@@ -4,7 +4,7 @@
<div class="row">
<div class="small-12 column">
<%= back_link_to budget_group_path(@budget, @heading.group) %>
<%= back_link_to budget_group_path(@budget, @heading.group, unfeasible: params[:unfeasible]) %>
<% if can? :show, @ballot %>
<%= link_to t("budgets.investments.header.check_ballot"),

20
app/views/budgets/investments/_investment_show.html.erb
View File

@@ -53,8 +53,8 @@
<% end %>
</div>
<% if investment.should_show_aside? %>
<aside class="small-12 medium-3 column">
<aside class="small-12 medium-3 column">
<% if investment.should_show_aside? %>
<% if investment.should_show_votes? %>
<div class="sidebar-divider"></div>
<h2><%= t("budgets.investments.show.supports") %></h2>
@@ -89,21 +89,7 @@
</div>
</div>
<% end %>
<div class="sidebar-divider"></div>
<h2><%= t("budgets.investments.show.share") %></h2>
<div class="social-share-full">
<%= social_share_button_tag("#{investment.title} #{setting['twitter_hashtag']}") %>
<% if browser.device.mobile? %>
<a href="whatsapp://send?text=<%= investment.title %> <%= budget_investment_url(budget_id: investment.budget_id, id: investment.id) %>"
data-action="share/whatsapp/share">
<span class="icon-whatsapp whatsapp"></span>
</a>
<% end %>
</div>
</aside>
<% else %>
<div class="small-12 medium-3 column">
<% else %>
<div class="float-right">
<span class="label-budget-investment float-left">
<%= t("budgets.investments.show.title") %>

1
app/views/budgets/investments/_sidebar.html.erb
View File

@@ -15,7 +15,6 @@
<%= render "shared/tag_cloud", taggable: 'budget/investment' %>
<%= render 'budgets/investments/categories' %>
<%= render 'budgets/investments/feasibility_link' %>
<% if @heading && can?(:show, @ballot) %>

9
app/views/budgets/investments/index.html.erb
View File

@@ -17,14 +17,15 @@
<div class="small-12 search-results margin-bottom">
<% if params[:unfeasible].present? %>
<h2><%= t("budgets.investments.index.unfeasible") %></h2>
<p>
<h2><%= t("budgets.investments.index.unfeasible") %>: <%= @heading.name %></h2>
<div class="callout primary margin">
<%= t("budgets.investments.index.unfeasible_text",
definitions: link_to(t("budgets.investments.index.unfeasible_text_definitions"), "https://decide.madrid.es/participatory_budget_info#20")).html_safe %>
</p>
</div>
<% else %>
<%= content_tag(:h2, t("budgets.investments.index.by_heading", heading: @heading.name)) if @heading.present? %>
<% end %>
<%= content_tag(:h2, t("budgets.investments.index.by_heading", heading: @heading.name)) if @heading.present? %>
<% if params[:search].present? %>
<h2>
<%= page_entries_info @investments %>

27
app/views/budgets/show.html.erb
View File

@@ -1,18 +1,17 @@
<div class="expanded budget no-margin-top">
<div class="row" data-equalizer>
<div class="row" data-equalizer data-equalizer-on="medium">
<div class="small-12 medium-9 column padding" data-equalizer-watch>
<%= back_link_to budgets_path %>
<h1><%= @budget.name %></h1>
<%= @budget.description %>
<%= safe_html_with_links @budget.description %>
</div>
<div class="small-12 medium-3 column info padding" data-equalizer-watch>
<p>
<strong><%= t('budgets.show.phase') %></strong>
<br>
<%= t("budgets.phase.#{@budget.phase}") %>
</p>
<h2><%= t("budgets.phase.#{@budget.phase}") %></h2>
<% if @budget.accepting? %>
<% if current_user %>
@@ -38,6 +37,9 @@
<div class="row margin-top">
<div class="small-12 medium-9 column">
<% if params[:unfeasible] %>
<h3 class="margin-bottom"><%= t("budgets.show.unfeasible_title") %></h3>
<% end %>
<table class="table-fixed">
<thead>
<th><%= t('budgets.show.group') %></th>
@@ -48,10 +50,14 @@
<td>
<% if group.headings.count == 1 %>
<%= link_to group.name,
budget_investments_path(@budget, heading_id: group.headings.first.id),
budget_investments_path(@budget,
heading_id: group.headings.first.id,
unfeasible: params[:unfeasible]),
data: { no_turbolink: true } %>
<% else %>
<%= link_to group.name, budget_group_path(@budget, group) %>
<%= link_to group.name,
budget_group_path(@budget, group,
unfeasible: params[:unfeasible]) %>
<% end %>
<br>
</td>
@@ -61,3 +67,12 @@
</table>
</div>
</div>
<% unless params[:unfeasible] %>
<div class="row margin-top">
<div class="small-12 column">
<small><%= link_to t("budgets.show.unfeasible"),
budget_path(@budget, unfeasible: 1) %></small>
</div>
</div>
<% end %>

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

@@ -22,6 +22,8 @@ en:
groups:
show:
title: Select an option
unfeasible_title: Unfeasible investments
unfeasible: See unfeasible investments
phase:
accepting: Accepting proposals
reviewing: Reviewing proposals
@@ -103,3 +105,5 @@ en:
show:
group: Group
phase: Actual phase
unfeasible_title: Unfeasible investments
unfeasible: See unfeasible investments

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

@@ -22,6 +22,8 @@ es:
groups:
show:
title: Selecciona una opción
unfeasible_title: Propuestas inviables
unfeasible: Ver propuestas inviables
phase:
accepting: Aceptando propuestas
reviewing: Revisando propuestas
@@ -103,3 +105,5 @@ es:
show:
group: Grupo
phase: Fase actual
unfeasible_title: Propuestas inviables
unfeasible: Ver las propuestas inviables

281
knapsack_rspec_report.json
View File

@@ -1,132 +1,153 @@
{
"spec/features/admin/debates_spec.rb": 3.196030855178833,
"spec/lib/manager_authenticator_spec.rb": 0.7661557197570801,
"spec/helpers/geozones_helper_spec.rb": 0.3235890865325928,
"spec/features/valuation_spec.rb": 1.5787968635559082,
"spec/features/comments/proposals_spec.rb": 16.83220624923706,
"spec/helpers/verification_helper_spec.rb": 0.2460770606994629,
"spec/features/verification/level_three_verification_spec.rb": 2.016052007675171,
"spec/features/stats_spec.rb": 1.1409127712249756,
"spec/controllers/concerns/has_filters_spec.rb": 0.4043538570404053,
"spec/models/organization_spec.rb": 1.1652114391326904,
"spec/features/admin/users_spec.rb": 1.5635802745819092,
"spec/features/admin/proposals_spec.rb": 2.2328972816467285,
"spec/features/ckeditor_spec.rb": 0.7215390205383301,
"spec/features/users_auth_spec.rb": 5.428045988082886,
"spec/lib/wysiwyg_sanitizer_spec.rb": 0.31694674491882324,
"spec/helpers/orders_helper_spec.rb": 0.22522211074829102,
"spec/features/admin_spec.rb": 1.694303035736084,
"spec/features/admin/comments_spec.rb": 2.8705501556396484,
"spec/lib/tag_sanitizer_spec.rb": 0.3478989601135254,
"spec/features/votes_spec.rb": 13.293350458145142,
"spec/helpers/application_helper_spec.rb": 0.47275686264038086,
"spec/features/management/spending_proposals_spec.rb": 4.437402725219727,
"spec/features/users_spec.rb": 6.648370027542114,
"spec/models/abilities/moderator_spec.rb": 7.65787410736084,
"spec/features/welcome_spec.rb": 1.5993311405181885,
"spec/features/management/email_verifications_spec.rb": 0.3190898895263672,
"spec/features/localization_spec.rb": 0.8935031890869141,
"spec/mailers/mailer_spec.rb": 0.1826329231262207,
"spec/models/valuator_spec.rb": 0.2230076789855957,
"spec/features/organizations_spec.rb": 0.7282412052154541,
"spec/features/moderation/debates_spec.rb": 5.6599204540252686,
"spec/models/verification/management/email_spec.rb": 0.8871691226959229,
"spec/helpers/votes_helper_spec.rb": 0.8153252601623535,
"spec/lib/census_api_spec.rb": 0.8195827007293701,
"spec/lib/cache_spec.rb": 0.16429710388183594,
"spec/features/management/document_verifications_spec.rb": 1.4376773834228516,
"spec/controllers/management/base_controller_spec.rb": 0.3214681148529053,
"spec/features/management/account_spec.rb": 1.284877061843872,
"spec/features/tags_spec.rb": 5.2347259521484375,
"spec/features/management/users_spec.rb": 2.2339844703674316,
"spec/models/abilities/administrator_spec.rb": 4.104190111160278,
"spec/features/proposal_ballots_spec.rb": 1.0345211029052734,
"spec/models/abilities/organization_spec.rb": 1.2938573360443115,
"spec/features/spending_proposals_spec.rb": 3.00465989112854,
"spec/features/direct_messages_spec.rb": 1.7699065208435059,
"spec/features/proposal_notifications_spec.rb": 3.206688642501831,
"spec/features/admin/feature_flags_spec.rb": 0.7250113487243652,
"spec/features/valuation/spending_proposals_spec.rb": 9.08467411994934,
"spec/controllers/management/users_controller_spec.rb": 0.14328908920288086,
"spec/features/debates_spec.rb": 32.769495487213135,
"spec/lib/acts_as_paranoid_aliases_spec.rb": 0.672633171081543,
"spec/lib/acts_as_taggable_on_spec.rb": 0.4580230712890625,
"spec/models/proposal_notification_spec.rb": 0.8798811435699463,
"spec/models/abilities/everyone_spec.rb": 1.4743411540985107,
"spec/controllers/debates_controller_spec.rb": 0.597097635269165,
"spec/features/official_positions_spec.rb": 1.7662339210510254,
"spec/features/verification/verification_path_spec.rb": 1.8311583995819092,
"spec/models/notification_spec.rb": 1.6735141277313232,
"spec/features/tracks_spec.rb": 2.7991549968719482,
"spec/features/management/proposals_spec.rb": 4.453279733657837,
"spec/models/custom/residence_spec.rb": 0.26375889778137207,
"spec/features/admin/stats_spec.rb": 3.427401304244995,
"spec/controllers/management/sessions_controller_spec.rb": 0.6672155857086182,
"spec/features/comments/debates_spec.rb": 17.62152862548828,
"spec/features/admin/activity_spec.rb": 8.008464813232422,
"spec/models/residence_spec.rb": 1.7478408813476562,
"spec/features/moderation/comments_spec.rb": 6.95853328704834,
"spec/models/flag_spec.rb": 1.2313306331634521,
"spec/models/geozone_spec.rb": 0.21416401863098145,
"spec/models/debate_spec.rb": 13.919430494308472,
"spec/mailers/devise_mailer_spec.rb": 0.3003346920013428,
"spec/features/moderation/users_spec.rb": 1.304518222808838,
"spec/features/verification/residence_spec.rb": 2.4076998233795166,
"spec/features/admin/banners_spec.rb": 3.2043681144714355,
"spec/models/user_spec.rb": 8.115702629089355,
"spec/helpers/users_helper_spec.rb": 0.6146798133850098,
"spec/models/lock_spec.rb": 0.5752274990081787,
"spec/features/admin/officials_spec.rb": 1.1229417324066162,
"spec/features/legislation_spec.rb": 2.646373987197876,
"spec/features/management/localization_spec.rb": 1.276548147201538,
"spec/models/abilities/common_spec.rb": 8.870994567871094,
"spec/controllers/concerns/has_orders_spec.rb": 0.5060961246490479,
"spec/models/verification/management/document_spec.rb": 0.55743408203125,
"spec/models/letter_spec.rb": 0.73256516456604,
"spec/features/moderation/proposals_spec.rb": 5.034556865692139,
"spec/features/emails_spec.rb": 9.274869441986084,
"spec/features/verification/verified_user_spec.rb": 1.4910340309143066,
"spec/helpers/proposals_helper_spec.rb": 1.1765329837799072,
"spec/controllers/pages_controller_spec.rb": 1.35672926902771,
"spec/i18n_spec.rb": 27.789604902267456,
"spec/features/verification/sms_spec.rb": 1.5330836772918701,
"spec/lib/email_digests_spec.rb": 1.1210927963256836,
"spec/features/proposals_spec.rb": 43.270474910736084,
"spec/features/verification/level_two_verification_spec.rb": 0.5128798484802246,
"spec/models/comment_spec.rb": 2.6471173763275146,
"spec/models/identity_spec.rb": 0.08924984931945801,
"spec/models/vote_spec.rb": 0.6714668273925781,
"spec/models/spending_proposal_spec.rb": 6.144777774810791,
"spec/features/sessions_spec.rb": 0.6140999794006348,
"spec/features/registration_form_spec.rb": 1.3086371421813965,
"spec/features/admin/tags_spec.rb": 1.2578890323638916,
"spec/customization_engine_spec.rb": 0.9755609035491943,
"spec/features/admin/organizations_spec.rb": 4.552514553070068,
"spec/models/proposal_spec.rb": 14.755258560180664,
"spec/features/moderation_spec.rb": 1.702514410018921,
"spec/helpers/settings_helper_spec.rb": 0.22182989120483398,
"spec/models/tag_cloud_spec.rb": 2.6144700050354004,
"spec/features/user_invites_spec.rb": 0.22390198707580566,
"spec/models/activity_spec.rb": 1.5089714527130127,
"spec/controllers/admin/api/stats_controller_spec.rb": 0.6779742240905762,
"spec/features/management/managed_users_spec.rb": 1.556541919708252,
"spec/models/direct_message_spec.rb": 1.4555466175079346,
"spec/features/admin/spending_proposals_spec.rb": 16.1976478099823,
"spec/controllers/users/registrations_controller_spec.rb": 0.24361419677734375,
"spec/features/admin/moderators_spec.rb": 1.3666069507598877,
"spec/models/sms_spec.rb": 0.352916955947876,
"spec/models/setting_spec.rb": 1.2480311393737793,
"spec/features/verification/email_spec.rb": 0.6614222526550293,
"spec/features/admin/valuators_spec.rb": 0.9944217205047607,
"spec/models/ahoy/data_source_spec.rb": 0.4324939250946045,
"spec/features/account_spec.rb": 2.387765407562256,
"spec/features/notifications_spec.rb": 10.897897958755493,
"spec/features/campaigns_spec.rb": 1.1797480583190918,
"spec/features/home_spec.rb": 1.0699732303619385,
"spec/features/admin/verifications_spec.rb": 1.4650330543518066,
"spec/features/admin/managers_spec.rb": 1.3956513404846191,
"spec/models/abilities/valuator_spec.rb": 0.40586066246032715,
"spec/helpers/comments_helper_spec.rb": 0.7347445487976074,
"spec/features/admin/settings_spec.rb": 0.522209644317627,
"spec/features/verification/letter_spec.rb": 2.5052530765533447
"spec/features/management/document_verifications_spec.rb": 54.17448377609253,
"spec/features/spending_proposals_spec.rb": 2.705125570297241,
"spec/features/admin/budget_investments_spec.rb": 19.896899700164795,
"spec/features/budgets/budgets_spec.rb": 0.4167191982269287,
"spec/features/management/users_spec.rb": 3.2355875968933105,
"spec/lib/spending_proposals_importer_spec.rb": 1.017453670501709,
"spec/features/account_spec.rb": 2.271092653274536,
"spec/helpers/votes_helper_spec.rb": 0.44858264923095703,
"spec/features/moderation/proposals_spec.rb": 4.742751836776733,
"spec/controllers/debates_controller_spec.rb": 0.2623593807220459,
"spec/features/user_invites_spec.rb": 0.21874594688415527,
"spec/features/tags_spec.rb": 2.881978988647461,
"spec/controllers/pages_controller_spec.rb": 0.10289263725280762,
"spec/features/admin/banners_spec.rb": 2.686169385910034,
"spec/features/valuation/spending_proposals_spec.rb": 8.130439519882202,
"spec/features/ckeditor_spec.rb": 1.0175442695617676,
"spec/features/valuation/budget_investments_spec.rb": 6.796356916427612,
"spec/features/verification/level_two_verification_spec.rb": 0.45789313316345215,
"spec/features/tags/budget_investments_spec.rb": 10.671012163162231,
"spec/models/signature_spec.rb": 1.0628974437713623,
"spec/features/management/managed_users_spec.rb": 1.5139601230621338,
"spec/models/letter_spec.rb": 0.1097867488861084,
"spec/features/comments/debates_spec.rb": 12.592287063598633,
"spec/features/sessions_spec.rb": 0.3503243923187256,
"spec/models/signature_sheet_spec.rb": 0.5397381782531738,
"spec/mailers/devise_mailer_spec.rb": 0.06376838684082031,
"spec/controllers/admin/api/stats_controller_spec.rb": 0.2264876365661621,
"spec/features/admin/feature_flags_spec.rb": 0.5853826999664307,
"spec/features/notifications_spec.rb": 12.585360765457153,
"spec/controllers/management/base_controller_spec.rb": 0.01735234260559082,
"spec/helpers/geozones_helper_spec.rb": 0.059060096740722656,
"spec/lib/cache_spec.rb": 0.057135581970214844,
"spec/features/admin/budgets_spec.rb": 3.47196888923645,
"spec/features/comments/proposals_spec.rb": 14.34140133857727,
"spec/i18n_spec.rb": 59.869616985321045,
"spec/controllers/users/registrations_controller_spec.rb": 0.027117013931274414,
"spec/models/ahoy/data_source_spec.rb": 0.046532630920410156,
"spec/lib/acts_as_taggable_on_spec.rb": 0.25763797760009766,
"spec/features/admin/verifications_spec.rb": 0.5322456359863281,
"spec/features/admin/activity_spec.rb": 6.245920419692993,
"spec/features/users_auth_spec.rb": 4.910919189453125,
"spec/features/admin/geozones_spec.rb": 1.1101677417755127,
"spec/features/verification/level_three_verification_spec.rb": 1.2446002960205078,
"spec/features/moderation/users_spec.rb": 1.0908584594726562,
"spec/features/localization_spec.rb": 0.6817822456359863,
"spec/features/votes_spec.rb": 10.293386220932007,
"spec/features/admin/comments_spec.rb": 2.4890687465667725,
"spec/features/management/account_spec.rb": 1.1203999519348145,
"spec/features/admin/moderators_spec.rb": 1.1019458770751953,
"spec/features/tags/debates_spec.rb": 2.828442335128784,
"spec/helpers/proposals_helper_spec.rb": 0.1567704677581787,
"spec/controllers/management/sessions_controller_spec.rb": 0.07266688346862793,
"spec/helpers/users_helper_spec.rb": 0.25275325775146484,
"spec/models/budget/investment_spec.rb": 2.8698906898498535,
"spec/features/verification/residence_spec.rb": 1.6340432167053223,
"spec/models/spending_proposal_spec.rb": 1.5339767932891846,
"spec/models/abilities/everyone_spec.rb": 0.048151493072509766,
"spec/mailers/mailer_spec.rb": 0.05180168151855469,
"spec/models/organization_spec.rb": 0.1083993911743164,
"spec/features/tracks_spec.rb": 1.8089509010314941,
"spec/models/abilities/common_spec.rb": 1.8844726085662842,
"spec/features/emails_spec.rb": 8.60808777809143,
"spec/features/verification/email_spec.rb": 0.4650886058807373,
"spec/lib/manager_authenticator_spec.rb": 0.0050716400146484375,
"spec/features/verification/letter_spec.rb": 1.5088157653808594,
"spec/features/verification/sms_spec.rb": 1.6104755401611328,
"spec/models/sms_spec.rb": 0.03068065643310547,
"spec/features/direct_messages_spec.rb": 1.2756364345550537,
"spec/lib/wysiwyg_sanitizer_spec.rb": 0.0025894641876220703,
"spec/features/admin/users_spec.rb": 1.343276023864746,
"spec/features/welcome_spec.rb": 1.378654956817627,
"spec/models/lock_spec.rb": 0.07993745803833008,
"spec/helpers/comments_helper_spec.rb": 0.010583639144897461,
"spec/features/users_spec.rb": 6.439063787460327,
"spec/features/admin/valuators_spec.rb": 1.0057058334350586,
"spec/features/proposals_spec.rb": 33.53970956802368,
"spec/features/stats_spec.rb": 0.7194232940673828,
"spec/features/admin/organizations_spec.rb": 2.7506325244903564,
"spec/features/management/spending_proposals_spec.rb": 4.820674657821655,
"spec/models/flag_spec.rb": 0.4751725196838379,
"spec/features/budgets/ballots_spec.rb": 20.3236243724823,
"spec/features/management/proposals_spec.rb": 4.8367063999176025,
"spec/features/admin/managers_spec.rb": 1.208801507949829,
"spec/models/proposal_notification_spec.rb": 0.21875619888305664,
"spec/models/abilities/valuator_spec.rb": 1.1417410373687744,
"spec/lib/census_api_spec.rb": 0.002756357192993164,
"spec/features/campaigns_spec.rb": 1.2990384101867676,
"spec/features/admin/signature_sheets_spec.rb": 1.008446216583252,
"spec/features/moderation/debates_spec.rb": 5.311923027038574,
"spec/features/moderation/comments_spec.rb": 7.027488470077515,
"spec/controllers/management/users_controller_spec.rb": 0.004802703857421875,
"spec/features/registration_form_spec.rb": 0.8641955852508545,
"spec/models/proposal_spec.rb": 5.7482664585113525,
"spec/models/identity_spec.rb": 0.0020508766174316406,
"spec/lib/acts_as_paranoid_aliases_spec.rb": 0.3309330940246582,
"spec/customization_engine_spec.rb": 1.4245245456695557,
"spec/models/user_spec.rb": 2.2354276180267334,
"spec/features/management/localization_spec.rb": 1.2131106853485107,
"spec/features/admin/debates_spec.rb": 1.9512214660644531,
"spec/models/budget_spec.rb": 0.11238622665405273,
"spec/helpers/verification_helper_spec.rb": 0.0013611316680908203,
"spec/models/abilities/administrator_spec.rb": 1.572779893875122,
"spec/features/valuation/budgets_spec.rb": 0.2885475158691406,
"spec/models/notification_spec.rb": 0.42080020904541016,
"spec/features/official_positions_spec.rb": 1.5759620666503906,
"spec/helpers/settings_helper_spec.rb": 0.026433467864990234,
"spec/features/comments/budget_investments_spec.rb": 14.936149597167969,
"spec/models/valuator_spec.rb": 0.036624908447265625,
"spec/features/debates_spec.rb": 26.954891443252563,
"spec/features/verification/verification_path_spec.rb": 1.300161361694336,
"spec/models/direct_message_spec.rb": 0.44811463356018066,
"spec/models/custom/residence_spec.rb": 0.059293270111083984,
"spec/features/admin/officials_spec.rb": 1.1048157215118408,
"spec/lib/email_digests_spec.rb": 0.4939093589782715,
"spec/models/verification/management/document_spec.rb": 0.021982908248901367,
"spec/features/proposal_notifications_spec.rb": 3.016808032989502,
"spec/features/proposal_ballots_spec.rb": 1.1181466579437256,
"spec/features/budgets/investments_spec.rb": 21.673389673233032,
"spec/features/admin_spec.rb": 1.0874137878417969,
"spec/models/activity_spec.rb": 1.0137333869934082,
"spec/models/geozone_spec.rb": 0.11485028266906738,
"spec/features/tags/proposals_spec.rb": 8.604074954986572,
"spec/features/admin/proposals_spec.rb": 2.0829906463623047,
"spec/models/setting_spec.rb": 0.08045053482055664,
"spec/models/debate_spec.rb": 5.072354555130005,
"spec/features/admin/settings_spec.rb": 0.6724460124969482,
"spec/models/budget/ballot/line_spec.rb": 0.4496328830718994,
"spec/models/vote_spec.rb": 0.5359287261962891,
"spec/features/management/budget_investments_spec.rb": 7.5624330043792725,
"spec/controllers/concerns/has_filters_spec.rb": 0.1893603801727295,
"spec/helpers/application_helper_spec.rb": 0.10230112075805664,
"spec/features/admin/spending_proposals_spec.rb": 20.87121033668518,
"spec/models/budget/ballot_spec.rb": 0.38541626930236816,
"spec/features/organizations_spec.rb": 0.48668909072875977,
"spec/features/management/email_verifications_spec.rb": 0.366025447845459,
"spec/features/verification/verified_user_spec.rb": 0.7837138175964355,
"spec/features/admin/tags_spec.rb": 1.063096523284912,
"spec/lib/tag_sanitizer_spec.rb": 0.0007655620574951172,
"spec/models/tag_cloud_spec.rb": 1.493929386138916,
"spec/models/verification/management/email_spec.rb": 0.06755900382995605,
"spec/controllers/concerns/has_orders_spec.rb": 0.260697603225708,
"spec/features/moderation_spec.rb": 1.4979455471038818,
"spec/features/home_spec.rb": 1.016045331954956,
"spec/features/admin/stats_spec.rb": 3.209017753601074,
"spec/models/abilities/moderator_spec.rb": 2.791966438293457,
"spec/models/residence_spec.rb": 0.25271034240722656,
"spec/models/comment_spec.rb": 1.5699236392974854,
"spec/features/valuation_spec.rb": 1.2200286388397217,
"spec/models/abilities/organization_spec.rb": 0.29455089569091797,
"spec/features/legislation_spec.rb": 2.8978617191314697,
"spec/features/budgets/votes_spec.rb": 4.397690534591675
}

44
spec/features/budgets/investments_spec.rb
View File

@@ -23,21 +23,6 @@ feature 'Budget Investments' do
end
end
scenario 'Feasibility links' do
visit budget_investments_path(budget, heading_id: heading.id)
expect(page).to_not have_content('Feasible projects')
within('#sidebar') do
click_link 'Unfeasible projects'
end
expect(page).to have_current_path(budget_investments_path(budget, heading_id: heading.id, unfeasible: 1))
within('#sidebar') do
click_link 'Feasible projects'
end
expect(page).to have_current_path(budget_investments_path(budget, heading_id: heading.id, unfeasible: nil))
end
context("Search") do
scenario 'Search by text' do
@@ -82,6 +67,35 @@ feature 'Budget Investments' do
expect(page).to_not have_content(investment4.title)
end
end
scenario "by unfeasibilty link for group with one heading" do
group = create(:budget_group, name: 'All City', budget: budget)
heading = create(:budget_heading, name: "Madrid", group: group)
visit budget_path(budget)
click_link 'See unfeasible investments'
click_link "All City"
expected_path = budget_investments_path(budget, heading_id: heading.id, unfeasible: 1)
expect(page).to have_current_path(expected_path)
end
scenario "by unfeasibilty link for group with many headings" do
group = create(:budget_group, name: 'Districts', budget: budget)
heading1 = create(:budget_heading, name: 'Carabanchel', group: group)
heading2 = create(:budget_heading, name: 'Barajas', group: group)
visit budget_path(budget)
click_link 'See unfeasible investments'
click_link 'Districts'
click_link 'Carabanchel'
expected_path = budget_investments_path(budget, heading_id: heading1.id, unfeasible: 1)
expect(page).to have_current_path(expected_path)
end
end
context("Orders") do