Commit Graph

2560 Commits

Author SHA1 Message Date
Raimond Garcia
a215c9c603 Merge pull request #2322 from consul/current_budget
Change concept of current budget to account for multiple budgets
2018-01-16 16:53:10 +01:00
rgarcia
34e0c23bb3 Fix valuators authorization spec
This spec used to pass, because even though there were no budgets, as
Budget.current returned an array, it gracefully handled situations
without budgets

Now we assume that there can only be a single current budget, and so
calling any method of budget will raise an exception unless there is a
current budget present

Valuators should not access this page when there is no budget present,
however it might be wise to create an issue to cover this case, just in
case
2018-01-15 22:02:05 +01:00
rgarcia
5086314bee Display only current budget for Valuators
Before we could have multiple current budgets, as we now only have one
current_budget, some specs broke.

As there is no need to display multiple budgets to Valuators, only the
current budget is necessary, we can remove arrays and assume that only
a single budget, the current budget, is displayed to Valuators
2018-01-15 22:02:04 +01:00
rgarcia
01ef439053 Display only current budget to Managers printing investments
In the specs, some investment were missing a heading_id, thus creating
another unexpected budget

By explicitly setting the heading_id we can control better which
budgets are created in each test
2018-01-15 22:02:04 +01:00
rgarcia
349780922d Add Budget.open scope
Before Budget.current could return multiple budgets, now there can only
be a single current_budget.

Adding the concept of open, which better reflects what the admin sees
in this page: A tab for open budgets and a tab for finished budgets
2018-01-15 22:01:59 +01:00
BertoCQ
3d5bf04829 Merge pull request #2311 from consul/2299-budget_investments_related_content
Budget investments related content
2018-01-15 20:02:34 +01:00
rgarcia
be554a629c Make current_budget accessible in controller and views 2018-01-15 19:13:45 +01:00
rgarcia
9176de949a Refactor concept of current budget
When there was only one budget this implementation worked fine

Nowadays there can be multiple budgets, and therefore the definition of
the current_budget has changed. It is no longer a budget that has not
finished, but rather, the last budget created that is not in the
initial drafting phase.

Budgets in the drafting phase are not considered the current_budget,
but rather a budget that is still being prepared and that soon will
become the current_budget
2018-01-15 19:13:37 +01:00
BertoCQ
61f52b3483 Merge pull request #2293 from wairbut-m2c/aperez-fix-deprecation-warnings
Fix for test suite deprecations warnings
2018-01-15 18:23:42 +01:00
Bertocq
7179dbbba0 Remove deprecated on hold budget phase group, no longer used in code 2018-01-14 20:41:24 +01:00
María Checa
b2054ac531 Improved relationable tests for budget investments 2018-01-12 18:26:37 +01:00
decabeza
40d32f3e16 Merge branch 'master' into budgets-ui 2018-01-11 17:05:28 +01:00
Raimond Garcia
b0bd7792be Merge pull request #1917 from wairbut-m2c/iagirre-admin-budget-heading-action
Actions for budgets' headings added. Edit headings, delete headings i…
2018-01-11 13:47:27 +01:00
Bertocq
2f27a86034 Replace deprecated capybara only_path option for ignore_query 2018-01-11 00:07:56 +01:00
BertoCQ
71e045fece Merge pull request #2296 from consul/feature/2278#budget_price_show_phase
New Budget's phase to publish investment prices
2018-01-10 23:46:41 +01:00
Bertocq
db051beabc Fix to_not to not_to on spec 2018-01-10 22:43:52 +01:00
iagirre
0e11e21b2a Merged with master and solved conflicts 2018-01-10 13:23:39 +01:00
iagirre
f0724ce13a Changes suggested in the PR made 2018-01-10 13:13:05 +01:00
María Checa
02f7e423fe Improved tests 2018-01-10 13:03:52 +01:00
decabeza
3b6fa6cbb4 fixes specs 2018-01-10 11:36:33 +01:00
Bertocq
3563b87399 Increase Budget Investment model spec for should_show_price & explantion methods 2018-01-10 01:14:23 +01:00
Bertocq
3bc683edce Increase budget factory with publishing_price trait & description value 2018-01-10 01:12:11 +01:00
Bertocq
cb1151f1d6 Increase Budget model spec for new publishing_prices phase 2018-01-10 01:04:32 +01:00
Bertocq
f350b99123 Remove deprecated investment test scenario for price explanation 2018-01-10 01:04:32 +01:00
Bertocq
1d6c3034cb Add test scenarios to check investment price showing rules 2018-01-10 01:04:31 +01:00
Angel Perez
9a0eca73d7 Fix: Deprecation warnings when running test suite (#2287) 2018-01-09 17:54:46 -04:00
Raúl Fuentes
29018e3062 changes made at the request of voodoorai2000 2018-01-09 13:08:03 +01:00
Raúl Fuentes
b3461b2051 final details 2018-01-09 12:45:30 +01:00
Raúl Fuentes
4f096a005d more style corrections 2018-01-09 12:45:30 +01:00
Raúl Fuentes
d7cc5d14c6 fixed test 2018-01-09 12:45:30 +01:00
Raúl Fuentes
56f4c3c3b9 added test to csv download and style corrections 2018-01-09 12:45:30 +01:00
María Checa
c27e6ab1d1 Merge pull request #2223 from wairbut-m2c/iagirre-prevent-edition-if-budget-final-phase
Prevent edition of investments if budget is in the final phase
2018-01-09 12:18:23 +01:00
María Checa
96859190be Merge pull request #2280 from consul/2277-budgets_new_form
Budgets new form
2018-01-09 11:55:10 +01:00
BertoCQ
6e96c8c057 Merge branch 'master' into feature/2275#destroy_budgets 2018-01-09 11:03:51 +01:00
BertoCQ
01c41c7cca Merge pull request #2284 from consul/feature/2276#admin_budget_edit_redirect
Redirect admin to budget lists after edit
2018-01-09 10:50:54 +01:00
BertoCQ
bcec5f779a Merge pull request #2285 from consul/feature/2278#budget_draft_phase
Feature/2278#budget draft phase
2018-01-09 10:50:40 +01:00
Bertocq
7c7f903ed0 Make customization engine spec less prone to flaky failures 2018-01-09 01:33:44 +01:00
Bertocq
2c3d8e9fd5 Avoid creating a budget in drafting phase to test results access 2018-01-09 01:16:09 +01:00
Bertocq
beee890285 Login as admin before visiting drafting budget on spec 2018-01-09 00:34:16 +01:00
Bertocq
0f5999fb8d Move admin creation into shared let on spec 2018-01-09 00:33:55 +01:00
María Checa
d8a6bb0f91 Changed tests 2018-01-09 00:09:50 +01:00
María Checa
5161988844 Removed external_url input 2018-01-08 23:22:46 +01:00
Bertocq
d0937d7022 Add description_drafting column to budgets table 2018-01-08 22:55:37 +01:00
Bertocq
9739576e4e Add drafting phase trait to budget factory 2018-01-08 22:54:10 +01:00
Bertocq
1f0eb49ddc Increase budget model spec for drafting phase 2018-01-08 22:53:14 +01:00
Bertocq
63694b5bae Increase admin budget feature spec for drafting phase 2018-01-08 22:52:56 +01:00
Bertocq
2026f537e6 Add drafting phase scenario to budget feature spec for list & show checks 2018-01-08 22:51:01 +01:00
Bertocq
506293fc80 Move level two user creation to a shared let on budget feature 2018-01-08 19:59:14 +01:00
Bertocq
377a514128 Refactor commmon budget creation to a shared one at budget feature spec 2018-01-08 19:40:27 +01:00
Bertocq
53842ba919 Add Update scenario to admin budget feature spec 2018-01-08 18:46:50 +01:00