+
-
<% end %>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index dfe92305d..87bbb6685 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -213,6 +213,7 @@ en:
hidden_debate: Hidden debate
hidden_proposal: Hidden proposal
title: Hidden comments
+ no_hidden_comments: There is no hidden comments.
dashboard:
index:
back: Go back to %{org}
@@ -226,6 +227,7 @@ en:
with_confirmed_hide: Confirmed
without_confirmed_hide: Pending
title: Hidden debates
+ no_hidden_debates: There is no hidden debates.
hidden_users:
index:
filter: Filter
@@ -234,6 +236,8 @@ en:
with_confirmed_hide: Confirmed
without_confirmed_hide: Pending
title: Hidden users
+ user: User
+ no_hidden_users: There is no hidden users.
show:
email: 'Email:'
hidden_at: 'Hidden at:'
@@ -715,6 +719,7 @@ en:
with_confirmed_hide: Confirmed
without_confirmed_hide: Pending
title: Hidden proposals
+ no_hidden_proposals: There is no hidden proposals.
settings:
flash:
updated: Value updated
@@ -757,6 +762,9 @@ en:
placeholder: Search user by name or email
search_results: "Search results"
no_search_results: "No results found."
+ actions: Actions
+ title: Title
+ description: Description
spending_proposals:
index:
geozone_filter_all: All zones
@@ -901,11 +909,12 @@ en:
total: Total
proposals_with_notifications: Proposals with notifications
tags:
- create: Create Topic
- destroy: Destroy Topic
+ create: Create topic
+ destroy: Destroy topic
index:
add_tag: Add a new proposal topic
title: Proposal topics
+ topic: Topic
name:
placeholder: Type the name of the topic
users:
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 289546bab..d1a24b314 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -213,6 +213,7 @@ es:
hidden_debate: Debate oculto
hidden_proposal: Propuesta oculta
title: Comentarios ocultos
+ no_hidden_comments: No hay comentarios ocultos.
dashboard:
index:
back: Volver a %{org}
@@ -226,6 +227,7 @@ es:
with_confirmed_hide: Confirmados
without_confirmed_hide: Pendientes
title: Debates ocultos
+ no_hidden_debates: No hay debates ocultos.
hidden_users:
index:
filter: Filtro
@@ -234,6 +236,8 @@ es:
with_confirmed_hide: Confirmados
without_confirmed_hide: Pendientes
title: Usuarios bloqueados
+ user: Usuario
+ no_hidden_users: No hay uusarios bloqueados.
show:
email: 'Email:'
hidden_at: 'Bloqueado:'
@@ -717,6 +721,7 @@ es:
with_confirmed_hide: Confirmadas
without_confirmed_hide: Pendientes
title: Propuestas ocultas
+ no_hidden_proposals: No hay propuestas ocultas.
settings:
flash:
updated: Valor actualizado
@@ -759,6 +764,9 @@ es:
placeholder: Buscar usuario por nombre o email
search_results: "Resultados de la búsqueda"
no_search_results: "No se han encontrado resultados."
+ actions: Acciones
+ title: "Título"
+ description: "Descripción"
spending_proposals:
index:
geozone_filter_all: Todos los ámbitos de actuación
@@ -903,11 +911,12 @@ es:
total: Total
proposals_with_notifications: Propuestas con notificaciones
tags:
- create: Crear Tema
- destroy: Eliminar Tema
+ create: Crear tema
+ destroy: Eliminar tema
index:
add_tag: Añade un nuevo tema de propuesta
title: Temas de propuesta
+ topic: Tema
name:
placeholder: Escribe el nombre del tema
users:
diff --git a/spec/factories.rb b/spec/factories.rb
index b1c5ff329..ed1d24fd6 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -536,6 +536,14 @@ FactoryGirl.define do
association :booth, factory: :poll_booth
association :officer, factory: :poll_officer
date Date.current
+
+ trait :vote_collection_task do
+ task 0
+ end
+
+ trait :recount_scrutiny_task do
+ task 1
+ end
end
factory :poll_voter, class: 'Poll::Voter' do
diff --git a/spec/features/admin/poll/booths_spec.rb b/spec/features/admin/poll/booths_spec.rb
index 4eeb81cb6..1aa487b26 100644
--- a/spec/features/admin/poll/booths_spec.rb
+++ b/spec/features/admin/poll/booths_spec.rb
@@ -113,4 +113,18 @@ feature 'Admin booths' do
end
end
+ scenario "Back link go back to available list when manage shifts" do
+ poll = create(:poll, :current)
+ booth = create(:poll_booth)
+ assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+
+ visit available_admin_booths_path
+
+ within("#booth_#{booth.id}") do
+ click_link "Manage shifts"
+ end
+
+ click_link "Go back"
+ expect(current_path).to eq(available_admin_booths_path)
+ end
end
diff --git a/spec/features/admin/poll/officer_assignments_spec.rb b/spec/features/admin/poll/officer_assignments_spec.rb
new file mode 100644
index 000000000..20be138b9
--- /dev/null
+++ b/spec/features/admin/poll/officer_assignments_spec.rb
@@ -0,0 +1,68 @@
+require 'rails_helper'
+
+feature 'Officer Assignments' do
+
+ background do
+ admin = create(:administrator)
+ login_as(admin.user)
+ end
+
+ scenario "Index" do
+ poll = create(:poll)
+ booth = create(:poll_booth)
+
+ officer1 = create(:poll_officer)
+ officer2 = create(:poll_officer)
+ officer3 = create(:poll_officer)
+
+ booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+ officer_assignment = create(:poll_officer_assignment, booth_assignment: booth_assignment, officer: officer1)
+
+ booth_assignment_2 = create(:poll_booth_assignment, poll: poll)
+ officer_assignment_2 = create(:poll_officer_assignment, booth_assignment: booth_assignment_2, officer: officer2)
+
+ visit admin_poll_path(poll)
+
+ click_link 'Officers (2)'
+
+ within('#officer_assignments') do
+ expect(page).to have_content officer1.name
+ expect(page).to have_content officer2.name
+ expect(page).to_not have_content officer3.name
+ end
+ end
+
+ scenario "Search", :js do
+ poll = create(:poll)
+ booth = create(:poll_booth)
+
+ user1 = create(:user, username: "John Snow")
+ user2 = create(:user, username: "John Silver")
+ user3 = create(:user, username: "John Edwards")
+
+ officer1 = create(:poll_officer, user: user1)
+ officer2 = create(:poll_officer, user: user2)
+ officer3 = create(:poll_officer, user: user3)
+
+ booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+ officer_assignment = create(:poll_officer_assignment, booth_assignment: booth_assignment, officer: officer1)
+
+ booth_assignment_2 = create(:poll_booth_assignment, poll: poll)
+ officer_assignment_2 = create(:poll_officer_assignment, booth_assignment: booth_assignment_2, officer: officer2)
+
+ visit admin_poll_path(poll)
+
+ click_link 'Officers (2)'
+
+ fill_in "search-officers", with: "John"
+ click_button "Search"
+
+ within('#search-officers-results') do
+ expect(page).to have_content officer1.name
+ expect(page).to have_content officer2.name
+ expect(page).to_not have_content officer3.name
+ end
+ end
+
+
+end
\ No newline at end of file
diff --git a/spec/features/admin/poll/shifts_spec.rb b/spec/features/admin/poll/shifts_spec.rb
index 7512d8b6d..6f027fad3 100644
--- a/spec/features/admin/poll/shifts_spec.rb
+++ b/spec/features/admin/poll/shifts_spec.rb
@@ -92,6 +92,37 @@ feature 'Admin shifts' do
end
end
+ scenario "Vote Collection Shift and Recount & Scrutiny Shift don't include already assigned dates to officer", :js do
+ poll = create(:poll, :current)
+ booth = create(:poll_booth)
+ assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+ officer = create(:poll_officer)
+
+ shift1 = create(:poll_shift, :vote_collection_task, officer: officer, booth: booth, date: Time.zone.today)
+ shift2 = create(:poll_shift, :recount_scrutiny_task, officer: officer, booth: booth, date: Time.zone.tomorrow)
+
+ vote_collection_dates = (poll.starts_at.to_date..poll.ends_at.to_date).to_a
+ .reject { |date| date == Time.zone.today }
+ .map { |date| I18n.l(date, format: :long) }
+ recount_scrutiny_dates = (poll.ends_at.to_date..poll.ends_at.to_date + 1.week).to_a
+ .reject { |date| date == Time.zone.tomorrow }
+ .map { |date| I18n.l(date, format: :long) }
+
+ visit available_admin_booths_path
+
+ within("#booth_#{booth.id}") do
+ click_link "Manage shifts"
+ end
+
+ fill_in "search", with: officer.email
+ click_button "Search"
+ click_link "Edit shifts"
+
+ expect(page).to have_select('shift_date_vote_collection_date', options: ["Select day", *vote_collection_dates])
+ select "Recount & Scrutiny", from: 'shift_task'
+ expect(page).to have_select('shift_date_recount_scrutiny_date', options: ["Select day", *recount_scrutiny_dates])
+ end
+
scenario "Error on create", :js do
poll = create(:poll, :current)
booth = create(:poll_booth)
diff --git a/spec/features/admin/tags_spec.rb b/spec/features/admin/tags_spec.rb
index dd9c38c6b..8ff205852 100644
--- a/spec/features/admin/tags_spec.rb
+++ b/spec/features/admin/tags_spec.rb
@@ -23,7 +23,7 @@ feature 'Admin tags' do
within("form.new_tag") do
fill_in "tag_name", with: 'important issues'
- click_button 'Create Topic'
+ click_button 'Create topic'
end
visit admin_tags_path
@@ -39,8 +39,8 @@ feature 'Admin tags' do
expect(page).to have_content @tag1.name
expect(page).to have_content tag2.name
- within("#edit_tag_#{tag2.id}") do
- click_link 'Destroy Topic'
+ within("#tag_#{tag2.id}") do
+ click_link 'Destroy topic'
end
visit admin_tags_path
@@ -58,8 +58,8 @@ feature 'Admin tags' do
expect(page).to have_content @tag1.name
expect(page).to have_content tag2.name
- within("#edit_tag_#{tag2.id}") do
- click_link 'Destroy Topic'
+ within("#tag_#{tag2.id}") do
+ click_link 'Destroy topic'
end
visit admin_tags_path
@@ -81,7 +81,7 @@ feature 'Admin tags' do
within("form.new_tag") do
fill_in "tag_name", with: "wow_category"
- click_button 'Create Topic'
+ click_button 'Create topic'
end
expect(ActsAsTaggableOn::Tag.category.where(name: "wow_category")).to exist