Commit Graph

6051 Commits

Author SHA1 Message Date
Julian Nicolas Herrero
6aa54d6c62 Merge branch 'master' into content_blocks_for_headings 2018-12-11 16:40:25 +01:00
Julian Nicolas Herrero
9aab3ddd7b Merge pull request #3038 from MatheusMiranda/add_map_to_heading_page
Add map to sidebar on Heading's page
2018-12-11 16:32:35 +01:00
Alberto
05abcbe944 Merge pull request #3081 from consul/featured-proposals
[Backport] Featured proposals
2018-12-10 22:17:51 +01:00
Javi Martín
34e83292a9 Reload I18n after stubbing available locales
Not doing so might cause the following test to use translations for
only one locale. This scenario happens if the previous test executes
I18n.reload!, which resets I18n.config.backend's "@translations"
instance variable.

So, the sequence could be as follows:

1. The previous tests sets `@translations = nil`
2. This test stubs `available_locales` to `[:en]`
3. `@translations` gets only translations for `en`
4. The following test doesn't find translations for Spanish and fails
2018-12-10 20:37:30 +01:00
Javier Martín
bd363466a8 Merge pull request #3089 from consul/backport-polls-show
Polls voted by
2018-12-10 20:19:26 +01:00
Javier Martín
64e8dbf67b Merge pull request #3094 from consul/fix_trailing_whitespace
Remove trailing whitespace
2018-12-10 20:15:24 +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
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
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
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
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
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
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
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
decabeza
37da986014 Adds settings for featured proposals 2018-12-04 18:04:36 +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 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
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
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
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
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
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
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