Commit Graph

2235 Commits

Author SHA1 Message Date
Manuel Lucena
c3d7d47c3f 20171004 - Refactored specs for polls comments
On branch mlucena-poll-comments
 Changes to be committed:
	modified:   app/views/comments/show.html.erb
	modified:   spec/features/polls/polls_spec.rb
2017-10-06 10:37:01 +02:00
Manuel Lucena
63cbe2f7c1 20171003 - [WIP] Functionality and tests for polls comments 2017-10-06 10:36:26 +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
82735ae2de spacing 2017-10-05 19:27:10 +02:00
rgarcia
1922bc55a0 adds pending specs 2017-10-05 19:27:04 +02:00
rgarcia
6327bcb343 adds specs for answer's gallery 2017-10-05 19:15:17 +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
Bertocq
895fc96bee Correct voter feature spec scenario name 2017-10-05 00:39:05 +02:00
rgarcia
52b68aa0df removes extra space 2017-10-04 23:58:36 +02:00
rgarcia
1cf9bc4ad1 adds images to anwers 2017-10-04 23:56:09 +02:00
BertoCQ
ababdd0368 Merge pull request #1979 from consul/fix/shift_creation_polls
Fixes on Polls Shifts
2017-10-04 22:40:53 +02:00
Raimond Garcia
1b58b7851b Merge branch 'master' into fix/shift_creation_polls 2017-10-04 20:14:08 +02:00
rgarcia
24fc7ab70a makes answer creation spec more robust 2017-10-04 20:10:49 +02:00
Bertocq
c62b573489 Fix poll Voter feature spec 2017-10-04 17:59:29 +02:00
rgarcia
007bcb7ec7 fixes specs 2017-10-04 17:46:25 +02:00
Bertocq
24ef7984a3 Include the answerable by user scope back on Poll list for officer voting panel 2017-10-04 17:05:25 +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
rgarcia
1f2aa301d4 adds specs for answer's index and create 2017-10-04 16:33:52 +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
2900104a07 Show only active polls from the shifts assigned to officer on vote panel 2017-10-04 13:11:13 +02:00
María Checa
2020990b05 Merge pull request #1972 from consul/1954-remove_question_show_and_description
Removed poll question show view and description attribute
2017-10-04 12:52:46 +02:00
María Checa
5b7a90221a Fixed tests 2017-10-04 11:18:09 +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
BertoCQ
e32521ebe0 Merge branch 'master' into 1954-remove_question_show_and_description 2017-10-04 01:17:07 +02:00
Bertocq
85087b0bea Check officer value for Poll Voter created from officing panel 2017-10-04 01:09:51 +02:00
Bertocq
e928eb38ac Add Officer relationship to Poll Voter 2017-10-04 00:39:31 +02:00
Bertocq
b1eb6698be Add validation expectations for shift date/task/booth/officer combinations 2017-10-04 00:13:10 +02:00
Bertocq
1975099545 Refactor & cleanup let statements on Shift model spec 2017-10-04 00:07:11 +02:00
Bertocq
b893c0bace Add shift task presence validation expectation 2017-10-03 23:45:13 +02:00
María Checa
80c8fa308f Merge branch 'master' into 1954-remove_question_show_and_description 2017-10-03 22:33:08 +02:00
María Checa
81e9682aa3 Fixed tests 2017-10-03 22:30:15 +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
ac1d2e3aec Merge pull request #1960 from consul/polls_minor_changes
Requested polls admin section improvements
2017-10-03 21:36:08 +02:00
Bertocq
825671ad9b Fix polls answer this question show text 2017-10-03 18:53:44 +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
690ebfba01 Check Shift destroy also destroy only associated OfficerAssigments 2017-10-03 13:24:07 +02:00
Bertocq
c624129175 Check Shift creates final/not-final OfficerAssigments correctly 2017-10-03 12:57:40 +02:00
Bertocq
ccb80ce967 Fix recount spec to take into account already existing values and mandatory officer_assigment 2017-10-03 11:40:36 +02:00
Bertocq
6c998768e8 Fix Poll Recount model spec after default amount value added 2017-10-03 00:19:12 +02:00
BertoCQ
fbbbd38932 Merge pull request #1965 from consul/polls-voting
Polls voting
2017-10-02 22:25:51 +02:00
BertoCQ
3835821871 Merge branch 'master' into iagirre-admin-polls-section 2017-10-02 22:25:09 +02:00
BertoCQ
01e4447050 Merge pull request #1923 from wairbut-m2c/iagirre-preview-budget-results
Admins can see the preview of the budgets' results before the balloti…
2017-10-02 21:40:04 +02:00
Bertocq
5aa063668f Remove no longer used befor block with comments 2017-10-02 19:57:02 +02:00
Raimond Garcia
a743b6b823 Merge branch 'master' into polls-voting 2017-10-02 17:11:21 +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