Commit Graph

329 Commits

Author SHA1 Message Date
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
BertoCQ
121109f967 Merge branch 'master' into feature/1924#poll_shifts_creation 2017-09-28 13:03:34 +02:00
Bertocq
3da4ee4ee3 Check Poll Shift creation date ranges are correct 2017-09-28 12:18:47 +02:00
Bertocq
49b4af5e04 Add flash error for shift creation without date, increase spec 2017-09-28 10:53:15 +02:00
Bertocq
13aa5a3ba8 Increase Admin Shift creation scenarios for both tasks options 2017-09-27 18:47:06 +02:00
taitus
a0603985ef Refactor. 2017-09-27 14:51:35 +02:00
taitus
7b54451491 Add missing specs on admin 2017-09-27 14:50:03 +02:00
Senén Rodero Rodríguez
6c1d1c2cde Add map settings to backend. Install leaflet assets to render maps. 2017-09-27 14:46:02 +02:00
Senén Rodero Rodríguez
1a8fda9352 Fix broken specs 2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
ce29185b76 Fix documentable on admin poll questions. Adapt nested documentable shared specs to admin fetaure specs and include at admin poll questions specs. 2017-09-26 13:57:13 +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
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
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
decabeza
1b3292690a updates spec of admin logo_header 2017-09-20 11:02:13 +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
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
8db8049e49 fixes flaky spec
Reactivates feature setting after spec
2017-09-19 17:30:40 +02:00
Bertocq
bf37b8e5f9 Use datetime always with zone 2017-09-19 17:30:40 +02:00
BertoCQ
5cf862064d Merge pull request #1888 from consul/flaky-specs
Fixes some flaky specs
2017-09-19 16:43:41 +02:00
rgarcia
eb89d92320 fixes flaky spec
Visits directly the page to avoid flakiness
2017-09-19 15:14:29 +02:00
rgarcia
8e0f709cf0 removes unused expectation 2017-09-19 15:14:28 +02:00
rgarcia
a7ce8d5c70 fixes flaky spec
Reactivates feature setting after spec
2017-09-19 15:14:28 +02:00
Bertocq
851d397395 Replace FinalResult with TotalResult at admin Poll Recounts page 2017-09-19 00:54:46 +02:00
Bertocq
f27fcc7f99 Replace FinalResult with TotalResult at admin BoothAssignment show 2017-09-19 00:45:13 +02:00
Bertocq
97fe464232 Use datetime always with zone 2017-09-15 14:06:29 +02:00
Angel Perez
0611e0f4ea Validate presence of 'poll_id' attribute on Poll::Question model
Fixes #1831

On branch aperez-validate-poll-question-is-selected
  Changes to be committed:
    modified:   app/models/poll/question.rb
    modified:   spec/models/poll/question_spec.rb
    modified:   spec/features/admin/poll/polls_spec.rb
2017-09-14 11:52:19 -04:00
Bertocq
e4e78c8f16 Rubocop autocorrections 2017-09-14 15:08:35 +02:00
BertoCQ
fa8b9a69a3 Merge branch 'master' into polls-persist-officer-data 2017-09-11 00:11:36 +02:00
BertoCQ
1ced54f0e3 Merge pull request #1835 from consul/1677-poll_questions_documents
Poll questions document and video
2017-09-11 00:08:31 +02:00
BertoCQ
dd02c83fa3 Merge branch 'master' into poll-shifts-search-officers 2017-09-11 00:07:12 +02:00
rgarcia
4d1f61a87e adds specs 2017-09-08 22:00:50 +02:00
rgarcia
47564a91a0 persist a shift's officer data 2017-09-08 20:08:45 +02:00
rgarcia
b1abb9dbb3 adds specs 2017-09-07 22:39:03 +02:00
María Checa
27ac4c5815 Added poll questions documents and video specs
New tests to ensure video URL is shown in the admin preview. Also that the video URL and documents are correctly saved after creating a question.
2017-09-07 17:19:07 +02:00
rgarcia
9181610de9 removes obsolete code 2017-08-04 21:27:30 +02:00
rgarcia
0aba196ba2 adds specs for shifts 2017-08-04 21:27:30 +02:00
Bertocq
ef81c277a0 Remove spending proposal specs, deprecated feature with flaky tests 2017-08-02 12:08:50 +02:00
Bertocq
361e0efe00 Remove Poll Recount model and all usages 2017-07-23 23:29:24 +02:00
Bertocq
d98425f45b Remove daily officer recounts from admin poll recounts list 2017-07-23 23:28:38 +02:00
Bertocq
7b0d3093e5 Fix social media icon expectation 2017-07-18 12:04:35 +02:00
decabeza
2844c03e43 adds consistency on social media filenames 2017-07-18 11:40:19 +02:00
Bertocq
741a342bb0 Restrict compatilibility edit on admin investment form
Why:

* A non-winner but compatible investment shouldn't be marked as incompatible

How:

* Show incompatilibility checkbox only if investment is winner or incompatible
2017-07-10 17:34:05 +02:00
Bertocq
69f4e1c683 Fix all rubocop Metrics/LineLength issues (140+) 2017-07-10 13:22:49 +02:00
Bertocq
39fa6ec2de Increase admin investment feature to cover selected checkbox 2017-07-04 23:47:11 +02:00