Commit Graph

1985 Commits

Author SHA1 Message Date
María Checa
e9d73eb687 Fix max_per_heading filter in Admin budget investments list
Also changed the name of the param to `min_total_supports`, which is more descriptive on what it actually does.

Backport of 75f20d5 and 07f0806 from AyuntamientoMadrid/consul fork
2018-07-25 15:44:51 +02:00
Alberto
61589122ef Merge pull request #2723 from wairbut-m2c/backport_2400_combine_free_text_search_and_filters
Combine text search and filters for Investments on Admin panel
2018-07-25 14:42:19 +02:00
Marko Lovic
53a1ea8847 Fix spec 2018-07-25 14:15:37 +02:00
Alberto
3528f09202 Merge pull request #2787 from consul/budgets-specs
Fixes tags budget investments specs
2018-07-24 20:25:34 +02:00
decabeza
717b0c183b Fixes tags budget investments specs 2018-07-24 18:49:56 +02:00
decabeza
b4f7f8e0f3 Fixes show investment's price & cost explanation spec
Backport from AyuntamientoMadrid/consul
2018-07-24 12:25:48 +02:00
decabeza
69ca2be994 Fixes budget investments filter by tag spec
Backport from AyuntamientoMadrid/consul
2018-07-24 12:25:19 +02:00
María Checa
8c69871cfa Add logic to show only winner investments if budget is finished
Backported from AyuntamientoMadrid/consul
2018-07-24 11:33:38 +02:00
Alberto
81b102f002 Merge pull request #2577 from consul/random-order
Fix random order for budget investments
2018-07-20 18:31:37 +02:00
Alberto
bc5d263a53 Merge pull request #2761 from wairbut-m2c/backport_1384-add-max-heading-number-budget-group-list
Backport 1384 add max heading number budget group list
2018-07-20 13:17:38 +02:00
Alberto
bed97347a9 Merge pull request #2762 from wairbut-m2c/backport_1208-flaky-already-voted-on-booth-cannot-vote-on-website
Backport Flaky spec: Polls Booth & Website Already voted on booth cannot vote on website
2018-07-20 13:17:24 +02:00
rgarcia
2366182689 Fix specs 2018-07-20 12:28:56 +02:00
rgarcia
4cd5bb90d4 Fix validation error when creating proposals without user verification
We were getting a validation error when skipping user verification and
creating proposals

This was due to the responsible_name being empty for unverified users

As skipping user verification is a temporary setting used until Census
integration is configured, we can safely skip this validation when this
setting is active
2018-07-20 11:53:01 +02:00
Angel Perez
463c753880 Recommendations are automatically disabled if dismissed by user 2018-07-15 21:28:58 -04:00
Angel Perez
0b7967440f Recommendations for users are enabled by default 2018-07-15 21:28:58 -04:00
Angel Perez
0ac6033ff6 Refactor recommendations specs to improve DRYness 2018-07-15 21:28:57 -04:00
Angel Perez
251441e109 Users can now hide recommendations 2018-07-15 21:28:57 -04:00
Angel Perez
4275069a1e Include tests for recommendations feature 2018-07-15 21:28:57 -04:00
decabeza
bdb3f30e40 Adds recommendations on proposals index 2018-07-15 21:28:57 -04:00
decabeza
36a5ff39b8 Adds recommendations on debates index 2018-07-15 21:28:57 -04:00
Raimond Garcia
0695c2038c Merge pull request #2734 from javierv/2713-fix_flaky_update_votes_spec
Fix flaky specs: Votes Debates and Voting comments Update
2018-07-15 14:35:18 +02:00
rgarcia
225166a5eb Remove focus from specs 2018-07-15 13:58:32 +02:00
Javier Martín
32504b8840 Make Capybara check the page between votes.
As pointed out in PR #2734:

"After clicking the first link, there's an AJAX request which replaces
the existing `.in-favor a` and `.against a` links with new elements. So
if Capybara tries to click the existing `.against a` link at the same
moment it's being replaced, clicking the link won't generate a new
request".

Making Capybara check the page for new content before clicking the
second link solves the problem, in the same way 4ddc869 solved the same
problem in the comments section.
2018-07-13 22:58:12 +02:00
Angel Perez
4ddc869441 Mitigate recurrent flaky specs for voting comments 2018-07-13 22:42:41 +02:00
decabeza
bbaec57c8a Adds message in budget investment show if project is winner 2018-07-13 18:37:16 +02:00
iagirre
ccc8d9e8ea Stub the Date and Time classes so that the test doesn't depend on the time it is run. 2018-07-13 11:59:59 +02:00
iagirre
89a3da1edf Specs modified to fit the new UI
Now, a page refresh isn't needed to see the
updated information because it is done via AJAX.
The spec has been updated to check that the
message is being correctly updated without the
refresh.
2018-07-13 11:46:09 +02:00
Bertocq
1f0ee32998 Add max headings label on Group list 2018-07-13 11:46:09 +02:00
Angel Perez
306b6d8967 Fix failing admin/banners scenario 2018-07-12 10:17:25 -04:00
iagirre
0d9da5398b Fix banners in user pages
Banners were not been shown in certain pages; now
they are.

Spec to check if the banner is been shown correctly
added. Before it was in admins specs, now it has it's
own spec out of admins folder.
2018-07-12 10:17:25 -04:00
iagirre
5ce08532cb Update PR with master
Rebase master branch so that this PR can
be updated with the latest changes.
Conflicts has been solved. dev_seeds
has been also adapted to the new format
(it all separated to be easier to manage).
Some specs has been updated to work with
selenium-webkit.
2018-07-12 10:17:25 -04:00
iagirre
82cb8d4c52 Changes suggested in PR:
* Delete all things related to banner images and styles (in code)
* Add a new test to check that the banner is showing correctly
* Update the specs accordingly to match the changes

Update dev_seed to set a random background_color and a font_color for banners (and remove everything about image and style)
Add a rake task to migrate the banner style to backgroun_color and font_color (so that the banners have the same colors than before)
2018-07-12 10:17:24 -04:00
iagirre
bf69a7bba7 Specs added to test the change of background and font color with color-picker and text-field 2018-07-12 10:16:47 -04:00
Raimond Garcia
046b620848 Merge pull request #2712 from javierv/2520_and_2521-fix_flaky_results_specs
Fix flaky specs: Officing Results Add/Edit results
2018-07-12 16:06:30 +02:00
Raimond Garcia
06689d9cc6 Merge pull request #2697 from javierv/2558-fix_flay_spec_supporting_proposals
Fix flaky spec: Proposals Voting Voting proposals on behalf of someone in show view
2018-07-12 16:04:41 +02:00
rgarcia
88cde6d018 Deal gracefully with hidden followable in my activity
We were seeing an exception when a user was following a proposal and
that proposal becomes hidden

With this commit we are skipping this proposals and hopefully fixing
this exception

We are also adjusting the count of followed proposals, without
including hidden proposals. It might be cleaner, to remove a `Follow`
when its `Followable` becomes hidden. But then we should probably
activate the `Follow` again if the `Followable` becomes non-hidden…

For now this commit should suffice 😌
2018-07-10 17:50:51 +02:00
Javier Martín
735eab8e71 Avoid date changes during residence tests.
As it happened with results (commit 4a559ed), these tests failed if
`Date.current` changes between the moment records are created and the
moment the rest of the test is executed.
2018-07-09 00:17:15 +02:00
Javier Martín
de0afe1621 Don't monkey patch ActiveSupport.
It could have side effects (for example, a conflict after upgrading to
Rails 5).

Thanks @aitbw for the suggestion!
2018-07-09 00:06:55 +02:00
Javier Martín
4a559ed3cd Avoid date changes during results tests.
As explained by @iagirre with pinpoint accuracy [1]:

"If the officer_assignments are created at 23:59:59 and the rest of the
test is executed after 00:00:00, the dates for the objects and the
`Date.current` (used to check if there are any shifts today) won't be
the same, because the shift will be for, lets say, 07/03/2018 and
`Date.current` will be 08/03/2018, so, there are no shifts."

Freezing time avoids this issue.

Related to issues #2520 and #2521.

[1] https://github.com/AyuntamientoMadrid/consul/pull/1342
2018-07-09 00:06:55 +02:00
decabeza
f213768035 Removes duplicated spec 2018-07-05 18:14:22 +02:00
decabeza
21f3d39c6a Removes poll budget creation on specs 2018-07-04 18:12:43 +02:00
decabeza
16ff5c4400 Hides sidebar menus if officer has no shifts assigned 2018-07-04 17:22:03 +02:00
Raúl Fuentes
275f9ad812 Added new test to budget/investment/index, tested the combination between text search and any other option in the search form 2018-07-04 11:55:13 +02:00
Raúl Fuentes
ee19c2fef0 Fixed test for updated form 2018-07-04 11:55:13 +02:00
Raúl Fuentes
df899cde6e Fixed html, now it reflects the current search also added serach by name or id to the Budget::Invesment search function 2018-07-04 11:55:13 +02:00
Raúl Fuentes
4cd2f11723 Fixed test for the refactored form 2018-07-04 11:55:13 +02:00
Javier Martín
b1996e5694 Check page between AJAX requests in proposals spec.
There was a flaky spec supporting proposals. It's hard to reproduce and
be sure about what was going on, so here is my best guess. Given the
code:

```
within(".proposals-list") { click_link proposal.title }
within("#proposal_#{proposal.id}_votes") { click_link('Support') }
```

The first clicked link generates an AJAX request. Usually, Capybara
would wait for the AJAX request to generate a "Support" link in the
element `#proposal_XX_votes`. However, there's already a
`#proposal_XX_votes` element with a "Support" link on the proposals
index page!

So Capybara doesn't have to wait for the AJAX request to finish before
clicking the "Support" link. From then on, anything can happen.

Another option that works:

```
within(".proposals-list") { click_link proposal.title }
within(".proposal-show #proposal_#{proposal.id}_votes") { click_link('Support') }
```

With this code, the link selector fails on the proposals index page, and
Capybara waits for the AJAX request to finish.

Related to issue #2558.
2018-07-04 00:00:51 +02:00
Alberto
1de0cf083f Merge pull request #2717 from consul/allow-author-notifications-to-be-moderated
Allow author notifications to be moderated
2018-07-03 11:21:26 +02:00
iagirre
894c5d1eca Fix restore notifications from admins page
The restore feature was not working properly. When pushed, the button
was removing the notification from the admins panel, but it was not
restoring in the proposal.

I added an `after_restore` function (that I missed in the first PR)
so that the notification is unmarked as moderated.
2018-07-02 18:19:49 +02:00
iagirre
8dadb228f1 Add specs to test the prop. notifications hide action
Specs that test if the proposal notifications hide action works.
It also tests if the admin part works (mark as reviewed, ignore them, etc.)
2018-07-02 18:18:05 +02:00