Commit Graph

6051 Commits

Author SHA1 Message Date
Bertocq
148b58f71d Add sluggable shared example for Sluggable concern
Why:

* We need certain models that use a Sluggable to generate a slug based on name attribute on save

How:

* Creating a shared example that knows how to create a factory of the described class
* Checking in it that new objects of the described class get the correct slug
2017-07-04 18:40:01 +02:00
Raimond Garcia
e7e5b3c4a3 Merge branch 'master' into 1647-locale_site_customization 2017-07-04 12:11:07 +02:00
Bertocq
10b17eae8f Update user budget's result feature spec to include incompatible ones 2017-07-04 02:14:54 +02:00
Bertocq
9c157e25bb Increase Admin Budget Investment edit to cover new incompatible checkbox edit
Why:

* Admins can now mark/unmark a investment as incompatible

How:

* With a new checkbox in the edit form and a section at the investment details view to show the current status
2017-07-04 01:34:22 +02:00
Bertocq
21864f3fb5 Increase Budget Result spec to check incompatible investments can't be winners
Why:

* A incompatible investment can't be chosen as a winner
* When a winner investment is marked as incompatible, winnersmust be recalculated and it can't be a winner

How:

* Increasing existing scenarios to include a incompatible investment
* Adding a new scenario where a winner investment gets flagged as incompatible
2017-07-03 15:59:01 +02:00
Bertocq
e8c6c6ad8c Add incompatible boolean column to Budget Investments table and factory 2017-07-03 15:40:34 +02:00
María Checa
ecaf7192c5 Merge branch '1647-locale_site_customization' of https://github.com/MariaCheca/consul into 1647-locale_site_customization 2017-07-03 12:59:09 +02:00
María Checa
da2b55942a Added specs for custom pages
New test to check pages are rendered in their matching locale.
2017-07-03 12:53:12 +02:00
María Checa
36d51b380b Merge branch 'master' into 1647-locale_site_customization 2017-07-02 23:19:40 +02:00
María Checa
dca346bd4c Fixed tests
Added new custom pages attribute to tests to make them run properly.
2017-07-02 22:13:40 +02:00
Eduardo Martinez Echevarria
0bc318c823 Add tests to check visibility of processes depending on published attribute 2017-06-30 15:08:23 +02:00
Eduardo Martinez Echevarria
3e5c5d7e49 Define some actions on legislation processes as member actions 2017-06-30 15:08:23 +02:00
Raimond Garcia
22d28d9c79 Merge branch 'master' into issue#1575-tag-administration 2017-06-29 19:09:54 +02:00
Raimond Garcia
f24256c13f Merge pull request #1711 from consul/annotation-legislation
Annotation on legislation
2017-06-29 13:33:03 +02:00
Bertocq
904e3fdcfa Fix all Style/HashSyntax rubocop issues and remove from rubocop_todo list 2017-06-28 14:12:51 +02:00
Bertocq
c9bc028524 Remove all unnecesary extra spacing and Layout/ExtraSpacing list from rubocop file 2017-06-28 14:12:51 +02:00
Bertocq
775da2d581 Remove all Layout/EmptyLines issues on code and file list from rubocop_todo 2017-06-28 14:12:51 +02:00
Bertocq
2fa92937d2 Fix all Style/BracesAroundHashParameters rubocop issues and remove them from rubocop_todo list 2017-06-28 14:12:51 +02:00
decabeza
a97130934a fixes text on publish comment button 2017-06-28 13:40:37 +02:00
Bertocq
97a7cb71d0 Add population value to Budget Heading factory 2017-06-27 23:25:28 +02:00
Bertocq
57f476c2fa Merge branch 'master' into feature/add_population_to_budget_heading 2017-06-27 18:43:24 +02:00
Bertocq
1c8e039862 Fix all Layout/SpaceInsideParens rubocop issues and remove files from rubocop_todo list 2017-06-26 18:06:01 +02:00
Bertocq
c4d90691b1 Fix all Layout/SpaceInLambdaLiteral rubocop issues and remove files from rubocop_todo list 2017-06-26 18:05:14 +02:00
Bertocq
f6fe9cc7d2 Fix all Layout/SpaceAroundOperators rubocop issues and remove file list from rubocop_todo list 2017-06-26 18:04:20 +02:00
Bertocq
d7b8777395 Fix all Layout/SpaceAroundEqualsInParameterDefault rubocop issues from rubocop_todo list 2017-06-26 18:03:40 +02:00
Bertocq
e6dd33bd66 Fix all Layout/SpaceAfterComma issues and remove from rubocop_todo list 2017-06-26 17:57:53 +02:00
Bertocq
9763931f55 Fix all Layout/SpaceBeforeComma rubocop issues and remove from rubocop_todo list 2017-06-26 17:57:53 +02:00
Bertocq
6562d8b9d8 Fix all Layout/SpaceBeforeFirstArg rubocop issues and remove from rubocop_todo list 2017-06-26 17:57:53 +02:00
Bertocq
80bcf38dc5 Fix all Layout/TrailingWhitespace rubocop issues and remove from rubocop_todo list 2017-06-26 17:57:53 +02:00
Raimond Garcia
6e60f5acde Merge pull request #1680 from consul/chore/small_rubocop_cleanup
Chore/small rubocop cleanup
2017-06-26 17:42:10 +02:00
Raimond Garcia
f41d3637cf Merge pull request #1678 from consul/feature/1601#budget_winner_investments_button
Add button to Calculate Budget Winner investments
2017-06-26 17:41:08 +02:00
taitus
fee9e99d37 Add translation to published milestone. Fix test 2017-06-26 13:52:25 +02:00
taitus
64ff75c384 Add displaying no_milestones text on admin 2017-06-26 13:48:25 +02:00
Bertocq
51f8975654 Increase admin budget spec feature to check Budget Heading creation allows to set population value 2017-06-25 15:47:46 +02:00
Bertocq
ee9d3cd7e3 Add a scenario for the Calculate Budgets winner investment feature on admin budget spec 2017-06-25 15:47:04 +02:00
Bertocq
d759aca522 Fix all Rails/TimeZone rubocop issues and remove files from rubocop_todo list 2017-06-25 15:46:46 +02:00
Bertocq
6529e37ae8 Fix all rubocop Rails/PluralizationGrammar issues and remove the file list form rubocop_todo file 2017-06-25 15:46:46 +02:00
taitus
e0d11d6b2a Fix create comment on budget investment spec. 2017-06-25 11:06:05 +02:00
taitus
eeb9c95d1a Missing validate new form milestone spec on Admin. 2017-06-24 22:38:48 +02:00
taitus
2fe663ef8f Fix syntax and indentation errors. 2017-06-24 22:38:48 +02:00
taitus
c58371a5fe Add milestones to investments show. 2017-06-24 22:38:48 +02:00
taitus
f220952883 Add CRUD Milestone on Admin::BudgetInvestment. Rename Checkpoint to Milestone. 2017-06-24 22:38:48 +02:00
taitus
beeb5412d7 New Checkpoint model. Update factories. Model specs. 2017-06-24 22:38:48 +02:00
decabeza
44b5403db5 improves styles and texts of share proposal view 2017-06-23 18:19:43 +02:00
Eduardo Martinez Echevarria
e60ffa3c00 Remove featured attribute management on admin/tags 2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
eb2e5c58b6 Remove unused featured traits from tags factory 2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
fd2c51d4b1 Fix admin/tags test avoiding the use of conditional 2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
a600dcbb36 Replace category factory in tags with a trait 2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
7de6319324 Fix and add some tests on features/admin/tags_specs 2017-06-23 17:34:55 +02:00
Juanjo Bazán
616efbffed uses path instead of url for proposal improvement link 2017-06-23 13:12:46 +02:00