consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

6051 Commits

Author SHA1 Message Date
Senén Rodero Rodríguez
52f35c0360 Remove sleep from nested documentable shared feature specs. Use matchers able to wait new content to appear. 2017-09-26 13:55:03 +02:00
Senén Rodero Rodríguez
60e91c7a24 Remove sleep from documentable shared feature specs. Use matchers able to wait new content to appear. 2017-09-26 13:55:03 +02:00
Senén Rodero Rodríguez
314b7d73f7 Remove sleep from nested imageable shared feature specs. Use matchers able to wait new content to appear. 2017-09-26 13:55:03 +02:00
Senén Rodero Rodríguez
4f53865b25 Remove sleep from imageable shared feature specs. Use matchers able to wait new content to appear. 2017-09-26 13:55:03 +02:00
Senén Rodero Rodríguez
2a12b222ed Fix some tranlations on new image page. Add missing shared specs for imageable feature. 2017-09-26 13:55:03 +02:00
Senén Rodero Rodríguez
16692c933e Move specs from imageable shared feature spec to proposals and budget investments path. 2017-09-26 13:55:03 +02:00
Senén Rodero Rodríguez
ceabd16d57 Refactor. Create index scope inside imageable shared examples to check index action of any imageable model. Add image to proposals index. 2017-09-26 13:55:03 +02:00
Senén Rodero Rodríguez
3310089208 Add nested imageable shared spec to check nested images behavior at imageable any recipients. 2017-09-26 13:55:03 +02:00
Senén Rodero Rodríguez
6f71da07ee Duplicate documentable code and rename for imageable 2017-09-26 13:55:03 +02:00
Bertocq
614ff79ba1 WIP 2017-09-26 13:53:43 +02:00
Senén Rodero Rodríguez
5ecf228b09 Add spec to check image attachment destroy method on budget investment model. 2017-09-26 13:53:43 +02:00
Senén Rodero Rodríguez
e7ac27a2b8 Add missing specs to check validation errors on new investmentand edit image pages. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
a9f1d41179 Fix some specs names 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
c914c772c0 Add budget investment image dimmensions validator. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
1327b7276d Create investments helper. Fix indentation error and some specs names and structure. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
4469aa9b32 Allow to remove budget investment image from edit image page to authors and administrators. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
0925d33c5b Add dynamic texts to investment image button. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
ce0c0f7024 Allow administrators to edit and update images of any budget investment. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
acc79cbe31 Add edit_image and update_image action to budget/investments controller. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
515d6d7e70 Rename image_description column to image_title on budget investments. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
673fc66011 Add budget investements images specs 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
c399692109 Add image description to budget investments 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
4f5a552486 Added image content type validation to only allowing jpg images. 2017-09-26 13:53:42 +02:00
iagirre
e90ac7e72d Admins can see the preview of the budgets' results before the balloting phase is finished. 
Cambios para hacer commit:
	modificado:    app/models/abilities/administrator.rb
	modificado:    app/views/budgets/show.html.erb
	modificado:    spec/models/abilities/administrator_spec.rb
	modificado:    spec/models/abilities/everyone_spec.rb
 2017-09-26 11:16:32 +02:00
BertoCQ
f2e44f0730 Merge pull request #1919 from consul/chore/remove_booth_assignment_officer_totals 
Remove Officer recounts, add Final&Totals votes
 2017-09-26 10:19:57 +02:00
BertoCQ
feddc44267 Merge pull request #1922 from consul/rubocop 
Rubocop 🤖  Cleanup
 2017-09-26 10:19:47 +02:00
BertoCQ
73c47dcd0e Merge pull request #1905 from wairbut-m2c/iagirre-autocomplete-tags 
Iagirre autocomplete tags
 2017-09-26 10:19:34 +02:00
Bertocq
7e4d9b749b Fix Style/ColonMethodCall rubocop issues 2017-09-25 22:53:15 +02:00
Bertocq
71b57ffc67 Always use parentheses on method definition 2017-09-25 22:50:24 +02:00
Bertocq
ca35c8b85c Fix Style/NestedParenthesizedCalls rubocop issues 2017-09-25 22:47:59 +02:00
Bertocq
22822aa173 Fix Style/RedundantParentheses rubocop issues 2017-09-25 22:44:58 +02:00
Bertocq
bf981ca828 Remove Booth Assignment officer totals and add final&system counts 2017-09-25 18:47:44 +02:00
BertoCQ
d449e8ee62 Merge pull request #1875 from consul/admin-design 
Admin design
 2017-09-25 17:23:17 +02:00
iagirre
f7e96067b0 Actions for budgets' headings added. Edit headings, delete headings if not budget investments associated and add link in order to see budgets investments filtered by the heading. 
Cambios para hacer commit:
	modificado:    app/controllers/admin/budget_headings_controller.rb
	modificado:    app/models/budget/heading.rb
	nuevo archivo: app/views/admin/budget_headings/_errors.html.erb
	nuevo archivo: app/views/admin/budget_headings/edit.js.erb
	nuevo archivo: app/views/admin/budget_headings/update.js.erb
	modificado:    app/views/admin/budgets/_group.html.erb
	nuevo archivo: app/views/admin/budgets/_heading.html.erb
	nuevo archivo: app/views/admin/budgets/_heading_form.html.erb
	modificado:    config/locales/en/activerecord.yml
	modificado:    config/locales/es/activerecord.yml
	modificado:    spec/features/admin/budgets_spec.rb
	modificado:    spec/models/budget/heading_spec.rb
 2017-09-25 15:40:17 +02:00
decabeza
2948251fc2 updates specs 2017-09-21 18:31:30 +02:00
iagirre
4db2584f87 The tags are suggested based on the entries the user makes. 
Cambios para hacer commit:
	modificado:    app/assets/javascripts/tag_autocomplete.js.coffee
	modificado:    app/assets/stylesheets/autocomplete_overrides.scss
	nuevo archivo: app/controllers/tags_controller.rb
	modificado:    app/models/abilities/common.rb
	modificado:    app/views/debates/_form.html.erb
	modificado:    app/views/proposals/_form.html.erb
	modificado:    config/initializers/acts_as_taggable_on.rb
	modificado:    config/routes.rb
	modificado:    spec/lib/acts_as_taggable_on_spec.rb
 2017-09-21 18:21:45 +02:00
BertoCQ
34568567a3 Merge pull request #1885 from consul/chore/remove_final_recounts 
Remove Poll Final Recounts, replace with Total Results
 2017-09-20 23:00:03 +02:00
Raimond Garcia
b416d2846e Merge pull request #1883 from xarlybovi/switch-flags-ajax 
Switch flag/unflag buttons on use via ajax
 2017-09-20 12:21:56 +02:00
decabeza
1b3292690a updates spec of admin logo_header 2017-09-20 11:02:13 +02:00
Carlos Ruiz
61c9536697 Add flagging/unflagging rspec 2017-09-19 20:11:23 +02:00
BertoCQ
f67ba62c49 Merge branch 'master' into user-recomendations 2017-09-19 18:56:12 +02:00
Bertocq
9c6a974bec Fix wrong spectations after final result swap for total result 2017-09-19 18:54:37 +02:00
BertoCQ
5d6c4f0bbc Merge pull request #1868 from wairbut-m2c/aperez-validate-poll-question-is-selected 
Validate presence 'poll_id' attribute on Poll::Question model
 2017-09-19 18:15:32 +02:00
rgarcia
882723a58a fixes flaky spec 
Adds random number to the proposal’s title, to avoid js popup
displaying similar proposals
 2017-09-19 17:30:40 +02:00
rgarcia
6de47e7f1d fixes flaky spec 
Maybe using `build` instead of `create` was confusing the spec
 2017-09-19 17:30:40 +02:00
rgarcia
92333e530f fixes flaky spec 
Visits directly the page to avoid flakiness
 2017-09-19 17:30:40 +02:00
rgarcia
aee34e643c removes unused expectation 2017-09-19 17:30:40 +02:00
rgarcia
d1aa01b9fa fixes flaky spec 
Using correct resource in path
 2017-09-19 17:30:40 +02:00
rgarcia
c128a0f21d removes obsolete legislations specs 
Obsolete and flaky!
 2017-09-19 17:30:40 +02:00
rgarcia
8db8049e49 fixes flaky spec 
Reactivates feature setting after spec
 2017-09-19 17:30:40 +02:00