consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1313 from consul/polls-styles

Browse Source 
polls styles
This commit is contained in:
Juanjo Bazán
2016-12-28 14:15:56 +01:00
committed by GitHub
parent f5b032cfbe 4ab9a417fb
commit 3122e885ba
22 changed files with 300 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/stylesheets/admin.scss
View File

@@ -44,11 +44,22 @@ body.admin {
.button { .button {
margin-top: 0; margin-top: 0;
&.margin-top {
margin-top: $line-height;
}
} }
input[type="text"], textarea { input[type="text"], textarea {
width: 100%; width: 100%;
} }
.fieldset {
select {
height: $line-height*2;
}
}
} }
table { table {
@@ -59,6 +70,10 @@ body.admin {
&.text-center { &.text-center {
text-align: center; text-align: center;
} }
&.text-right {
text-align: right;
}
} }
tr { tr {

3
app/assets/stylesheets/participation.scss
View File

@@ -961,7 +961,10 @@
color: white; color: white;
text-decoration: underline; text-decoration: underline;
} }
}
.back, .icon-angle-left {
color: white;
} }
&.poll-show { &.poll-show {

8
app/views/admin/_menu.html.erb
View File

@@ -119,16 +119,16 @@
</ul> </ul>
</li> </li>
<li <%= 'class=active' if controller_name == 'geozones' %>> <li class="section-title" <%= 'class=active' if controller_name == 'geozones' %>>
<%= link_to admin_geozones_path do %> <%= link_to admin_geozones_path do %>
<span class="icon-settings"></span><%= t('admin.menu.geozones') %> <strong><%= t('admin.menu.geozones') %></strong>
<% end %> <% end %>
</li> </li>
<% if feature?(:signature_sheets) %> <% if feature?(:signature_sheets) %>
<li <%= "class=active" if controller_name == "signature_sheets" %>> <li class="section-title" <%= "class=active" if controller_name == "signature_sheets" %>>
<%= link_to admin_signature_sheets_path do %> <%= link_to admin_signature_sheets_path do %>
<span class="icon-budget"></span><%= t("admin.menu.signature_sheets") %> <strong><%= t("admin.menu.signature_sheets") %></strong>
<% end %> <% end %>
</li> </li>
<% end %> <% end %>

11
app/views/admin/poll/officer_assignments/index.html.erb
View File

@@ -1,4 +1,8 @@
<%= link_to @poll.name, admin_poll_path(@poll, anchor: 'tab-officers') %> <%= link_to admin_poll_path(@poll, anchor: 'tab-officers') do %>
<span class="icon-angle-left"></span>
<%= @poll.name %>
<% end %>
<h2><%= @officer.name %> - <%= @officer.email %></h2> <h2><%= @officer.name %> - <%= @officer.email %></h2>
<%= form_tag(admin_officer_assignments_path, {id: "officer_assignment_form"}) do %> <%= form_tag(admin_officer_assignments_path, {id: "officer_assignment_form"}) do %>
@@ -40,7 +44,8 @@
<thead> <thead>
<tr> <tr>
<th><%= t("admin.poll_officer_assignments.index.date") %></th> <th><%= t("admin.poll_officer_assignments.index.date") %></th>
<th colspan="2"><%= t("admin.poll_officer_assignments.index.booth") %></th> <th><%= t("admin.poll_officer_assignments.index.booth") %></th>
<th class="text-center"><%= t("admin.poll_officer_assignments.index.assignment") %></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -48,7 +53,7 @@
<tr id="<%= dom_id officer_assignment %>"> <tr id="<%= dom_id officer_assignment %>">
<td><%= l officer_assignment.date.to_date %></td> <td><%= l officer_assignment.date.to_date %></td>
<td><%= booth_name_with_location(officer_assignment.booth_assignment.booth) %></td> <td><%= booth_name_with_location(officer_assignment.booth_assignment.booth) %></td>
<td class="text-right"> <td class="text-center">
<%= link_to t("admin.poll_officer_assignments.index.remove_assignment"), <%= link_to t("admin.poll_officer_assignments.index.remove_assignment"),
admin_officer_assignment_path(officer_assignment), admin_officer_assignment_path(officer_assignment),
method: :delete, method: :delete,

8
app/views/admin/poll/officers/index.html.erb
View File

@@ -12,7 +12,8 @@
<%= page_entries_info @officers, entry_name: t('admin.poll_officers.officer.entry_name') %> <%= page_entries_info @officers, entry_name: t('admin.poll_officers.officer.entry_name') %>
</h3> </h3>
<table id="officers"> <% if @officers.any? %>
<table id="officers">
<thead> <thead>
<tr> <tr>
<th><%= t('admin.poll_officers.officer.name') %></th> <th><%= t('admin.poll_officers.officer.name') %></th>
@@ -46,6 +47,7 @@
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>
</table> </table>
<%= paginate @officers %> <%= paginate @officers %>
<% end %>

2
app/views/admin/poll/officers/user_not_found.js.erb
View File

@@ -1 +1 @@
$("#search-result").html("<div class=\"small-12 column\"><div class=\"callout alert\"><%= j t('admin.poll_officers.search.user_not_found') %></div></div>"); $("#search-result").html("<div class=\"callout alert\"><%= j t('admin.poll_officers.search.user_not_found') %></div>");

10
app/views/admin/poll/polls/_booths.html.erb
View File

@@ -5,11 +5,11 @@
<%= t("admin.polls.show.no_booths") %> <%= t("admin.polls.show.no_booths") %>
</div> </div>
<% else %> <% else %>
<table> <table class="margin">
<thead> <thead>
<th><%= t("admin.polls.show.name") %></th> <th><%= t("admin.polls.show.table_name") %></th>
<th><%= t("admin.polls.show.location") %></th> <th><%= t("admin.polls.show.table_location") %></th>
<th>&nbsp;</th> <th class="text-center"><%= t("admin.polls.show.table_assignment") %></th>
</thead> </thead>
<tbody> <tbody>
<% @poll.booths.each do |booth| %> <% @poll.booths.each do |booth| %>
@@ -22,7 +22,7 @@
<td> <td>
<%= booth.location %> <%= booth.location %>
</td> </td>
<td class="text-right"> <td class="text-center">
<%= link_to t("admin.polls.show.remove_booth"), <%= link_to t("admin.polls.show.remove_booth"),
admin_booth_assignment_path(poll: @poll, booth: booth), admin_booth_assignment_path(poll: @poll, booth: booth),
method: :delete, method: :delete,

6
app/views/admin/poll/polls/_officers.html.erb
View File

@@ -5,10 +5,10 @@
<%= t("admin.polls.show.no_officers") %> <%= t("admin.polls.show.no_officers") %>
</div> </div>
<% else %> <% else %>
<table> <table class="margin">
<thead> <thead>
<th><%= t("admin.polls.show.name") %></th> <th><%= t("admin.polls.show.table_name") %></th>
<th><%= t("admin.polls.show.email") %></th> <th><%= t("admin.polls.show.table_email") %></th>
</thead> </thead>
<tbody> <tbody>
<% @poll.officers.each do |officer| %> <% @poll.officers.each do |officer| %>

16
app/views/admin/poll/polls/_questions.html.erb
View File

@@ -5,11 +5,21 @@
<%= t('admin.polls.show.no_questions') %> <%= t('admin.polls.show.no_questions') %>
</div> </div>
<% else %> <% else %>
<table class="margin-top"> <table class="margin">
<thead>
<tr>
<th><%= t('admin.polls.show.table_title') %></th>
<th class="text-center"><%= t('admin.polls.show.table_assignment') %></th>
</tr>
</thead>
<% @poll.questions.each do |question| %> <% @poll.questions.each do |question| %>
<tr id="<%= dom_id(question) %>"> <tr id="<%= dom_id(question) %>">
<td><%= link_to question.title, admin_question_path(question) %></td> <td>
<td class="text-right"> <strong>
<%= link_to question.title, admin_question_path(question) %>
</strong>
</td>
<td class="text-center">
<%= link_to t('admin.polls.show.remove_question'), <%= link_to t('admin.polls.show.remove_question'),
remove_question_admin_poll_path(poll_id: @poll.id, question_id: question.id), remove_question_admin_poll_path(poll_id: @poll.id, question_id: question.id),
class: "button hollow alert", class: "button hollow alert",

12
app/views/admin/poll/polls/_search_booths.html.erb
View File

@@ -1,14 +1,16 @@
<%= form_tag(search_booths_admin_poll_path(@poll), method: :get, remote: true) do |f| %> <div class="row">
<div class="row">
<div class="small-12 medium-6 column"> <div class="small-12 medium-6 column">
<%= form_tag(search_booths_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
<div class="input-group">
<%= text_field_tag :search, <%= text_field_tag :search,
@search, @search,
placeholder: t("admin.shared.booths_search.placeholder"), id: "search-booths" %> placeholder: t("admin.shared.booths_search.placeholder"), id: "search-booths" %>
</div> <div class="input-group-button">
<div class="form-inline small-12 medium-3 column end">
<%= submit_tag t("admin.shared.booths_search.button"), class: "button" %> <%= submit_tag t("admin.shared.booths_search.button"), class: "button" %>
</div> </div>
</div> </div>
<% end %> <% end %>
</div>
</div>
<div id="search-booths-results"></div> <div id="search-booths-results"></div>

20
app/views/admin/poll/polls/_search_booths_results.html.erb
View File

@@ -1,7 +1,18 @@
<table> <% if @booths.blank? %>
<div class="callout alert margin-bottom">
<%= t('admin.polls.show.no_search_results') %>
</div>
<% else %>
<h3><%= t('admin.polls.show.search_results') %></h3>
<% end %>
<% if @booths.any? %>
<table>
<thead> <thead>
<tr> <tr>
<th colspan="3"><%= @booths.blank? ? t('admin.polls.show.no_search_results') : t('admin.polls.show.search_results') %></th> <th><%= t("admin.polls.show.table_name") %></th>
<th><%= t("admin.polls.show.table_location") %></th>
<th class="text-center"><%= t("admin.polls.show.table_assignment") %></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -13,7 +24,7 @@
<td> <td>
<%= booth.location %> <%= booth.location %>
</td> </td>
<td class="text-right"> <td class="text-center">
<% if @poll.booth_ids.include?(booth.id) %> <% if @poll.booth_ids.include?(booth.id) %>
<%= link_to t("admin.polls.show.remove_booth"), <%= link_to t("admin.polls.show.remove_booth"),
admin_booth_assignment_path(poll: @poll, booth: booth), admin_booth_assignment_path(poll: @poll, booth: booth),
@@ -29,4 +40,5 @@
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>
</table> </table>
<% end %>

12
app/views/admin/poll/polls/_search_officers.html.erb
View File

@@ -1,14 +1,16 @@
<%= form_tag(search_officers_admin_poll_path(@poll), method: :get, remote: true) do |f| %> <div class="row">
<div class="row">
<div class="small-12 medium-6 column"> <div class="small-12 medium-6 column">
<%= form_tag(search_officers_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
<div class="input-group">
<%= text_field_tag :search, <%= text_field_tag :search,
@search, @search,
placeholder: t("admin.shared.poll_officers_search.placeholder"), id: "search-officers" %> placeholder: t("admin.shared.poll_officers_search.placeholder"), id: "search-officers" %>
</div> <div class="input-group-button">
<div class="form-inline small-12 medium-3 column end">
<%= submit_tag t("admin.shared.poll_officers_search.button"), class: "button" %> <%= submit_tag t("admin.shared.poll_officers_search.button"), class: "button" %>
</div> </div>
</div> </div>
<% end %> <% end %>
</div>
</div>
<div id="search-officers-results"></div> <div id="search-officers-results"></div>

20
app/views/admin/poll/polls/_search_officers_results.html.erb
View File

@@ -1,7 +1,18 @@
<table> <% if @officers.blank? %>
<div class="callout alert margin-bottom">
<%= t('admin.polls.show.no_search_results') %>
</div>
<% else %>
<h3><%= t('admin.polls.show.search_results') %></h3>
<% end %>
<% if @officers.any? %>
<table>
<thead> <thead>
<tr> <tr>
<th colspan="3"><%= @officers.blank? ? t('admin.polls.show.no_search_results') : t('admin.polls.show.search_results') %></th> <th><%= t("admin.polls.show.table_name") %></th>
<th><%= t("admin.polls.show.table_email") %></th>
<th class="text-center"><%= t("admin.polls.show.table_assignment") %></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -13,7 +24,7 @@
<td> <td>
<%= user.email %> <%= user.email %>
</td> </td>
<td class="text-right"> <td class="text-center">
<% if @poll.officer_ids.include?(user.poll_officer.id) %> <% if @poll.officer_ids.include?(user.poll_officer.id) %>
<%= link_to t("admin.polls.show.edit_officer_assignments"), <%= link_to t("admin.polls.show.edit_officer_assignments"),
admin_officer_assignments_path(poll: @poll, officer: user.poll_officer), admin_officer_assignments_path(poll: @poll, officer: user.poll_officer),
@@ -27,4 +38,5 @@
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>
</table> </table>
<% end %>

13
app/views/admin/poll/polls/_search_questions.html.erb
View File

@@ -1,14 +1,17 @@
<%= form_tag(search_questions_admin_poll_path(@poll), method: :get, remote: true) do |f| %> <div class="row">
<div class="row">
<div class="small-12 medium-6 column"> <div class="small-12 medium-6 column">
<%= form_tag(search_questions_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
<div class="input-group">
<%= text_field_tag :search, <%= text_field_tag :search,
@search, @search,
placeholder: t("admin.shared.poll_questions_search.placeholder"), id: "search-questions" %> placeholder: t("admin.shared.poll_questions_search.placeholder"), id: "search-questions" %>
</div>
<div class="form-inline small-12 medium-3 column end"> <div class="input-group-button">
<%= submit_tag t("admin.shared.poll_questions_search.button"), class: "button" %> <%= submit_tag t("admin.shared.poll_questions_search.button"), class: "button" %>
</div> </div>
</div> </div>
<% end %> <% end %>
</div>
</div>
<div id="search-questions-results"></div> <div id="search-questions-results"></div>

20
app/views/admin/poll/polls/_search_questions_results.html.erb
View File

@@ -1,7 +1,18 @@
<table> <% if @questions.blank? %>
<div class="callout alert margin-bottom">
<%= t('admin.polls.show.no_search_results') %>
</div>
<% else %>
<h3><%= t('admin.polls.show.search_results') %></h3>
<% end %>
<% if @questions.any? %>
<table>
<thead> <thead>
<tr> <tr>
<th colspan="3"><%= @questions.blank? ? t('admin.polls.show.no_search_results') : t('admin.polls.show.search_results') %></th> <th><%= t("admin.polls.show.table_name") %></th>
<th><%= t("admin.polls.show.table_summary") %></th>
<th class="text-center"><%= t("admin.polls.show.table_assignment") %></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -13,7 +24,7 @@
<td> <td>
<%= question.summary %> <%= question.summary %>
</td> </td>
<td class="text-right"> <td class="text-center">
<%= link_to t("admin.polls.show.add_question"), <%= link_to t("admin.polls.show.add_question"),
add_question_admin_poll_path(poll_id: @poll.id, question_id: question.id), add_question_admin_poll_path(poll_id: @poll.id, question_id: question.id),
method: :patch, method: :patch,
@@ -22,4 +33,5 @@
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>
</table> </table>
<% end %>

13
app/views/admin/poll/polls/show.html.erb
View File

@@ -1,12 +1,15 @@
<h2 class="inline-block">
<%= @poll.name %>
<small><%= l @poll.starts_at.to_date %> - <%= l @poll.ends_at.to_date %></small>
</h2>
<%= link_to t("admin.actions.edit"), <%= link_to t("admin.actions.edit"),
edit_admin_poll_path(@poll), edit_admin_poll_path(@poll),
class: "button hollow float-right" %> class: "button hollow float-right" %>
<h2 class="inline-block">
<%= @poll.name %>
</h2>
<br>
<p class="inline-block">
(<%= l @poll.starts_at.to_date %> - <%= l @poll.ends_at.to_date %>)
</p>
<div id="poll-resources" class="tabs-content" data-tabs-content="assigned-resources-tabs"> <div id="poll-resources" class="tabs-content" data-tabs-content="assigned-resources-tabs">
<%= render "filter_subnav" %> <%= render "filter_subnav" %>

13
app/views/admin/poll/questions/show.html.erb
View File

@@ -7,14 +7,17 @@
<div class="row"> <div class="row">
<div class="small-12 medium-9 column"> <div class="small-12 medium-9 column">
<% if @question.proposal.present? %>
<%= t("admin.questions.show.proposal") %>
<%= link_to @question.proposal.title, proposal_path(@question.proposal) %>
<% end %>
<strong><%= t("admin.questions.show.title") %></strong> <strong><%= t("admin.questions.show.title") %></strong>
<h1><%= @question.title %></h1> <h1><%= @question.title %></h1>
<% if @question.proposal.present? %>
<p>
<strong><%= t("admin.questions.show.proposal") %></strong>
<br>
<%= link_to @question.proposal.title, proposal_path(@question.proposal) %>
</p>
<% end %>
<p> <p>
<strong><%= t("admin.questions.show.author") %></strong> <strong><%= t("admin.questions.show.author") %></strong>
<br> <br>

18
config/locales/admin.en.yml
View File

@@ -173,12 +173,13 @@ en:
new_assignment: "New shift" new_assignment: "New shift"
date: "Date" date: "Date"
booth: "Booth" booth: "Booth"
assignment: "Assignment"
select_date: "Select day" select_date: "Select day"
select_booth: "Select booth" select_booth: "Select booth"
add_assignment: "Add shift" add_assignment: "Add shift"
remove_assignment: "Remove" remove_assignment: "Remove"
assignments: "Officing shifts in this poll" assignments: "Officing shifts in this poll"
no_assignments: "This user has no officing shifts in this poll" no_assignments: "This user has no officing shifts in this poll."
polls: polls:
index: index:
title: "List of polls" title: "List of polls"
@@ -200,8 +201,8 @@ en:
questions_tab: Questions questions_tab: Questions
booths_tab: Booths booths_tab: Booths
officers_tab: Officers officers_tab: Officers
no_booths: "There are no booths in this poll." no_booths: "There are no booths assigned to this poll."
no_questions: "There are no questions assigned to this poll yet." no_questions: "There are no questions assigned to this poll."
no_officers: "There are no officers assigned to this poll." no_officers: "There are no officers assigned to this poll."
remove_booth: "Remove booth from poll" remove_booth: "Remove booth from poll"
booths_title: "List of booths" booths_title: "List of booths"
@@ -212,11 +213,14 @@ en:
add_question: "Include question" add_question: "Include question"
add_officer_assignments: "Add shifts as officer" add_officer_assignments: "Add shifts as officer"
edit_officer_assignments: "Edit officing shifts" edit_officer_assignments: "Edit officing shifts"
name: "Name"
location: "Location"
email: "Email"
search_results: "Search results" search_results: "Search results"
no_search_results: "No results found" no_search_results: "No results found."
table_title: "Title"
table_summary: "Summary"
table_assignment: "Assignment"
table_name: "Name"
table_location: "Location"
table_email: "Email"
flash: flash:
question_added: "Question added to this poll" question_added: "Question added to this poll"
error_on_question_added: "Question could not be assigned to this poll" error_on_question_added: "Question could not be assigned to this poll"

20
config/locales/admin.es.yml
View File

@@ -173,12 +173,13 @@ es:
new_assignment: "Nuevo turno" new_assignment: "Nuevo turno"
date: "Fecha" date: "Fecha"
booth: "Urna" booth: "Urna"
assignment: "Asignación"
select_date: "Seleccionar día" select_date: "Seleccionar día"
select_booth: "Seleccionar urna" select_booth: "Seleccionar urna"
add_assignment: "Añadir turno" add_assignment: "Añadir turno"
remove_assignment: "Eliminar turno" remove_assignment: "Eliminar turno"
assignments: "Turnos como presidente de mesa en esta votación" assignments: "Turnos como presidente de mesa en esta votación"
no_assignments: "No tiene turnos como presidente de mesa en esta votación" no_assignments: "No tiene turnos como presidente de mesa en esta votación."
polls: polls:
index: index:
title: "Listado de votaciones" title: "Listado de votaciones"
@@ -200,9 +201,9 @@ es:
questions_tab: Preguntas questions_tab: Preguntas
booths_tab: Urnas booths_tab: Urnas
officers_tab: Presidentes de mesa officers_tab: Presidentes de mesa
no_booths: "No hay urnas en esta votación." no_booths: "No hay urnas asignadas a esta votación."
no_questions: "No hay preguntas asignadas a esta votación todavía." no_questions: "No hay preguntas asignadas a esta votación."
no_officers: "No hay presidentes de mesa asignados." no_officers: "No hay presidentes de mesa asignados a esta votación."
remove_booth: "Desasignar urna" remove_booth: "Desasignar urna"
booths_title: "Listado de urnas asignadas" booths_title: "Listado de urnas asignadas"
officers_title: "Listado de presidentes de mesa asignados" officers_title: "Listado de presidentes de mesa asignados"
@@ -212,11 +213,14 @@ es:
add_question: "Incluir pregunta" add_question: "Incluir pregunta"
add_officer_assignments: "Añadir turnos como presidente de mesa" add_officer_assignments: "Añadir turnos como presidente de mesa"
edit_officer_assignments: "Editar turnos" edit_officer_assignments: "Editar turnos"
name: "Nombre"
location: "Ubicación"
email: "Email"
search_results: "Resultados de la búsqueda" search_results: "Resultados de la búsqueda"
no_search_results: "No se han encontrado resultados" no_search_results: "No se han encontrado resultados."
table_title: "Título"
table_summary: "Resumen"
table_assignment: "Asignación"
table_name: "Nombre"
table_location: "Ubicación"
table_email: "Email"
flash: flash:
question_added: "Pregunta añadida a esta votación" question_added: "Pregunta añadida a esta votación"
error_on_question_added: "No se pudo asignar la pregunta" error_on_question_added: "No se pudo asignar la pregunta"

8
spec/features/admin/poll/booth_assigments_spec.rb
View File

@@ -16,7 +16,7 @@ feature 'Admin booths assignments' do
click_link 'Booths (0)' click_link 'Booths (0)'
end end
expect(page).to have_content 'There are no booths in this poll' expect(page).to have_content 'There are no booths assigned to this poll.'
fill_in 'search-booths', with: booth.name fill_in 'search-booths', with: booth.name
click_button 'Search' click_button 'Search'
@@ -32,7 +32,7 @@ feature 'Admin booths assignments' do
click_link 'Booths (1)' click_link 'Booths (1)'
end end
expect(page).to_not have_content 'There are no booths in this poll' expect(page).to_not have_content 'There are no booths assigned to this poll.'
expect(page).to have_content booth.name expect(page).to have_content booth.name
end end
@@ -46,7 +46,7 @@ feature 'Admin booths assignments' do
click_link 'Booths (1)' click_link 'Booths (1)'
end end
expect(page).to_not have_content 'There are no booths in this poll' expect(page).to_not have_content 'There are no booths assigned to this poll.'
expect(page).to have_content booth.name expect(page).to have_content booth.name
within("#booth_#{booth.id}") do within("#booth_#{booth.id}") do
@@ -60,7 +60,7 @@ feature 'Admin booths assignments' do
click_link 'Booths (0)' click_link 'Booths (0)'
end end
expect(page).to have_content 'There are no booths in this poll' expect(page).to have_content 'There are no booths assigned to this poll.'
expect(page).to_not have_content booth.name expect(page).to_not have_content booth.name
end end
end end

4
spec/features/admin/poll/officers_spec.rb
View File

@@ -30,9 +30,7 @@ feature 'Admin poll officers' do
scenario 'Delete' do scenario 'Delete' do
click_link 'Delete position' click_link 'Delete position'
within("#officers") do expect(page).to_not have_css '#officers'
expect(page).to_not have_content @officer.name
end
end end
end end

4
spec/features/admin/poll/polls_spec.rb
View File

@@ -103,7 +103,7 @@ feature 'Admin polls' do
visit admin_poll_path(poll) visit admin_poll_path(poll)
click_link "Booths (0)" click_link "Booths (0)"
expect(page).to have_content "There are no booths in this poll." expect(page).to have_content "There are no booths assigned to this poll."
end end
scenario "Booth list", :js do scenario "Booth list", :js do
@@ -122,7 +122,7 @@ feature 'Admin polls' do
expect(page).to have_content booth.location expect(page).to have_content booth.location
end end
end end
expect(page).to_not have_content "There are no booths" expect(page).to_not have_content "There are no booths assigned to this poll."
end end
end end
end end