Commit Graph

11379 Commits

Author SHA1 Message Date
Javier Martín
414a8031a0 Merge pull request #3088 from consul/pull_request_template
Simplify pull request template
2018-12-10 20:08:10 +01:00
Javier Martín
feb4af21c7 Merge pull request #3083 from consul/backport-milestone_polymorphic_path
Make milestones controller polymorphic
2018-12-10 18:37:15 +01:00
Javier Martín
364321bf33 Merge pull request #3090 from consul/backport-time_related_specs
[Backport] Add frozen time condition to proposals phase spec
2018-12-10 13:47:38 +01:00
Javi Martín
aa45c39d3e Remove trailing whitespace 2018-12-10 12:59:03 +01:00
Javier Martín
ef16efe5e4 Merge pull request #2899 from papayalabs/2980-hide-featured-section-with-no-cards
Hide Featured section on Home Page if there are no cards
2018-12-10 12:55:32 +01:00
Raimond Garcia
3781a9920e Merge pull request #3093 from salbertson/patch-1
Add a "Reviewed by Hound" badge
2018-12-10 10:32:53 +01:00
Raimond Garcia
74f7be540f Merge pull request #3037 from PierreMesure/add-web-sections-to-seeds
Add web sections to seeds
2018-12-10 10:30:24 +01:00
Scott Albertson
be9e046d68 Add a "Reviewed by Hound" badge 2018-12-09 18:36:15 -08:00
Javi Martín
a769c61c02 Add frozen time condition to proposals phase spec
Backport the part of AyuntamientoMadrid@ea6fcb5 which hadn't been
backported yet.
2018-12-07 15:09:07 +01:00
Pierre Mesure
3fcd701723 Add websections at the end of the seeds 2018-12-07 14:48:21 +01:00
Javi Martín
6a5e5729dd Simplify pull request template 2018-12-07 13:57:32 +01:00
Javier Martín
d90f068c73 Merge pull request #3085 from consul/backport-1196-fix_flaky_legislation_random_order_spec
Fix flaky spec: Legislation Proposals Each user has a different and consistent random proposals order
2018-12-05 19:16:43 +01:00
Julian Nicolas Herrero
6ee8b328ef Merge pull request #3067 from microweb10/issue-3051
Fix failing spec: Budget::Investment Reclassification store_reclassified_votes stores the votes for a reclassified investment
2018-12-05 17:21:38 +01:00
rgarcia
b601f6c33f adds method voted_by?(user) to polls 2018-12-05 14:31:58 +01:00
Alberto Garcia Cabeza
54fbae6339 adds links to login or verification on question answers 2018-12-05 14:31:58 +01:00
Javier Martín
3631ff7340 Merge pull request #3074 from consul/backport-refactor_legislation_process_subnav
Refactor legislation process subnav
2018-12-05 13:32:22 +01:00
Javier Martín
fc5a5e58de Merge pull request #3073 from consul/backport-rename_hidden_proposals
[Backport] Rename Admin::Proposals to Admin::HiddenProposals
2018-12-05 13:30:23 +01:00
Julian Herrero
0fc1e0503e store reclassified votes in order
Make sure we create Budget::ReclassifiedVotes for an investment in the
same order that the previous Budget::Ballot:Lines were previously created.
2018-12-05 13:13:49 +01:00
Javi Martín
09add3554f Create less records in random pagination tests
We make the tests considerably faster, we make them more robust against
changes in the number of records shown per page, and we generate enough
records so the chance of randomly getting the same results twice in a
row is extremely low.
2018-12-05 13:11:23 +01:00
Javi Martín
64167a86b4 Be more consistent using double quotes 2018-12-05 13:11:23 +01:00
Javi Martín
637c188bee Make test easier to follow
Checking the contents of the second page while on the second page makes
more sense than checking them after going back to the first page.
2018-12-05 13:11:22 +01:00
Javi Martín
f391023b7d Group related specs together 2018-12-05 13:08:24 +01:00
Javi Martín
1b46ba9ee6 Make legislation proposals random seed more robust
Using a number with only two decimals means the seed is going to be the
same 1% of the time. Using ruby's default value for random numbers makes
it almost impossible to generate the same seed twice.

Using `rand` also simplifies the code, and it's what we use in the
budget investments controller.
2018-12-05 13:03:10 +01:00
Javi Martín
07c22d289c Change the random seed before storing it
Even though it probably doesn't change the behaviour, it's a bit strange
to set a seed, then storing it in the session, and then modifying it
again.
2018-12-05 13:03:10 +01:00
Javi Martín
6f62d76c71 Simplify random seed conversion to float
The method `to_f` already returns `0.0` instead of raising an exception
when handling non-numeric values.
2018-12-05 13:03:10 +01:00
Javi Martín
ba7ca11cd8 Fix buggy parallel assignment
In ruby, when we assign two variables to one value, the second variable
is set to `nil`.
2018-12-05 13:02:39 +01:00
Javi Martín
35c18688e5 Remove obsolete method
It was used in the `Translatable` concern, but it isn't used there
anymore.
2018-12-05 12:28:36 +01:00
Javi Martín
ae22cd247a Use milestoneable to find/create a milestone
This way we simplify the code and avoid strange cases like `params[:id]`
having an ID which doesn't belong to the current milestoneable.
2018-12-05 12:28:36 +01:00
Javi Martín
c4448faf70 Move milestones code to admin/milestones
All milestone controllers will inherit from `AdminMilestonesController`,
and all views will render the same content.
2018-12-05 12:28:34 +01:00
Javi Martín
2e778b4073 Use milestoneable instead of investment 2018-12-05 12:23:57 +01:00
Javi Martín
2c2831beb0 Use polymorphic paths for milestones 2018-12-05 12:23:52 +01:00
Javier Martín
4f9ca04a84 Merge pull request #3057 from consul/backport-make-milestones-polymorphic
[Backport] Make milestones polymorphic
2018-12-05 12:12:04 +01:00
Julian Nicolas Herrero
99abc712fe Merge pull request #3065 from microweb10/poll_question_create_from_proposal_show
Add missing feature spec: Admin poll questions Create from successful proposal show
2018-12-05 10:11:08 +01:00
Julian Nicolas Herrero
14d4d175d4 Merge pull request #3064 from microweb10/budget_investments_valuator_group_spec
Add missing feature spec Admin budget investments Edit Do not display valuators of an assigned group
2018-12-05 10:10:09 +01:00
Alberto
7390ebc623 Merge pull request #3079 from consul/pages-texts
[Backport] Removes references to deleted general terms page
2018-12-04 18:46:43 +01:00
decabeza
37da986014 Adds settings for featured proposals 2018-12-04 18:04:36 +01:00
decabeza
609d2083f8 Changes proposals controller to always load featured proposals 2018-12-04 17:46:46 +01:00
decabeza
6f1e7abedd Improves styles for milestones documents 2018-12-04 17:31:04 +01:00
decabeza
be199eedec Fixes icon overlapping on language select form 2018-12-04 17:30:58 +01:00
decabeza
61c7b9a02b Changes width of additional documents container 2018-12-04 17:30:54 +01:00
decabeza
ddcc03450d Improves styles for help text class 2018-12-04 17:30:51 +01:00
decabeza
04e3bf5797 Removes references to deleted general terms page 2018-12-04 17:25:34 +01:00
Julian Nicolas Herrero
6fbd51618a Merge pull request #3066 from microweb10/proposal_notifications_group_for_same_proposal
Add missing feature spec: Proposal Notifications In-app notifications from the proposal's author group notifications for the same proposal
2018-12-04 09:17:25 +01:00
Julian Herrero
c413497094 add missing spec 2018-12-03 17:12:47 +01:00
Julian Nicolas Herrero
a89e00b7b8 Merge pull request #3076 from microweb10/3075-flaky-spec
Fix flaky spec: Each user has a different and consistent random proposals order
2018-12-03 15:49:54 +01:00
Raimond Garcia
294d07dbbb Merge pull request #3014 from consul/dependabot/bundler/database_cleaner-1.7.0
Bump database_cleaner from 1.6.2 to 1.7.0
2018-12-03 14:18:32 +01:00
Raimond Garcia
ab686daa6c Merge pull request #3070 from consul/dependabot/bundler/rails-4.2.11
[Security] Bump rails from 4.2.10 to 4.2.11
2018-12-03 14:17:46 +01:00
Julian Nicolas Herrero
88a912061a Merge pull request #3025 from microweb10/issue-3024
improve visualization for small resolution
2018-12-02 20:00:42 +01:00
Julian Nicolas Herrero
ec152a9d4f Merge pull request #3061 from microweb10/issue-3060
Fix failing spec: Poll::Shift officer_assignments creates and destroy corresponding officer_assignments
2018-12-02 19:22:07 +01:00
Julian Herrero
aa41ce2c96 use Capybara.using_session method for multiple browsers specs 2018-12-02 18:12:30 +01:00