+ <%= link_to t("admin.stats.show.polls"),
+ polls_admin_stats_path, class: "button hollow" %>
<%= link_to t("admin.stats.show.direct_messages"),
direct_messages_admin_stats_path, class: "button hollow" %>
<%= link_to t("admin.stats.show.proposal_notifications"),
diff --git a/app/views/admin/valuators/index.html.erb b/app/views/admin/valuators/index.html.erb
index 622d01307..dfb93ed80 100644
--- a/app/views/admin/valuators/index.html.erb
+++ b/app/views/admin/valuators/index.html.erb
@@ -1,6 +1,6 @@
-<%= render 'admin/shared/user_search', url: search_admin_valuators_path %>
+<%= render "admin/shared/user_search", url: search_admin_valuators_path %>
<% if @valuators.any? %>
@@ -11,16 +11,13 @@
<%= t("admin.valuators.index.name") %> |
<%= t("admin.valuators.index.email") %> |
<%= t("admin.valuators.index.description") %> |
+
<%= t("admin.actions.actions") %> |
<% @valuators.each do |valuator| %>
- |
- <%= valuator.name %>
- |
-
- <%= valuator.email %>
- |
+ <%= valuator.name %> |
+ <%= valuator.email %> |
<% if valuator.description.present? %>
<%= valuator.description %>
@@ -28,6 +25,12 @@
<%= t("admin.valuators.index.no_description") %>
<% end %>
|
+
+ <%= link_to t("admin.valuators.valuator.delete"),
+ admin_valuator_path(valuator),
+ method: :delete,
+ class: "button hollow alert expanded" %>
+ |
<% end %>
diff --git a/app/views/admin/valuators/search.html.erb b/app/views/admin/valuators/search.html.erb
index 2710cb44d..b383e554d 100644
--- a/app/views/admin/valuators/search.html.erb
+++ b/app/views/admin/valuators/search.html.erb
@@ -29,7 +29,12 @@
<%= t("admin.valuators.index.no_description") %>
<% end %>
- <% unless user.valuator? %>
+ <% if user.valuator? %>
+ <%= link_to t("admin.valuators.valuator.delete"),
+ admin_valuator_path(user),
+ method: :delete,
+ class: "button hollow alert expanded" %>
+ <% else %>
<%= form_for Valuator.new(user: user), url: admin_valuators_path do |f| %>
<%= f.text_field :description,
label: false,
diff --git a/app/views/kaminari/_first_page.html.erb b/app/views/kaminari/_first_page.html.erb
index b9802389d..e8afb0431 100644
--- a/app/views/kaminari/_first_page.html.erb
+++ b/app/views/kaminari/_first_page.html.erb
@@ -1,3 +1,3 @@
- <%= link_to t("views.pagination.first").html_safe, url, :remote => remote %>
+ <%= link_to t("views.pagination.first").html_safe, kaminari_path(url), :remote => remote %>
diff --git a/app/views/kaminari/_last_page.html.erb b/app/views/kaminari/_last_page.html.erb
index 179f6e7fc..5a49bd7e2 100644
--- a/app/views/kaminari/_last_page.html.erb
+++ b/app/views/kaminari/_last_page.html.erb
@@ -1,3 +1,3 @@
- <%= link_to t("views.pagination.last").html_safe, url, :remote => remote %>
+ <%= link_to t("views.pagination.last").html_safe, kaminari_path(url), :remote => remote %>
diff --git a/app/views/kaminari/_next_page.html.erb b/app/views/kaminari/_next_page.html.erb
index f305b1b7d..11c700900 100644
--- a/app/views/kaminari/_next_page.html.erb
+++ b/app/views/kaminari/_next_page.html.erb
@@ -1,3 +1,3 @@
diff --git a/app/views/kaminari/_page.html.erb b/app/views/kaminari/_page.html.erb
index 12610dada..7b380fe4f 100644
--- a/app/views/kaminari/_page.html.erb
+++ b/app/views/kaminari/_page.html.erb
@@ -5,6 +5,6 @@
<% else %>
- <%= link_to page, url, {:remote => remote, :rel => page.next? ? "next" : page.prev? ? "prev" : nil} %>
+ <%= link_to page, kaminari_path(url), {:remote => remote, :rel => page.next? ? "next" : page.prev? ? "prev" : nil} %>
<% end %>
diff --git a/app/views/kaminari/_prev_page.html.erb b/app/views/kaminari/_prev_page.html.erb
index 902a8c89e..aba1d9369 100644
--- a/app/views/kaminari/_prev_page.html.erb
+++ b/app/views/kaminari/_prev_page.html.erb
@@ -1,3 +1,3 @@
diff --git a/app/views/management/_menu.html.erb b/app/views/management/_menu.html.erb
index 050e5eb7f..b01bbaf0c 100644
--- a/app/views/management/_menu.html.erb
+++ b/app/views/management/_menu.html.erb
@@ -44,21 +44,31 @@
<% end %>
- >
- <%= link_to create_investments_management_budgets_path do %>
-
- <%= t("management.menu.create_budget_investment") %>
- <% end %>
-
+ <% if Setting['feature.budgets'] %>
+ >
+ <%= link_to create_investments_management_budgets_path do %>
+
+ <%= t("management.menu.create_budget_investment") %>
+ <% end %>
+
- >
- <%= link_to support_investments_management_budgets_path do %>
-
- <%= t("management.menu.support_budget_investments") %>
- <% end %>
-
+ >
+ <%= link_to support_investments_management_budgets_path do %>
+
+ <%= t("management.menu.support_budget_investments") %>
+ <% end %>
+
+
+ >
+ <%= link_to print_investments_management_budgets_path do %>
+
+ <%= t("management.menu.print_budget_investments") %>
+ <% end %>
+
+ <% end %>
>
<%= link_to print_management_proposals_path do %>
@@ -74,15 +84,6 @@
<% end %>
- >
- <%= link_to print_investments_management_budgets_path do %>
-
- <%= t("management.menu.print_budget_investments") %>
- <% end %>
-
-
-
<%= link_to new_management_user_invite_path do %>
diff --git a/app/views/shared/_social_media_meta_tags.html.erb b/app/views/shared/_social_media_meta_tags.html.erb
index 8c1196c96..a72ab250e 100644
--- a/app/views/shared/_social_media_meta_tags.html.erb
+++ b/app/views/shared/_social_media_meta_tags.html.erb
@@ -1,20 +1,20 @@
-
-
-
-
-
+
+
+
+
+
-
+
<% if setting['url'] %>
- />
+
<% end %>
<% if setting['facebook_handle'] %>
<% end %>
-
+
-
+
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index e27f4436e..de64d9cd8 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -4,6 +4,11 @@
<%= render "shared/canonical", href: root_url %>
<% end %>
+<% provide :social_media_meta_tags do %>
+ <%= render "shared/social_media_meta_tags",
+ social_url: root_url %>
+<% end %>
+
diff --git a/bin/knapsack_pro_rspec b/bin/knapsack_pro_rspec
new file mode 100755
index 000000000..9aaf762ad
--- /dev/null
+++ b/bin/knapsack_pro_rspec
@@ -0,0 +1,9 @@
+#!/bin/bash
+if [ "$KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC" = "" ]; then
+ KNAPSACK_PRO_ENDPOINT=https://api-disabled-for-fork.knapsackpro.com \
+ KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC=disabled-for-fork \
+ bundle exec rake knapsack_pro:rspec # use Regular Mode here always
+else
+ # Queue Mode - dynamic tests allocation across CI nodes
+ bundle exec rake knapsack_pro:queue:rspec
+fi
diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml
index f5f06122e..89befa33b 100644
--- a/config/locales/en/activerecord.yml
+++ b/config/locales/en/activerecord.yml
@@ -288,3 +288,8 @@ en:
image:
image_width: "Width must be %{required_width}px"
image_height: "Height must be %{required_height}px"
+ messages:
+ record_invalid: "Validation failed: %{errors}"
+ restrict_dependent_destroy:
+ has_one: "Cannot delete record because a dependent %{record} exists"
+ has_many: "Cannot delete record because dependent %{record} exist"
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index 823d7084b..62dc77d19 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -104,6 +104,7 @@ en:
table_heading: Heading
table_amount: Amount
table_population: Population
+ population_info: "Budget Heading population field is used for Statistic purposes at the end of the Budget to show for each Heading that represents an area with population what percentage voted. The field is optional so you can leave it empty if it doesn't apply."
winners:
calculate: Calculate Winner Investments
calculated: Winners being calculated, it may take a minute.
@@ -157,6 +158,7 @@ en:
dossier: Dossier
edit_dossier: Edit dossier
tags: Tags
+ user_tags: User tags
undefined: Undefined
milestone: Milestone
new_milestone: Create new milestone
@@ -181,6 +183,7 @@ en:
assigned_valuators: Valuators
select_heading: Select heading
submit_button: Update
+ user_tags: User assigned tags
tags: Tags
tags_placeholder: "Write the tags you want separated by commas (,)"
undefined: Undefined
@@ -481,6 +484,7 @@ en:
valuator:
description_placeholder: 'Description (optional)'
add: Add to valuators
+ delete: Delete
search:
title: 'Valuators: User search'
summary:
@@ -555,6 +559,8 @@ en:
assign: Assign booth
unassign: Unassign booth
poll_booth_assignments:
+ alert:
+ shifts: "There are shifts associated to this booth. If you remove the booth assignment, the shifts will be also deleted. Continue?"
flash:
destroy: "Booth not assigned anymore"
create: "Booth assigned"
@@ -952,6 +958,7 @@ en:
direct_messages: Direct messages
proposal_notifications: Proposal notifications
incomplete_verifications: Incomplete verifications
+ polls: Polls
direct_messages:
title: Direct messages
total: Total
@@ -960,6 +967,17 @@ en:
title: Proposal notifications
total: Total
proposals_with_notifications: Proposals with notifications
+ polls:
+ title: Poll Stats
+ all: Polls
+ web_participants: Web participants
+ total_participants: Total Participants
+ poll_questions: "Questions from poll: %{poll}"
+ table:
+ poll_name: Poll
+ question_name: Question
+ origin_web: Web participants
+ origin_total: Total participants
tags:
create: Create topic
destroy: Destroy topic
diff --git a/config/locales/en/settings.yml b/config/locales/en/settings.yml
index 0d5862408..2295660ac 100644
--- a/config/locales/en/settings.yml
+++ b/config/locales/en/settings.yml
@@ -48,6 +48,7 @@ en:
map_zoom: Zoom
mailer_from_name: Origin email name
mailer_from_address: Origin email address
+ meta_title: "Site title (SEO)"
meta_description: "Site description (SEO)"
meta_keywords: "Keywords (SEO)"
verification_offices_url: Verification offices URL
diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml
index 50499193d..16885db63 100644
--- a/config/locales/es/activerecord.yml
+++ b/config/locales/es/activerecord.yml
@@ -283,3 +283,8 @@ es:
image:
image_width: "Debe tener %{required_width}px de ancho"
image_height: "Debe tener %{required_height}px de alto"
+ messages:
+ record_invalid: "La validación falló: %{errors}"
+ restrict_dependent_destroy:
+ has_one: No se puede eliminar el registro porque existe un %{record} dependiente
+ has_many: No se puede eliminar el registro porque existen %{record} dependientes
\ No newline at end of file
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 8d0b6cbf8..a54cb9bcd 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -104,6 +104,7 @@ es:
table_heading: Partida
table_amount: Cantidad
table_population: Población
+ population_info: "El campo población de las partidas presupuestarias se usa con fines estadísticos únicamente, con el objetivo de mostrar el porcentaje de votos habidos en cada partida que represente un área con población. Es un campo opcional, así que puedes dejarlo en blanco si no aplica."
winners:
calculate: Calcular propuestas ganadoras
calculated: Calculando ganadoras, puede tardar un minuto.
@@ -157,6 +158,7 @@ es:
dossier: Informe
edit_dossier: Editar informe
tags: Etiquetas
+ user_tags: Etiquetas del usuario
undefined: Sin definir
milestone: Seguimiento
new_milestone: Crear nuevo hito
@@ -181,6 +183,7 @@ es:
assigned_valuators: Evaluadores
select_heading: Seleccionar partida
submit_button: Actualizar
+ user_tags: Etiquetas asignadas por el usuario
tags: Etiquetas
tags_placeholder: "Escribe las etiquetas que desees separadas por comas (,)"
undefined: Sin definir
@@ -481,6 +484,7 @@ es:
valuator:
description_placeholder: 'Descripción (opcional)'
add: Añadir como evaluador
+ delete: Borrar
search:
title: 'Evaluadores: Búsqueda de usuarios'
summary:
@@ -553,8 +557,10 @@ es:
unassigned: No asignada
actions:
assign: Asignar urna
- unassign: Asignar urna
+ unassign: Desasignar urna
poll_booth_assignments:
+ alert:
+ shifts: "Hay turnos asignados para esta urna. Si la desasignas, esos turnos se eliminarán. ¿Deseas continuar?"
flash:
destroy: "Urna desasignada"
create: "Urna asignada"
@@ -952,6 +958,7 @@ es:
direct_messages: Mensajes directos
proposal_notifications: Notificaciones de propuestas
incomplete_verifications: Verificaciones incompletas
+ polls: Votaciones
direct_messages:
title: Mensajes directos
total: Total
@@ -960,6 +967,17 @@ es:
title: Notificaciones de propuestas
total: Total
proposals_with_notifications: Propuestas con notificaciones
+ polls:
+ title: Estadísticas de votaciones
+ all: Votaciones
+ web_participants: Participantes en Web
+ total_participants: Participantes totales
+ poll_questions: "Preguntas de votación: %{poll}"
+ table:
+ poll_name: Votación
+ question_name: Pregunta
+ origin_web: Participantes Web
+ origin_total: Participantes Totales
tags:
create: Crear tema
destroy: Eliminar tema
diff --git a/config/locales/es/settings.yml b/config/locales/es/settings.yml
index fcf2eb1db..ae31d0a4a 100644
--- a/config/locales/es/settings.yml
+++ b/config/locales/es/settings.yml
@@ -48,6 +48,7 @@ es:
map_zoom: Zoom
mailer_from_name: Nombre email remitente
mailer_from_address: Dirección email remitente
+ meta_title: "Título del sitio (SEO)"
meta_description: "Descripción del sitio (SEO)"
meta_keywords: "Palabras clave (SEO)"
verification_offices_url: URL oficinas verificación
diff --git a/config/routes.rb b/config/routes.rb
index 491127439..31d811293 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -36,6 +36,8 @@ Rails.application.routes.draw do
get '/welcome', to: 'welcome#welcome'
get '/cuentasegura', to: 'welcome#verification', as: :cuentasegura
+ get '/consul.json', to: "installation#details"
+
resources :debates do
member do
post :vote
@@ -272,7 +274,7 @@ Rails.application.routes.draw do
get :search, on: :collection
end
- resources :valuators, only: [:index, :create] do
+ resources :valuators, only: [:index, :create, :destroy] do
get :search, on: :collection
get :summary, on: :collection
end
@@ -339,6 +341,7 @@ Rails.application.routes.draw do
resource :stats, only: :show do
get :proposal_notifications, on: :collection
get :direct_messages, on: :collection
+ get :polls, on: :collection
end
namespace :legislation do
diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb
index 60493e0a5..8476f7693 100644
--- a/db/dev_seeds.rb
+++ b/db/dev_seeds.rb
@@ -50,11 +50,13 @@ section "Creating Settings" do
Setting.create(key: 'feature.user.recommendations', value: "true")
Setting.create(key: 'feature.community', value: "true")
Setting.create(key: 'feature.map', value: "true")
+ Setting.create(key: 'feature.public_stats', value: "true")
Setting.create(key: 'per_page_code_head', value: "")
Setting.create(key: 'per_page_code_body', value: "")
Setting.create(key: 'comments_body_max_length', value: '1000')
Setting.create(key: 'mailer_from_name', value: 'CONSUL')
Setting.create(key: 'mailer_from_address', value: 'noreply@consul.dev')
+ Setting.create(key: 'meta_title', value: 'CONSUL')
Setting.create(key: 'meta_description', value: 'Citizen Participation and Open Government Application')
Setting.create(key: 'meta_keywords', value: 'citizen participation, open government')
Setting.create(key: 'verification_offices_url', value: 'http://oficinas-atencion-ciudadano.url/')
@@ -63,6 +65,7 @@ section "Creating Settings" do
Setting.create(key: 'map_latitude', value: 51.48)
Setting.create(key: 'map_longitude', value: 0.0)
Setting.create(key: 'map_zoom', value: 10)
+ Setting.create(key: 'related_contents_report_threshold', value: 2)
end
section "Creating Geozones" do
diff --git a/db/migrate/20171127171925_create_related_content.rb b/db/migrate/20171127171925_create_related_content.rb
new file mode 100644
index 000000000..2944938e2
--- /dev/null
+++ b/db/migrate/20171127171925_create_related_content.rb
@@ -0,0 +1,12 @@
+class CreateRelatedContent < ActiveRecord::Migration
+ def change
+ create_table :related_contents do |t|
+ t.references :parent_relationable, polymorphic: true, index: { name: 'index_related_contents_on_parent_relationable' }
+ t.references :child_relationable, polymorphic: true, index: { name: 'index_related_contents_on_child_relationable' }
+ t.references :related_content, index: { name: 'opposite_related_content' }
+ t.timestamps
+ end
+
+ add_index :related_contents, [:parent_relationable_id, :parent_relationable_type, :child_relationable_id, :child_relationable_type], name: "unique_parent_child_related_content", unique: true, using: :btree
+ end
+end
diff --git a/db/migrate/20171127230716_add_time_reported_to_related_content.rb b/db/migrate/20171127230716_add_time_reported_to_related_content.rb
new file mode 100644
index 000000000..5cca12cf3
--- /dev/null
+++ b/db/migrate/20171127230716_add_time_reported_to_related_content.rb
@@ -0,0 +1,5 @@
+class AddTimeReportedToRelatedContent < ActiveRecord::Migration
+ def change
+ add_column :related_contents, :times_reported, :integer, default: 0
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f2dd62428..4d426cf9e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20171115164152) do
+ActiveRecord::Schema.define(version: 20171127230716) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -851,6 +851,22 @@ ActiveRecord::Schema.define(version: 20171115164152) do
add_index "proposals", ["title"], name: "index_proposals_on_title", using: :btree
add_index "proposals", ["tsv"], name: "index_proposals_on_tsv", using: :gin
+ create_table "related_contents", force: :cascade do |t|
+ t.integer "parent_relationable_id"
+ t.string "parent_relationable_type"
+ t.integer "child_relationable_id"
+ t.string "child_relationable_type"
+ t.integer "related_content_id"
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ t.integer "times_reported", default: 0
+ end
+
+ add_index "related_contents", ["child_relationable_type", "child_relationable_id"], name: "index_related_contents_on_child_relationable", using: :btree
+ add_index "related_contents", ["parent_relationable_id", "parent_relationable_type", "child_relationable_id", "child_relationable_type"], name: "unique_parent_child_related_content", unique: true, using: :btree
+ add_index "related_contents", ["parent_relationable_type", "parent_relationable_id"], name: "index_related_contents_on_parent_relationable", using: :btree
+ add_index "related_contents", ["related_content_id"], name: "opposite_related_content", using: :btree
+
create_table "settings", force: :cascade do |t|
t.string "key"
t.string "value"
diff --git a/db/seeds.rb b/db/seeds.rb
index fcfa6340c..6ef55067c 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -65,6 +65,7 @@ Setting["org_name"] = "CONSUL"
Setting["place_name"] = "CONSUL-land"
# Meta tags for SEO
+Setting["meta_title"] = nil
Setting["meta_description"] = nil
Setting["meta_keywords"] = nil
@@ -115,3 +116,6 @@ Setting['proposal_improvement_path'] = nil
Setting['map_latitude'] = 51.48
Setting['map_longitude'] = 0.0
Setting['map_zoom'] = 10
+
+# Related content
+Setting['related_contents_report_threshold'] = 5
diff --git a/spec/controllers/installation_controller_spec.rb b/spec/controllers/installation_controller_spec.rb
new file mode 100644
index 000000000..68c2e7c07
--- /dev/null
+++ b/spec/controllers/installation_controller_spec.rb
@@ -0,0 +1,54 @@
+require 'rails_helper'
+
+describe InstallationController, type: :request do
+
+ describe "consul.json" do
+ let(:feature_settings) do
+ {
+ 'debates' => nil,
+ 'spending_proposals' => 't',
+ 'polls' => nil,
+ 'twitter_login' => nil,
+ 'facebook_login' => nil,
+ 'google_login' => nil,
+ 'public_stats' => nil,
+ 'budgets' => nil,
+ 'signature_sheets' => nil,
+ 'legislation' => nil,
+ 'user.recommendations' => nil,
+ 'community' => nil,
+ 'map' => 't',
+ 'spending_proposal_features.voting_allowed' => 't'
+ }
+ end
+
+ before do
+ feature_settings.each { |feature_name, feature_value| Setting["feature.#{feature_name}"] = feature_value }
+ end
+
+ after do
+ Setting['feature.debates'] = true
+ Setting['feature.spending_proposals'] = nil
+ Setting['feature.polls'] = true
+ Setting['feature.twitter_login'] = true
+ Setting['feature.facebook_login'] = true
+ Setting['feature.google_login'] = true
+ Setting['feature.public_stats'] = true
+ Setting['feature.budgets'] = true
+ Setting['feature.signature_sheets'] = true
+ Setting['feature.legislation'] = true
+ Setting['feature.user.recommendations'] = true
+ Setting['feature.community'] = true
+ Setting['feature.map'] = nil
+ Setting['feature.spending_proposal_features.voting_allowed'] = nil
+ end
+
+ specify "with query string inside query params" do
+ get '/consul.json'
+
+ expect(response).to have_http_status(:ok)
+ expect(JSON.parse(response.body)['release']).not_to be_empty
+ expect(JSON.parse(response.body)['features']).to eq(feature_settings)
+ end
+ end
+end
diff --git a/spec/factories.rb b/spec/factories.rb
index b98fc7adb..1ac2f3ebd 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -882,4 +882,7 @@ LOREM_IPSUM
end
end
+ factory :related_content do
+ end
+
end
diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb
index 7252e2660..1ad89e6aa 100644
--- a/spec/features/admin/budget_investments_spec.rb
+++ b/spec/features/admin/budget_investments_spec.rb
@@ -421,20 +421,37 @@ feature 'Admin budget investments' do
end
end
- scenario "Only displays valuation tags" do
+ scenario "Changes valuation and user generated tags" do
budget_investment = create(:budget_investment, tag_list: 'Park')
budget_investment.set_tag_list_on(:valuation, 'Education')
budget_investment.save
visit admin_budget_budget_investment_path(budget_investment.budget, budget_investment)
- expect(page).to have_content "Education"
- expect(page).to_not have_content "Park"
+ within("#user-tags") do
+ expect(page).to_not have_content "Education"
+ expect(page).to have_content "Park"
+ end
click_link 'Edit classification'
- expect(page).to have_content "Education"
- expect(page).to_not have_content "Park"
+ fill_in 'budget_investment_tag_list', with: 'Park, Trees'
+ fill_in 'budget_investment_valuation_tag_list', with: 'Education, Environment'
+ click_button 'Update'
+
+ visit admin_budget_budget_investment_path(budget_investment.budget, budget_investment)
+
+ within("#user-tags") do
+ expect(page).to_not have_content "Education"
+ expect(page).to_not have_content "Environment"
+ expect(page).to have_content "Park, Trees"
+ end
+
+ within("#tags") do
+ expect(page).to have_content "Education, Environment"
+ expect(page).to_not have_content "Park"
+ expect(page).to_not have_content "Trees"
+ end
end
scenario "Maintains user tags" do
diff --git a/spec/features/admin/poll/booth_assigments_spec.rb b/spec/features/admin/poll/booth_assigments_spec.rb
index cceec1a3e..29e1eccde 100644
--- a/spec/features/admin/poll/booth_assigments_spec.rb
+++ b/spec/features/admin/poll/booth_assigments_spec.rb
@@ -106,6 +106,41 @@ feature 'Admin booths assignments' do
expect(page).to have_content 'There are no booths assigned to this poll.'
expect(page).not_to have_content booth.name
end
+
+ scenario 'Unassing booth whith associated shifts', :js do
+ assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+ officer = create(:poll_officer)
+ create(:poll_officer_assignment, officer: officer, booth_assignment: assignment)
+ create(:poll_shift, booth: booth, officer: officer)
+
+ visit manage_admin_poll_booth_assignments_path(poll)
+
+ within("#poll_booth_#{booth.id}") do
+ expect(page).to have_content(booth.name)
+ expect(page).to have_content "Assigned"
+
+ click_link 'Unassign booth'
+
+ expect(page).to have_content "Unassigned"
+ expect(page).not_to have_content "Assigned"
+ expect(page).to have_link "Assign booth"
+ end
+ end
+
+ scenario "Cannot unassing booth if poll is expired" do
+ poll_expired = create(:poll, :expired)
+ create(:poll_booth_assignment, poll: poll_expired, booth: booth)
+
+ visit manage_admin_poll_booth_assignments_path(poll_expired)
+
+ within("#poll_booth_#{booth.id}") do
+ expect(page).to have_content(booth.name)
+ expect(page).to have_content "Assigned"
+
+ expect(page).not_to have_link 'Unassign booth'
+ end
+
+ end
end
feature 'Show' do
diff --git a/spec/features/admin/stats_spec.rb b/spec/features/admin/stats_spec.rb
index c0aefe4e5..60dae016b 100644
--- a/spec/features/admin/stats_spec.rb
+++ b/spec/features/admin/stats_spec.rb
@@ -162,4 +162,99 @@ feature 'Stats' do
end
+ context "Polls" do
+
+ scenario "Total participants by origin" do
+ oa = create(:poll_officer_assignment)
+ 3.times { create(:poll_voter, origin: "web") }
+
+ visit admin_stats_path
+
+ within(".stats") do
+ click_link "Polls"
+ end
+
+ within("#web_participants") do
+ expect(page).to have_content "3"
+ end
+ end
+
+ scenario "Total participants" do
+ user = create(:user, :level_two)
+ 3.times { create(:poll_voter, user: user) }
+ create(:poll_voter)
+
+ visit admin_stats_path
+
+ within(".stats") do
+ click_link "Polls"
+ end
+
+ within("#participants") do
+ expect(page).to have_content "2"
+ end
+ end
+
+ scenario "Participants by poll" do
+ oa = create(:poll_officer_assignment)
+
+ poll1 = create(:poll)
+ poll2 = create(:poll)
+
+ 1.times { create(:poll_voter, poll: poll1, origin: "web") }
+ 2.times { create(:poll_voter, poll: poll2, origin: "web") }
+
+ visit admin_stats_path
+
+ within(".stats") do
+ click_link "Polls"
+ end
+
+ within("#polls") do
+
+ within("#poll_#{poll1.id}") do
+ expect(page).to have_content "1"
+ end
+
+ within("#poll_#{poll2.id}") do
+ expect(page).to have_content "2"
+ end
+
+ end
+ end
+
+ scenario "Participants by poll question" do
+ user1 = create(:user, :level_two)
+ user2 = create(:user, :level_two)
+
+ poll = create(:poll)
+
+ question1 = create(:poll_question, :with_answers, poll: poll)
+ question2 = create(:poll_question, :with_answers, poll: poll)
+
+ create(:poll_answer, question: question1, author: user1)
+ create(:poll_answer, question: question2, author: user1)
+ create(:poll_answer, question: question2, author: user2)
+
+ visit admin_stats_path
+
+ within(".stats") do
+ click_link "Polls"
+ end
+
+ within("#poll_question_#{question1.id}") do
+ expect(page).to have_content "1"
+ end
+
+ within("#poll_question_#{question2.id}") do
+ expect(page).to have_content "2"
+ end
+
+ within("#poll_#{poll.id}_questions_total") do
+ expect(page).to have_content "2"
+ end
+ end
+
+ end
+
end
diff --git a/spec/features/admin/valuators_spec.rb b/spec/features/admin/valuators_spec.rb
index bb631cbc3..f1dfa68b3 100644
--- a/spec/features/admin/valuators_spec.rb
+++ b/spec/features/admin/valuators_spec.rb
@@ -29,6 +29,14 @@ feature 'Admin valuators' do
end
end
+ scenario 'Delete Valuator' do
+ click_link 'Delete'
+
+ within('#valuators') do
+ expect(page).to_not have_content(@valuator.name)
+ end
+ end
+
context 'Search' do
background do
diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb
index d17bd9c91..fa7749a4b 100644
--- a/spec/features/budgets/investments_spec.rb
+++ b/spec/features/budgets/investments_spec.rb
@@ -1,4 +1,5 @@
require 'rails_helper'
+require 'sessions_helper'
feature 'Budget Investments' do
@@ -170,6 +171,25 @@ feature 'Budget Investments' do
expect(order).to eq(new_order)
end
+ scenario "Investments are not repeated with random order", :js do
+ 12.times { create(:budget_investment, heading: heading) }
+ # 12 instead of per_page + 2 because in each page there are 10 (in this case), not 25
+
+ visit budget_investments_path(budget, order: 'random')
+
+ first_page_investments = investments_order
+
+ click_link 'Next'
+ expect(page).to have_content "You're on page 2"
+
+ second_page_investments = investments_order
+
+ common_values = first_page_investments & second_page_investments
+
+ expect(common_values.length).to eq(0)
+
+ end
+
scenario 'Proposals are ordered by confidence_score', :js do
create(:budget_investment, heading: heading, title: 'Best proposal').update_column(:confidence_score, 10)
create(:budget_investment, heading: heading, title: 'Worst proposal').update_column(:confidence_score, 2)
@@ -188,6 +208,46 @@ feature 'Budget Investments' do
expect(current_url).to include('page=1')
end
+ scenario 'Each user as a different and consistent random budget investment order', :js do
+ 12.times { create(:budget_investment, heading: heading) }
+
+ in_browser(:one) do
+ visit budget_investments_path(budget, heading: heading)
+ @first_user_investments_order = investments_order
+ end
+
+ in_browser(:two) do
+ visit budget_investments_path(budget, heading: heading)
+ @second_user_investments_order = investments_order
+ end
+
+ expect(@first_user_investments_order).not_to eq(@second_user_investments_order)
+
+ in_browser(:one) do
+ click_link 'Next'
+ expect(page).to have_content "You're on page 2"
+
+ click_link 'Previous'
+ expect(page).to have_content "You're on page 1"
+
+ expect(investments_order).to eq(@first_user_investments_order)
+ end
+
+ in_browser(:two) do
+ click_link 'Next'
+ expect(page).to have_content "You're on page 2"
+
+ click_link 'Previous'
+ expect(page).to have_content "You're on page 1"
+
+ expect(investments_order).to eq(@second_user_investments_order)
+ end
+ end
+
+ def investments_order
+ all(".budget-investment h3").collect {|i| i.text }
+ end
+
end
context 'Phase I - Accepting' do
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index 81f7fb998..192e7949f 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -38,7 +38,7 @@ feature 'Proposals' do
within("ul.pagination") do
expect(page).to have_content("1")
- expect(page).to have_content("2")
+ expect(page).to have_link('2', href: 'http://www.example.com/proposals?page=2')
expect(page).to_not have_content("3")
click_link "Next", exact: false
end
@@ -153,8 +153,8 @@ feature 'Proposals' do
proposal = create(:proposal)
visit proposal_path(proposal)
- expect(page.html).to include ""
- expect(page.html).to include ""
+ expect(page).to have_css "meta[name='twitter:title'][content=\"#{proposal.title}\"]", visible: false
+ expect(page).to have_css "meta[property='og:title'][content=\"#{proposal.title}\"]", visible: false
end
scenario 'Create' do
diff --git a/spec/features/social_media_meta_tags_spec.rb b/spec/features/social_media_meta_tags_spec.rb
new file mode 100644
index 000000000..d04df78f6
--- /dev/null
+++ b/spec/features/social_media_meta_tags_spec.rb
@@ -0,0 +1,54 @@
+require 'rails_helper'
+
+feature 'Social media meta tags' do
+
+ context 'Setting social media meta tags' do
+
+ let(:meta_keywords) { 'citizen, participation, open government' }
+ let(:meta_title) { 'CONSUL TEST' }
+ let(:meta_description) { 'Citizen Participation and Open Government Application' }
+ let(:twitter_handle) { '@consul_test' }
+ let(:url) { 'http://consul.dev' }
+ let(:facebook_handle) { 'consultest' }
+ let(:org_name) { 'CONSUL TEST' }
+
+ before do
+ Setting['meta_keywords'] = meta_keywords
+ Setting['meta_title'] = meta_title
+ Setting['meta_description'] = meta_description
+ Setting['twitter_handle'] = twitter_handle
+ Setting['url'] = url
+ Setting['facebook_handle'] = facebook_handle
+ Setting['org_name'] = org_name
+ end
+
+ after do
+ Setting['meta_keywords'] = nil
+ Setting['meta_title'] = nil
+ Setting['meta_description'] = nil
+ Setting['twitter_handle'] = nil
+ Setting['url'] = 'http://example.com'
+ Setting['facebook_handle'] = nil
+ Setting['org_name'] = 'CONSUL'
+ end
+
+ scenario 'Social media meta tags partial render settings content' do
+
+ visit root_path
+
+ expect(page).to have_css 'meta[name="keywords"][content="'+ meta_keywords + '"]', visible: false
+ expect(page).to have_css 'meta[name="twitter:site"][content="'+ twitter_handle + '"]', visible: false
+ expect(page).to have_css 'meta[name="twitter:title"][content="'+ meta_title + '"]', visible: false
+ expect(page).to have_css 'meta[name="twitter:description"][content="' + meta_description + '"]', visible: false
+ expect(page).to have_css 'meta[name="twitter:image"][content="http://www.example.com/social_media_icon_twitter.png"]', visible: false
+ expect(page).to have_css 'meta[property="og:title"][content="'+ meta_title + '"]', visible: false
+ expect(page).to have_css 'meta[property="article:publisher"][content="' + url + '"]', visible: false
+ expect(page).to have_css 'meta[property="article:author"][content="https://www.facebook.com/' + facebook_handle + '"]', visible: false
+ expect(page).to have_css 'meta[property="og:url"][content="http://www.example.com/"]', visible: false
+ expect(page).to have_css 'meta[property="og:image"][content="http://www.example.com/social_media_icon.png"]', visible: false
+ expect(page).to have_css 'meta[property="og:site_name"][content="' + org_name + '"]', visible: false
+ expect(page).to have_css 'meta[property="og:description"][content="' + meta_description + '"]', visible: false
+ end
+ end
+
+end
diff --git a/spec/lib/graphql_spec.rb b/spec/lib/graphql_spec.rb
index d6ea071e2..4f03e0f6a 100644
--- a/spec/lib/graphql_spec.rb
+++ b/spec/lib/graphql_spec.rb
@@ -282,15 +282,16 @@ describe 'ConsulSchema' do
end
describe 'Comments' do
- it 'only returns comments from proposals and debates' do
+ it 'only returns comments from proposals, debates and polls' do
proposal_comment = create(:comment, commentable: create(:proposal))
debate_comment = create(:comment, commentable: create(:debate))
+ poll_comment = create(:comment, commentable: create(:poll))
spending_proposal_comment = build(:comment, commentable: create(:spending_proposal)).save(skip_validation: true)
response = execute('{ comments { edges { node { commentable_type } } } }')
received_commentables = extract_fields(response, 'comments', 'commentable_type')
- expect(received_commentables).to match_array ['Proposal', 'Debate']
+ expect(received_commentables).to match_array ['Proposal', 'Debate', 'Poll']
end
it 'displays comments of authors even if public activity is set to false' do
@@ -355,6 +356,19 @@ describe 'ConsulSchema' do
expect(received_comments).to match_array [visible_debate_comment.body]
end
+ it 'does not include comments from hidden polls' do
+ visible_poll = create(:poll)
+ hidden_poll = create(:poll, hidden_at: Time.current)
+
+ visible_poll_comment = create(:comment, commentable: visible_poll)
+ hidden_poll_comment = create(:comment, commentable: hidden_poll)
+
+ response = execute('{ comments { edges { node { body } } } }')
+ received_comments = extract_fields(response, 'comments', 'body')
+
+ expect(received_comments).to match_array [visible_poll_comment.body]
+ end
+
it 'does not include comments of debates that are not public' do
not_public_debate = create(:debate, :hidden)
not_public_debate_comment = create(:comment, commentable: not_public_debate)
@@ -377,6 +391,17 @@ describe 'ConsulSchema' do
expect(received_comments).to_not include(not_public_proposal_comment.body)
end
+ it 'does not include comments of polls that are not public' do
+ not_public_poll = create(:poll)
+ not_public_poll_comment = create(:comment, commentable: not_public_poll)
+ allow(Comment).to receive(:public_for_api).and_return([])
+
+ response = execute('{ comments { edges { node { body } } } }')
+ received_comments = extract_fields(response, 'comments', 'body')
+
+ expect(received_comments).to_not include(not_public_poll_comment.body)
+ end
+
it 'only returns date and hour for created_at' do
created_at = Time.zone.parse("2017-12-31 9:30:15")
create(:comment, created_at: created_at)
diff --git a/spec/models/budget/heading_spec.rb b/spec/models/budget/heading_spec.rb
index ee2e4c142..76df1fa5c 100644
--- a/spec/models/budget/heading_spec.rb
+++ b/spec/models/budget/heading_spec.rb
@@ -25,4 +25,23 @@ describe Budget::Heading do
end
end
+ describe "Save population" do
+ it "Allows population == nil" do
+ expect(create(:budget_heading, group: group, name: 'Population is nil', population: nil)).to be_valid
+ end
+
+ it "Doesn't allow population <= 0" do
+ heading = create(:budget_heading, group: group, name: 'Population is > 0')
+
+ heading.population = 0
+ expect(heading).not_to be_valid
+
+ heading.population = -10
+ expect(heading).not_to be_valid
+
+ heading.population = 10
+ expect(heading).to be_valid
+ end
+ end
+
end
diff --git a/spec/models/poll/booth_assignment_spec.rb b/spec/models/poll/booth_assignment_spec.rb
new file mode 100644
index 000000000..8663e3872
--- /dev/null
+++ b/spec/models/poll/booth_assignment_spec.rb
@@ -0,0 +1,29 @@
+require 'rails_helper'
+
+describe :booth_assignment do
+ let(:poll){create(:poll)}
+ let(:booth){create(:poll_booth)}
+ let(:booth1){create(:poll_booth)}
+
+ it "should check if there are shifts" do
+ assignment_with_shifts = create(:poll_booth_assignment, poll: poll, booth: booth)
+ assignment_without_shifts = create(:poll_booth_assignment, poll: poll, booth: booth1)
+ officer = create(:poll_officer)
+ create(:poll_officer_assignment, officer: officer, booth_assignment: assignment_with_shifts)
+ create(:poll_shift, booth: booth, officer: officer)
+
+ expect(assignment_with_shifts.shifts?).to eq(true)
+ expect(assignment_without_shifts.shifts?).to eq(false)
+ end
+
+ it "should delete shifts associated to booth assignments" do
+ assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+ officer = create(:poll_officer)
+ create(:poll_officer_assignment, officer: officer, booth_assignment: assignment)
+ create(:poll_shift, booth: booth, officer: officer)
+
+ assignment.destroy
+
+ expect(Poll::Shift.all.count).to eq(0)
+ end
+end
\ No newline at end of file
diff --git a/spec/models/relation_spec.rb b/spec/models/relation_spec.rb
new file mode 100644
index 000000000..86bbe2c14
--- /dev/null
+++ b/spec/models/relation_spec.rb
@@ -0,0 +1,76 @@
+require 'rails_helper'
+
+describe RelatedContent do
+
+ let(:parent_relationable) { create([:proposal, :debate, :budget_investment].sample) }
+ let(:child_relationable) { create([:proposal, :debate, :budget_investment].sample) }
+
+ it "should allow relationables from various classes" do
+ expect(build(:related_content, parent_relationable: parent_relationable, child_relationable: child_relationable)).to be_valid
+ expect(build(:related_content, parent_relationable: parent_relationable, child_relationable: child_relationable)).to be_valid
+ expect(build(:related_content, parent_relationable: parent_relationable, child_relationable: child_relationable)).to be_valid
+ end
+
+ it "should not allow empty relationables" do
+ expect(build(:related_content)).not_to be_valid
+ expect(build(:related_content, parent_relationable: parent_relationable)).not_to be_valid
+ expect(build(:related_content, child_relationable: child_relationable)).not_to be_valid
+ end
+
+ it "should not allow repeated related contents" do
+ related_content = create(:related_content, parent_relationable: parent_relationable, child_relationable: child_relationable)
+ new_related_content = build(:related_content, parent_relationable: related_content.parent_relationable, child_relationable: related_content.child_relationable)
+ expect(new_related_content).not_to be_valid
+ end
+
+ describe 'create_opposite_related_content' do
+ let(:parent_relationable) { create(:proposal) }
+ let(:child_relationable) { create(:debate) }
+ let(:related_content) { build(:related_content, parent_relationable: parent_relationable, child_relationable: child_relationable) }
+
+ it 'creates an opposite related_content' do
+ expect { related_content.save }.to change { RelatedContent.count }.by(2)
+ expect(related_content.opposite_related_content.child_relationable_id).to eq(parent_relationable.id)
+ expect(related_content.opposite_related_content.child_relationable_type).to eq(parent_relationable.class.name)
+ expect(related_content.opposite_related_content.parent_relationable_id).to eq(child_relationable.id)
+ expect(related_content.opposite_related_content.parent_relationable_type).to eq(child_relationable.class.name)
+ expect(related_content.opposite_related_content.opposite_related_content.id).to eq(related_content.id)
+ end
+ end
+
+ describe 'relationable destroy' do
+ let(:parent_relationable) { create(:proposal) }
+ let(:child_relationable) { create(:debate) }
+
+ it 'destroys both related contents involved' do
+ related_content = create(:related_content, parent_relationable: parent_relationable, child_relationable: child_relationable)
+ expect { related_content.parent_relationable.destroy }.to change { RelatedContent.all.count }.by(-2)
+ expect(child_relationable.related_contents).to be_empty
+ end
+ end
+
+ # TODO: Move this into a Relationable shared context
+ describe '#report_related_content' do
+ it 'increments both relation and opposite relation times_reported counters' do
+ related_content = create(:related_content, parent_relationable: parent_relationable, child_relationable: child_relationable)
+ parent_relationable.report_related_content(child_relationable)
+
+ expect(related_content.reload.times_reported).to eq(1)
+ expect(related_content.reload.opposite_related_content.times_reported).to eq(1)
+ end
+ end
+
+ describe '#relationed_contents' do
+ before do
+ create(:related_content, parent_relationable: parent_relationable, child_relationable: create(:proposal), times_reported: 6)
+ create(:related_content, parent_relationable: parent_relationable, child_relationable: child_relationable)
+ end
+
+ it 'returns not hidden by reports related contents' do
+ expect(parent_relationable.relationed_contents.count).to eq(1)
+ expect(parent_relationable.relationed_contents.first.class.name).to eq(child_relationable.class.name)
+ expect(parent_relationable.relationed_contents.first.id).to eq(child_relationable.id)
+ end
+ end
+
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a0e4a98b0..7beab6ff1 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,7 +2,8 @@ require 'factory_girl_rails'
require 'database_cleaner'
require 'email_spec'
require 'devise'
-require 'knapsack'
+require 'knapsack_pro'
+
Dir["./spec/models/concerns/*.rb"].each { |f| require f }
Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
Dir["./spec/shared/**/*.rb"].sort.each { |f| require f }
@@ -107,4 +108,4 @@ RSpec.configure do |config|
end
# Parallel build helper configuration for travis
-Knapsack::Adapters::RSpecAdapter.bind
+KnapsackPro::Adapters::RSpecAdapter.bind
|