Commit Graph

11379 Commits

Author SHA1 Message Date
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
Javier Martín
c848741777 Merge pull request #3071 from consul/backport-fix_scope_warning
[Backport] Fix scope warning
2018-11-30 11:26:00 +01:00
Javi Martín
56df8050df Use @cards.each instead of @cards.find_each
Using `find_each` ignores the scope order we set in `Widget::Card.body`,
and since we don't expect to have thousands of cards, using batches
isn't necessary.

This way we remove the "WARN Scoped order and limit are ignored, it's
forced to be batch order and batch size" message we were getting in the
specs.
2018-11-29 20:10:23 +01:00
dependabot[bot]
eefe09e691 [Security] Bump rails from 4.2.10 to 4.2.11
Bumps [rails](https://github.com/rails/rails) from 4.2.10 to 4.2.11. **This update includes security fixes.**
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v4.2.10...v4.2.11)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-27 22:54:32 +00:00
Milber Champutiz Burbano
9f455b9165 Added feature to add content block to headings in sidebar -- rebase 2018-11-27 09:37:35 -05:00
Raimond Garcia
e23fbc8d58 Merge pull request #2970 from PierreMesure/Remove-icon-png-from-settings
Removed icon_home and fixed corresponding test
2018-11-27 11:11:51 +01:00
Raimond Garcia
181918330c Merge pull request #3029 from clairezed/patch-1
Update debates_spec.rb
2018-11-27 11:09:15 +01:00
Raimond Garcia
ed9e501ae7 Merge branch 'master' into add_map_to_heading_page 2018-11-27 11:07:16 +01:00
Raimond Garcia
1b7a2adf56 Merge pull request #3034 from behraaang/bugfix/pagination-after-select
Fix pagination after selecting/unselecting budget investment
2018-11-27 11:04:41 +01:00
Raimond Garcia
2ef83619c3 Merge pull request #3048 from jaflutz/2930-draft-phase-processes
Adds draft phase functionality in legislation processes
2018-11-27 11:01:27 +01:00
Raimond Garcia
e4b0f2781d Merge pull request #3062 from danesjenovdan/slovenian-translations
Added Slovenian translations
2018-11-26 19:11:58 +01:00
Alberto
1bb50cbe47 Merge pull request #3056 from consul/administrator-id
[Backport] Administrator ID
2018-11-26 15:05:11 +01:00
Alberto
f535a90826 Merge pull request #3055 from consul/admin-poll-officers
[Backport] Admin poll officers
2018-11-26 15:03:55 +01:00
Alberto
1a89e52931 Merge pull request #3054 from consul/globalize-tabs
[Backport] Globalize tabs
2018-11-26 14:58:38 +01:00
Alberto
fce5fdff0d Merge pull request #3053 from consul/budget-investment-social-share
[Backport] Budget investments social share
2018-11-26 14:57:53 +01:00
peric
275cbf1adc Added Slovenian translations 2018-11-24 16:45:41 +01:00
Julian Herrero
c563f73189 create officer assignments in order
Make sure we create the Poll::OfficerAssignments in the same order the
booth_assignments where previously created. So the spec "Poll::Shift
officer_assignments creates and destroy corresponding
officer_assignments does" not fail.
2018-11-23 18:15:47 +01:00
voodoorai2000
46b66e9376 Downgrade autoprefixer-rails gem to 8.2.0 2018-11-23 02:16:35 +01:00
Raimond Garcia
574ef6b850 Merge pull request #3050 from consul/i18n_master
New Crowdin translations
2018-11-22 14:16:16 +01:00
Consul Bot
2fa19d5831 New translations mailers.yml (Arabic) 2018-11-22 13:22:12 +01:00
Consul Bot
3b4670d7bd New translations admin.yml (Arabic) 2018-11-22 13:11:37 +01:00
Consul Bot
fa0a726d7e New translations mailers.yml (Arabic) 2018-11-22 12:51:17 +01:00
Consul Bot
2110223a14 New translations mailers.yml (Arabic) 2018-11-22 12:41:10 +01:00
Consul Bot
264ecd2ce3 New translations devise_views.yml (Arabic) 2018-11-22 12:41:08 +01:00