consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,202 Commits 1 Branch 0 Tags
0affaaee7e194d901b0ebc1bbb032444e12ec01e
Commit Graph

11202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Julian Herrero
333098502e fix typo 2018-12-02 18:12:03 +01:00
Julian Herrero
43dac8d276 add missing spec 2018-12-02 17:45:39 +01:00
Julian Herrero
d819a9ccbc add missing spec 2018-12-02 17:12:57 +01:00
Javi Martín
baa7ddc4cc Remove unused key 2018-11-30 18:11:19 +01:00
Javi Martín
9ad8c5728a Refactor legislation process subnav 2018-11-30 18:09:52 +01:00
Javi Martín
abf48af331 Rename draft_texts key to draft_versions 
This way we can refactor the legislation tabs, since now all translation
keys follow the same convention (using the same name as the active tab
name).
 2018-11-30 18:09:51 +01:00
Javi Martín
5cfc1592e4 Use %w[] instead of %w{} 
As defined in our rubocop rules.
 2018-11-30 18:04:55 +01:00
Javi Martín
b499c88373 Extract method in menu moderated content 
This way we can make a long line considerably shorter.
 2018-11-30 18:04:55 +01:00
Javi Martín
45a41a7528 Rename Admin::Proposals to Admin::HiddenProposals 
The same way we do it with users and budget investments.
 2018-11-30 18:04:55 +01:00
Javi Martín
ea9576096b Don't load tasks if they're already loaded 
We were having problems under certain conditions with Travis and
Knapsack where tasks were still being loaded twice and so they were
being executed twice.
 2018-11-30 17:28:59 +01:00
Javi Martín
85ac4e6c22 Use Date.current instead of Date.today 
Using `Date.today` was making the spec fail around midnight.
 2018-11-30 16:04:40 +01:00
Javi Martín
f240977ed0 Update milestone I18n keys for all languages 2018-11-30 14:15:21 +01:00
Javi Martín
f6689cc69d Update obsolete milestones I18n keys 2018-11-30 14:15:21 +01:00
Javi Martín
d3882df437 Fix milestones migration not updating ID sequence 
When we insert a record in PostgreSQL and we specify the ID, the
internal ID sequence for that table isn't updated.

In order to keep the original IDs so we didn't break any foreign keys,
we specified the IDs when copying the table, resulting in a table having
its ID sequence with a value of an existing record. When trying to
insert a new record, we got a `PG::UniqueViolation` exception.

Updating the sequence after the data migration might not be the most
elegant solution, but it's easy to do and it's already been tested on a
production environment.
 2018-11-30 14:15:21 +01:00
Javi Martín
87b073cbca Migrate milestones images and documents 2018-11-30 14:15:21 +01:00
Javi Martín
4a7f479d21 Remove obsolete model usage 
We'd rather keep the table so future data migrations work smoothly, so
we change the migration in order to create the translation table without
using models.
 2018-11-30 14:15:21 +01:00
Javi Martín
1a5b73a0bd Don't load tasks several times in specs 
Calling `load_tasks` in several files made rails load the tasks several
times, and so they were executed several times when called.

Since the milestone migration can't be executed twice in a row (it would
fail with duplicated ID records), loading the tasks several times made
the milestone migrations task specs fail.
 2018-11-30 14:15:21 +01:00
Javi Martín
cb891f21d4 Simplify count_rows check 
We had a line which was too long according to rubocop, and simplifying
the code makes the line shorter.
 2018-11-30 14:15:21 +01:00
Javi Martín
a6adc0b5ab Reduce I18n.t usage in spec 
We also make the line shorter so rubocop doesn't complain.
 2018-11-30 14:15:21 +01:00
Javi Martín
9a093d5f8a Use let instead of instance variables 2018-11-30 14:15:21 +01:00
Marko Lovic
4c3dadf1fb Add Rake task to migrate milestone data to new tables 2018-11-30 14:15:21 +01:00
Marko Lovic
c0f6fa182f Make Milestones general, and not specific to Budget Investments 
Generalize the Budget::Investment::Milestone model to a
polymorphic Milestone model so it can be used for entities
other than Budget::Investment.
 2018-11-30 14:15:21 +01:00
Marko Lovic
81f516efd7 Change BudgetInvestmentStatus to Milestone::Status 
Generalize the BudgetInvestmentStatus model to Milestone::Status so it
is not specific to budget investments, but can be used for any entity
which has milestones. This is in preparation to make the Milestone
model polymorphic and usable by entities other than budget investments.
 2018-11-30 14:15:21 +01:00
Javier Martín
7446ebbdd5 Merge pull request #3072 from consul/backport-1623-fix_flaky_driver_session 
[Backport] Fix flaky spec: Welcome screen is not shown to organizations
 2018-11-30 14:14:09 +01:00
Javi Martín
dc65c0cdb1 Fix space differences with Madrid's fork 2018-11-30 14:06:33 +01:00
Javi Martín
b153f5f902 Remove redundant Capybara actions 
Resetting sessions and driver is automatically done by requiring
'capybara/rspec', as shown by the (lack of) that configuration for RSpec
in the Capybara README, manual testing of those settings, and Capybara's
code itself.
 2018-11-30 13:37:16 +01:00
Javi Martín
2f860236a5 Reset page driver after every spec using it 
There were some issues because some specs  directly used the driver but
didn't reset it after the test.
 2018-11-30 13:34:01 +01:00