rgarcia
98f5d70e6d
makes specs more robust
2017-10-19 11:28:09 +02:00
rgarcia
6a697bd6d0
adds specs
2017-10-19 11:28:09 +02:00
Bertocq
39f23d3b7b
Switch from valid_answers to question_answers on specs
2017-10-18 01:28:38 +02:00
Bertocq
60f2815010
Add missing total_results check on poll result specs
2017-10-18 01:27:39 +02:00
Bertocq
ce0a7f6fad
Rubocop autocorrections
2017-10-17 22:00:00 +02:00
Bertocq
68e09e8a9a
Fix vote collection date expectations
2017-10-17 12:16:09 +02:00
Bertocq
64db7e1dec
Merge branch 'master' into fix/shift_date_range_expired
2017-10-16 19:43:00 +02:00
María Checa
7d22b386b9
Added tests
2017-10-16 16:08:15 +02:00
Raimond Garcia
b75480a5c9
Merge pull request #2058 from consul/booth-shifts-back
...
Booth shifts back link
2017-10-16 10:48:56 +02:00
rgarcia
f2d99d6747
searches for officers assigned to a poll
2017-10-13 18:39:13 +02:00
decabeza
bf5021c6a5
changes back link to available booths when manage shifts
2017-10-13 18:11:41 +02:00
Bertocq
16f499d5fd
Force shift dates to start on current date at minimun
2017-10-13 17:19:51 +02:00
Bertocq
79c8c2f826
Add scope on shift creation date ranges to current/recounting/incoming polls, plus cover with test
2017-10-13 17:01:48 +02:00
BertoCQ
df5934e0c2
Merge pull request #2026 from consul/polls-admin-polish
...
Polls admin polish
2017-10-13 12:59:27 +02:00
decabeza
7a58b49851
updates specs
2017-10-11 20:14:25 +02:00
decabeza
bdc3538100
Merge branch 'master' into polls-admin-polish
2017-10-11 19:12:34 +02:00
Bertocq
34c278db74
Small fixes for Poll Question Answer ordering
2017-10-11 12:05:20 +02:00
iagirre
943c1f23af
Spects added to test the order of answers. Default order for question_answers set.
2017-10-10 16:38:55 +02:00
decabeza
090ff83cc1
updates edit texts on specs
2017-10-09 20:09:56 +02:00
Raimond Garcia
a585f79351
Merge pull request #2008 from consul/polls-gallery-polish
...
Polls gallery polish
2017-10-07 15:44:37 +02:00
decabeza
953a6e7573
updates videos link spec
2017-10-07 15:23:31 +02:00
rgarcia
1ec2455134
fixes spec
...
this one seems unrelated, probably got pushed in another PR
2017-10-07 14:30:10 +02:00
Raimond Garcia
8576f59af1
Merge branch 'master' into aperez-edit-poll-question-answers
2017-10-06 18:14:00 +02:00
Angel Perez
63eaa0bef6
Allow Poll::Question::Answer edit
...
As requested by #1992
2017-10-06 09:48:17 -04:00
Raimond Garcia
108d4104e8
Merge pull request #1986 from wairbut-m2c/iagirre-remove-documents-questions
...
Iagirre remove documents questions
2017-10-06 14:07:21 +02:00
Raimond Garcia
c72f95c72b
Merge branch 'master' into aperez-admin-question-videos
2017-10-06 01:12:22 +02:00
Raimond Garcia
3d100d1e93
Merge branch 'master' into iagirre-remove-documents-questions
2017-10-06 01:02:56 +02:00
Alberto García
806fd85246
Merge pull request #1990 from consul/polls-gallery
...
Polls Gallery
2017-10-05 21:44:38 +02:00
rgarcia
1922bc55a0
adds pending specs
2017-10-05 19:27:04 +02:00
Angel Perez
5862eea516
Add controllers/views for Poll::Question::Answer::Video
2017-10-05 12:34:20 -04:00
iagirre
75d841e2fe
Fixed the correct specs and views to make the test pass.
2017-10-05 15:31:21 +02:00
BertoCQ
1e22108431
Merge pull request #1980 from wairbut-m2c/iagirre-polls-show
...
Specs added for branch polls-show in consul and thumbnail for poll im…
2017-10-05 00:52:08 +02:00
rgarcia
1cf9bc4ad1
adds images to anwers
2017-10-04 23:56:09 +02:00
Raimond Garcia
1b58b7851b
Merge branch 'master' into fix/shift_creation_polls
2017-10-04 20:14:08 +02:00
iagirre
4035097c60
Specs added for branch polls-show in consul and thumbnail for poll images in admins views.
...
Cambios para hacer commit:
modificado: app/views/images/_admin_image.html.erb
modificado: spec/features/admin/poll/polls_spec.rb
modificado: spec/features/polls/polls_spec.rb
2017-10-04 16:43:35 +02:00
Bertocq
e1a7fc5dfa
Merge branch 'master' into fix/shift_creation_polls
2017-10-04 15:27:54 +02:00
rgarcia
bf7cab29cf
fixes specs
2017-10-04 15:15:20 +02:00
Bertocq
15039b6c5d
Load the Booth polls instead of all current/incoming on Shift creation for date ranges
2017-10-04 11:02:09 +02:00
María Checa
8dc05d399b
Fixed tests
2017-10-04 10:03:44 +02:00
Raimond Garcia
c7f576aa4f
Merge pull request #1962 from wairbut-m2c/iagirre-admin-polls-section
...
Iagirre admin polls section
2017-10-03 22:23:53 +02:00
María Checa
05d40c0ede
Merge branch 'master' into polls_minor_changes
2017-10-03 16:22:33 +02:00
María Checa
2cb620296b
Fixed test
2017-10-03 15:49:03 +02:00
Bertocq
0384baf26a
Unify both Shift task type creation on a single scenario to check double task on same day
2017-10-03 13:29:26 +02:00
BertoCQ
3835821871
Merge branch 'master' into iagirre-admin-polls-section
2017-10-02 22:25:09 +02:00
BertoCQ
7f936f440c
Merge branch 'master' into polls_minor_changes
2017-10-02 16:44:53 +02:00
María Checa
c0dcedcd0f
Tests fix
2017-10-02 16:39:09 +02:00
María Checa
afbdd48891
Fixed tests
2017-10-02 16:11:17 +02:00
Bertocq
b5cf28cb35
Swap Poll White/Null/Total usage for Poll Recount
2017-10-02 15:46:49 +02:00
iagirre
166caa3b4c
Deleted code in views and concerns that lets polls have more images and documentes attached, like it was at first.
...
Added missing text for english and new texts in english and spanish.
Cambios para hacer commit:
modificado: app/assets/stylesheets/participation.scss
modificado: app/models/concerns/imageable.rb
modificado: app/models/poll.rb
modificado: app/views/admin/poll/polls/_form.html.erb
modificado: app/views/images/_admin_image.html.erb
modificado: config/locales/en/images.yml
modificado: config/locales/es/admin.yml
modificado: config/locales/es/images.yml
modificado: spec/features/admin/poll/polls_spec.rb
2017-10-02 12:59:26 +02:00
Bertocq
3da4ee4ee3
Check Poll Shift creation date ranges are correct
2017-09-28 12:18:47 +02:00
