<%= t("devise_views.users.registrations.new.title") %>
+
+ <%= render 'devise/omniauth_form' %>
+
<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<%= render 'shared/errors', resource: resource %>
diff --git a/app/views/welcome/_featured_debate.html.erb b/app/views/welcome/_featured_debate.html.erb
index 11cb3b733..7ad53608b 100644
--- a/app/views/welcome/_featured_debate.html.erb
+++ b/app/views/welcome/_featured_debate.html.erb
@@ -8,7 +8,7 @@
<%= link_to featured_debate.title, featured_debate %>
- <%= link_to t("debates.show.comments", count: featured_debate.comment_threads.count), debate_path(featured_debate, anchor: "comments") %>
+ <%= link_to t("debates.show.comments", count: featured_debate.comments_count), debate_path(featured_debate, anchor: "comments") %>
<%= link_to featured_debate.description, featured_debate %>
diff --git a/config/deploy/shared/secrets.yml.erb b/config/deploy/shared/secrets.yml.erb
index a1cc29fb8..42a8c48a6 100644
--- a/config/deploy/shared/secrets.yml.erb
+++ b/config/deploy/shared/secrets.yml.erb
@@ -2,4 +2,10 @@
recaptcha_public_key: <%= ENV["MADRID_RECAPTCHA_PUBLIC_KEY"] %>
recaptcha_private_key: <%= ENV["MADRID_RECAPTCHA_PRIVATE_KEY"] %>
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
- server_name: <%= fetch(:server_name) %>
\ No newline at end of file
+ twitter_key: <%= ENV["TWITTER_KEY"] %>
+ twitter_secret: <%= ENV["TWITTER_SECRET"] %>
+ facebook_key: <%= ENV["FACEBOOK_KEY"] %>
+ facebook_secret: <%= ENV["FACEBOOK_SECRET"] %>
+ google_oauth2_key: <%= ENV["GOOGLE_KEY"] %>
+ google_oauth2_secret: <%= ENV["GOOGLE_SECRET"] %>
+ server_name: <%= fetch(:server_name) %>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index acf67286d..566d4ebc5 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -16,6 +16,7 @@ Rails.application.configure do
# Don't care if the mailer can't send.
config.action_mailer.raise_delivery_errors = false
config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+ config.action_mailer.asset_host = "http://localhost:3000"
# Deliver emails to a development mailbox at /letter_opener
config.action_mailer.delivery_method = :letter_opener
@@ -44,4 +45,13 @@ Rails.application.configure do
# config.action_view.raise_on_missing_translations = true
config.cache_store = :null_store
+
+ config.after_initialize do
+ Bullet.enable = true
+ Bullet.bullet_logger = true
+ if ENV['BULLET']
+ Bullet.rails_logger = true
+ Bullet.add_footer = true
+ end
+ end
end
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index e84606f73..7a21a1df4 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -42,7 +42,7 @@ Rails.application.configure do
# config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
- # config.force_ssl = true
+ config.force_ssl = true
# Use the lowest log level to ensure availability of diagnostic information
# when problems arise.
diff --git a/config/environments/test.rb b/config/environments/test.rb
index a76376fe6..cef568af6 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -45,4 +45,13 @@ Rails.application.configure do
# config.action_view.raise_on_missing_translations = true
config.cache_store = :null_store
+
+ config.after_initialize do
+ Bullet.enable = true
+ Bullet.bullet_logger = true
+ if ENV['BULLET']
+ Bullet.raise = true # raise an error if n+1 query occurs
+ end
+ end
+
end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index f7cdfb292..6b1c860a9 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -239,6 +239,9 @@ Devise.setup do |config|
# Add a new OmniAuth provider. Check the wiki for more information on setting
# up on your models and hooks.
# config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
+ config.omniauth :twitter, Rails.application.secrets.twitter_key, Rails.application.secrets.twitter_secret
+ config.omniauth :facebook, Rails.application.secrets.facebook_key, Rails.application.secrets.facebook_secret
+ config.omniauth :google_oauth2, Rails.application.secrets.google_oauth2_key, Rails.application.secrets.google_oauth2_secret
# ==> Warden configuration
# If you want to use other strategies, that are not supported by Devise, or
@@ -263,3 +266,7 @@ Devise.setup do |config|
# so you need to do it manually. For the users scope, it would be:
# config.omniauth_path_prefix = '/my_engine/users/auth'
end
+
+Rails.application.config.to_prepare do
+ Devise::Mailer.layout "mailer" # email.haml or email.erb
+end
\ No newline at end of file
diff --git a/config/locales/devise.es.yml b/config/locales/devise.es.yml
index f39099f57..c2bc246e9 100644
--- a/config/locales/devise.es.yml
+++ b/config/locales/devise.es.yml
@@ -55,4 +55,4 @@ es:
not_locked: "no estaba bloqueado."
not_saved:
one: "1 error impidió que este %{resource} fuera guardado:"
- other: "%{count} errores impidieron que este %{resource} fuera guardado:"
\ No newline at end of file
+ other: "%{count} errores impidieron que este %{resource} fuera guardado:"
diff --git a/config/locales/devise_views.en.yml b/config/locales/devise_views.en.yml
index e1b2a571d..08a303834 100644
--- a/config/locales/devise_views.en.yml
+++ b/config/locales/devise_views.en.yml
@@ -6,17 +6,20 @@ en:
submit: "Resend confirmation instructions"
mailer:
confirmation_instructions:
+ title: "Welcome to open government"
welcome: "Welcome"
text: "You can confirm your account email through the link below:"
confirm_link: "Confirm my account"
reset_password_instructions:
hello: "Hello"
- text: "Someone has requested a link to change your password. You can do this through the link below."
+ title: Change your password
+ text: "Someone has requested to change your password. You can do this through the link below:"
change_link: "Change my password"
ignore_text: "If you didn't request this, please ignore this email."
info_text: "Your password won't change until you access the link above and create a new one."
unlock_instructions:
hello: "Hello"
+ title: Your account has been locked
info_text: "Your account has been locked due to an excessive number of unsuccessful sign in attempts."
instructions_text: "Click the link below to unlock your account:"
unlock_link: "Unlock my account"
@@ -66,6 +69,13 @@ en:
phone_number_label: "Phone number"
password_confirmation_label: "Confirm password"
submit: "Sign up"
+ success:
+ title: "Registration of organization / collective"
+ thank_you: "Thank you for registering your organization or collective in the website. Now is pending verification."
+ instructions_1_html: "We will contact you soon in order to verify that you represent your collective."
+ instructions_2_html: "Meanwhile, review your email. We have sent you a confirmation link to activate your account."
+ instructions_3_html: "When you confirm your account will then be able to participate as a non-verified organization."
+ back_to_index: "Ok, go back to index"
sessions:
new:
title: "Log in"
diff --git a/config/locales/devise_views.es.yml b/config/locales/devise_views.es.yml
index 7ed5298de..6ab6ebbb5 100644
--- a/config/locales/devise_views.es.yml
+++ b/config/locales/devise_views.es.yml
@@ -6,17 +6,20 @@ es:
submit: "Reenviar instrucciones de confirmación"
mailer:
confirmation_instructions:
- welcome: "Bienvenido"
+ title: "Bienvenido/a a gobierno abierto"
+ welcome: "Bienvenido/a"
text: "Puedes confirmar tu cuenta de correo electrónico en el siguiente enlace:"
confirm_link: "Confirmar mi cuenta"
reset_password_instructions:
hello: "Hola"
- text: "Se ha solicitado un enlace para cambiar tu contraseña, puedes hacerlo en el siguiente enlace:"
- change_link: "cambiar mi contraseña"
- ignore_text: "Si tu no lo has solicitado, puedes ignorar este email"
+ title: "Cambiar tu contraseña"
+ text: "Se ha solicitado cambiar tu contraseña, puedes hacerlo en el siguiente enlace:"
+ change_link: "Cambiar mi contraseña"
+ ignore_text: "Si tu no lo has solicitado, puedes ignorar este email."
info_text: "Tu contraseña no cambiará hasta que no accedas al enlace y la modifiques."
unlock_instructions:
hello: "Hola"
+ title: Tu cuenta ha sido bloqueada
info_text: "Tu cuenta ha sido bloqueada debido a un excesivo número de intentos fallidos de alta."
instructions_text: "Sigue el siguiente enlace para desbloquear tu cuenta:"
unlock_link: "Desbloquear mi cuenta"
@@ -66,6 +69,13 @@ es:
phone_number_label: "Teléfono"
password_confirmation_label: "Confirmar contraseña"
submit: "Registrarse"
+ success:
+ title: "Registro de organización / colectivo"
+ thank_you: "Gracias por registrar tu colectivo en la web. Ahora está pendiente de verificación."
+ instructions_1_html: "En breve nos pondremos en contacto contigo para verificar que realmente representas a este colectivo."
+ instructions_2_html: "Mientras revisa tu correo electrónico, te hemos enviado un enlace para confirmar tu cuenta."
+ instructions_3_html: "Una vez confirmado, podrás empezar a participar como colectivo no verificado."
+ back_to_index: "Entendido, volver a la página principal"
sessions:
new:
title: "Entrar"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ce3339b25..322cf585f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -61,7 +61,6 @@ en:
zero: No votes
one: 1 vote
other: "%{count} votes"
- votes_weighted_score: "Total: %{score}"
form:
debate_title: Debate title
title_instructions: "SBe clear and precise with the title, but make it informative"
@@ -134,8 +133,8 @@ en:
shared:
tags_cloud:
tags: Topics
- flag_as_inappropiate: Flag as inappropiate
- undo_flag_as_inappropiate: Undo flag as inappropiate
+ flag_as_inappropiate: Flag as inappropriate
+ undo_flag_as_inappropiate: Undo flag
collective: Collective
mailer:
comment:
@@ -148,3 +147,12 @@ en:
all: "You are not authorized to %{action} %{subject}."
welcome:
last_debates: Last debates
+ omniauth:
+ finish_signup:
+ title: Add Email
+ twitter:
+ sign_in: Sign in with Twitter
+ facebook:
+ sign_in: Sign in with Facebook
+ google_oauth2:
+ sign_in: Sign in with Google
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 1e2cca785..5c21c039e 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -61,7 +61,6 @@ es:
zero: Sin votos
one: 1 voto
other: "%{count} votos"
- votes_weighted_score: "Total: %{score}"
form:
debate_title: Título del debate
title_instructions: "Sé claro y conciso a la hora de poner un título, pero recuerda que debe explicar bien tu idea, ¡es tu carta de entrada!"
@@ -135,7 +134,7 @@ es:
tags_cloud:
tags: Temas
flag_as_inappropiate: Denunciar como inapropiado
- undo_flag_as_inappropiate: Deshacer denunciar como inapropiado
+ undo_flag_as_inappropiate: Deshacer denuncia
collective: Colectivo
mailer:
comment:
@@ -148,3 +147,12 @@ es:
all: "No tienes permiso para realizar la acción '%{action}' sobre %{subject}."
welcome:
last_debates: Últimos debates
+ omniauth:
+ finish_signup:
+ title: Añade tu email
+ twitter:
+ sign_in: Entra con Twitter
+ facebook:
+ sign_in: Entra con Facebook
+ google_oauth2:
+ sign_in: Entra con Google
diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml
index cbc6c5bd6..d0550aca9 100644
--- a/config/locales/mailers.en.yml
+++ b/config/locales/mailers.en.yml
@@ -1,8 +1,10 @@
en:
mailers:
comment:
- hi: "Hello, %{recipient}"
- new_comment_by: "There'is a new comment by %{commenter}"
+ hi: Hello
+ title: New comment on your debate
+ new_comment_by_html: "There'is a new comment by on"
reply:
- hi: "Hello, %{recipient}"
- new_reply_by: "There'is a new reply by %{commenter} to your comment"
\ No newline at end of file
+ hi: Hello
+ title: New reply on your comment
+ new_reply_by_html: "There'is a new reply by %{commenter} to your comment on"
diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml
index e595967c4..8efa1dc22 100644
--- a/config/locales/mailers.es.yml
+++ b/config/locales/mailers.es.yml
@@ -1,8 +1,10 @@
es:
mailers:
comment:
- hi: "Hola, %{recipient}"
- new_comment_by: "Hay un nuevo comentario de %{commenter}"
+ hi: Hola
+ title: Nuevo comentario en tu debate
+ new_comment_by_html: "Hay un nuevo comentario de %{commenter} en"
reply:
- hi: "Hola, %{recipient}"
- new_reply_by: "Hay una nueva respuesta de %{commenter} a tu comentario"
\ No newline at end of file
+ hi: Hola
+ title: Nueva respuesta a tu comentario
+ new_reply_by_html: "Hay una nueva respuesta de %{commenter} a tu comentario en"
diff --git a/config/locales/moderation.en.yml b/config/locales/moderation.en.yml
index 2728f10d9..3d61c93a2 100644
--- a/config/locales/moderation.en.yml
+++ b/config/locales/moderation.en.yml
@@ -8,7 +8,7 @@ en:
title: Moderation
comments:
index:
- title: Comments flagged as inappropiate
+ title: Comments flagged as inappropriate
headers:
flags: Flags
updated_at: Date
@@ -16,27 +16,27 @@ en:
commentable: Root
comment: Comment
hide: Hide
- mark_as_reviewed: Mark as reviewed
- reviewed: Reviewed
+ archive: Archive
+ archived: Archived
filter: Filter
filters:
all: All
- pending_review: Pending
- reviewed: Reviewed
+ pending: Pending
+ archived: Archived
debates:
index:
- title: Debates flagged as inappropiate
+ title: Debates flagged as inappropriate
headers:
flags: Flags
updated_at: Date
title: Title
description: Description
+ actions: Actions
hide: Hide
- mark_as_reviewed: Mark as reviewed
- reviewed: Reviewed
+ archive: Archive
+ archived: Archived
filter: Filter
filters:
all: All
- pending_review: Pending
- reviewed: Reviewed
-
+ pending: Pending
+ archived: Archived
diff --git a/config/locales/moderation.es.yml b/config/locales/moderation.es.yml
index 2afaec7a9..73886ddb0 100644
--- a/config/locales/moderation.es.yml
+++ b/config/locales/moderation.es.yml
@@ -8,7 +8,7 @@ es:
title: Moderación
comments:
index:
- title: Comentarios Denunciados como Inapropiados
+ title: Comentarios denunciados como inapropiados
headers:
flags: Denuncias
updated_at: Fecha
@@ -16,28 +16,27 @@ es:
commentable: Raíz
comment: Comentario
hide: Ocultar
- mark_as_reviewed: Marcar como revisado
- reviewed: Revisado
+ archive: Archivar
+ archived: Archivado
filter: Filtrar
filters:
all: Todos
- pending_review: Pendientes
- reviewed: Revisados
+ pending: Pendientes
+ archived: Archivados
debates:
index:
- title: Debates Denunciados como Inapropiados
+ title: Debates denunciados como inapropiados
headers:
flags: Denuncias
updated_at: Fecha
title: Título
description: Descripción
+ actions: Acciones
hide: Ocultar
- mark_as_reviewed: Marcar como revisado
- reviewed: Revisado
+ archive: Archivar
+ archived: Archivado
filter: Filtrar
filters:
all: Todos
- pending_review: Pendientes
- reviewed: Revisados
-
-
+ pending: Pendientes
+ archived: Archivados
diff --git a/config/routes.rb b/config/routes.rb
index 212ab2808..67f3734e9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,10 +1,23 @@
Rails.application.routes.draw do
- devise_for :users, controllers: { registrations: 'users/registrations' }
+ devise_for :users, controllers: {
+ registrations: 'users/registrations',
+ omniauth_callbacks: 'users/omniauth_callbacks'
+ }
devise_for :organizations, class_name: 'User',
controllers: {
registrations: 'organizations/registrations',
- sessions: 'devise/sessions'
- }
+ sessions: 'devise/sessions',
+ },
+ skip: [:omniauth_callbacks]
+
+ devise_scope :organization do
+ get "organizations/sign_up/success", to: "organizations/registrations#success"
+ end
+
+ devise_scope :user do
+ get :finish_signup, to: 'users/registrations#finish_signup'
+ patch :do_finish_signup, to: 'users/registrations#do_finish_signup'
+ end
# The priority is based upon order of creation: first created -> highest priority.
# See how all your routes lay out with "rake routes".
@@ -79,7 +92,7 @@ Rails.application.routes.draw do
member do
put :hide
put :hide_in_moderation_screen
- put :mark_as_reviewed
+ put :archive
end
end
@@ -87,7 +100,7 @@ Rails.application.routes.draw do
member do
put :hide
put :hide_in_moderation_screen
- put :mark_as_reviewed
+ put :archive
end
end
end
diff --git a/config/secrets.yml.example b/config/secrets.yml.example
index f4ad98027..1d1312ea6 100644
--- a/config/secrets.yml.example
+++ b/config/secrets.yml.example
@@ -14,12 +14,30 @@ default: &default
development:
secret_key_base: 56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4
+ twitter_key: AAAA
+ twitter_secret: BBBB
+ facebook_key: AAAA
+ facebook_secret: BBBB
+ google_oauth2_key: AAAA
+ google_oauth2_secret: BBBB
<<: *default
test:
secret_key_base: 4d5adf961ddd27aef19622d6c0b3234d555f9ee003f022b1f829c92bbe33aaee907be7feb67bd54c14a1a32512fa968565ad405971fbc41bd0797af73c26a796
+ twitter_key: AAAA
+ twitter_secret: BBBB
+ facebook_key: AAAA
+ facebook_secret: BBBB
+ google_oauth2_key: AAAA
+ google_oauth2_secret: BBBB
<<: *default
production:
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
- <<: *default
\ No newline at end of file
+ twitter_key: <%= ENV["TWITTER_KEY"] %>
+ twitter_secret: <%= ENV["TWITTER_SECRET"] %>
+ facebook_key: <%= ENV["FACEBOOK_KEY"] %>
+ facebook_secret: <%= ENV["FACEBOOK_SECRET"] %>
+ google_oauth2_key: <%= ENV["GOOGLE_KEY"] %>
+ google_oauth2_secret: <%= ENV["GOOGLE_SECRET"] %>
+ <<: *default
diff --git a/db/migrate/20150824144524_create_identities.rb b/db/migrate/20150824144524_create_identities.rb
new file mode 100644
index 000000000..38a5e603a
--- /dev/null
+++ b/db/migrate/20150824144524_create_identities.rb
@@ -0,0 +1,11 @@
+class CreateIdentities < ActiveRecord::Migration
+ def change
+ create_table :identities do |t|
+ t.references :user, index: true, foreign_key: true
+ t.string :provider
+ t.string :uid
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20150825124821_adds_votable_cache_field_to_comments.rb b/db/migrate/20150825124821_adds_votable_cache_field_to_comments.rb
new file mode 100644
index 000000000..e2da7e12f
--- /dev/null
+++ b/db/migrate/20150825124821_adds_votable_cache_field_to_comments.rb
@@ -0,0 +1,11 @@
+class AddsVotableCacheFieldToComments < ActiveRecord::Migration
+ def change
+ add_column :comments, :cached_votes_total, :integer, default: 0
+ add_column :comments, :cached_votes_up, :integer, default: 0
+ add_column :comments, :cached_votes_down, :integer, default: 0
+
+ add_index :comments, :cached_votes_total
+ add_index :comments, :cached_votes_up
+ add_index :comments, :cached_votes_down
+ end
+end
diff --git a/db/migrate/20150825124827_adds_votable_cache_field_to_debates.rb b/db/migrate/20150825124827_adds_votable_cache_field_to_debates.rb
new file mode 100644
index 000000000..07df8cf22
--- /dev/null
+++ b/db/migrate/20150825124827_adds_votable_cache_field_to_debates.rb
@@ -0,0 +1,11 @@
+class AddsVotableCacheFieldToDebates < ActiveRecord::Migration
+ def change
+ add_column :debates, :cached_votes_total, :integer, default: 0
+ add_column :debates, :cached_votes_up, :integer, default: 0
+ add_column :debates, :cached_votes_down, :integer, default: 0
+
+ add_index :debates, :cached_votes_total
+ add_index :debates, :cached_votes_up
+ add_index :debates, :cached_votes_down
+ end
+end
diff --git a/db/migrate/20150826112411_rename_reviewed_at_to_archived_at_in_comments_and_debates.rb b/db/migrate/20150826112411_rename_reviewed_at_to_archived_at_in_comments_and_debates.rb
new file mode 100644
index 000000000..86bebd8e1
--- /dev/null
+++ b/db/migrate/20150826112411_rename_reviewed_at_to_archived_at_in_comments_and_debates.rb
@@ -0,0 +1,6 @@
+class RenameReviewedAtToArchivedAtInCommentsAndDebates < ActiveRecord::Migration
+ def change
+ rename_column :comments, :reviewed_at, :archived_at
+ rename_column :debates, :reviewed_at, :archived_at
+ end
+end
diff --git a/db/migrate/20150826112500_add_comments_count_to_debate.rb b/db/migrate/20150826112500_add_comments_count_to_debate.rb
new file mode 100644
index 000000000..bf416b669
--- /dev/null
+++ b/db/migrate/20150826112500_add_comments_count_to_debate.rb
@@ -0,0 +1,5 @@
+class AddCommentsCountToDebate < ActiveRecord::Migration
+ def change
+ add_column :debates, :comments_count, :integer, default: 0
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6f4d26c5b..1d7972417 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: 20150824113326) do
+ActiveRecord::Schema.define(version: 20150826112500) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -41,7 +41,7 @@ ActiveRecord::Schema.define(version: 20150824113326) do
t.string "title"
t.text "body"
t.string "subject"
- t.integer "user_id", null: false
+ t.integer "user_id", null: false
t.integer "parent_id"
t.integer "lft"
t.integer "rgt"
@@ -51,11 +51,17 @@ ActiveRecord::Schema.define(version: 20150824113326) do
t.datetime "hidden_at"
t.datetime "flagged_as_inappropiate_at"
t.integer "inappropiate_flags_count", default: 0
- t.datetime "reviewed_at"
+ t.datetime "archived_at"
t.integer "moderator_id"
t.integer "administrator_id"
+ t.integer "cached_votes_total", default: 0
+ t.integer "cached_votes_up", default: 0
+ t.integer "cached_votes_down", default: 0
end
+ add_index "comments", ["cached_votes_down"], name: "index_comments_on_cached_votes_down", using: :btree
+ add_index "comments", ["cached_votes_total"], name: "index_comments_on_cached_votes_total", using: :btree
+ add_index "comments", ["cached_votes_up"], name: "index_comments_on_cached_votes_up", using: :btree
add_index "comments", ["commentable_id", "commentable_type"], name: "index_comments_on_commentable_id_and_commentable_type", using: :btree
add_index "comments", ["hidden_at"], name: "index_comments_on_hidden_at", using: :btree
add_index "comments", ["user_id"], name: "index_comments_on_user_id", using: :btree
@@ -64,17 +70,34 @@ ActiveRecord::Schema.define(version: 20150824113326) do
t.string "title", limit: 80
t.text "description"
t.integer "author_id"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
t.datetime "hidden_at"
t.string "visit_id"
t.datetime "flagged_as_inappropiate_at"
t.integer "inappropiate_flags_count", default: 0
- t.datetime "reviewed_at"
+ t.integer "cached_votes_total", default: 0
+ t.integer "cached_votes_up", default: 0
+ t.integer "cached_votes_down", default: 0
+ t.datetime "archived_at"
+ t.integer "comments_count", default: 0
end
+ add_index "debates", ["cached_votes_down"], name: "index_debates_on_cached_votes_down", using: :btree
+ add_index "debates", ["cached_votes_total"], name: "index_debates_on_cached_votes_total", using: :btree
+ add_index "debates", ["cached_votes_up"], name: "index_debates_on_cached_votes_up", using: :btree
add_index "debates", ["hidden_at"], name: "index_debates_on_hidden_at", using: :btree
+ create_table "identities", force: :cascade do |t|
+ t.integer "user_id"
+ t.string "provider"
+ t.string "uid"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
+ add_index "identities", ["user_id"], name: "index_identities_on_user_id", using: :btree
+
create_table "inappropiate_flags", force: :cascade do |t|
t.integer "user_id"
t.string "flaggable_type"
@@ -214,7 +237,8 @@ ActiveRecord::Schema.define(version: 20150824113326) do
add_index "votes", ["voter_id", "voter_type", "vote_scope"], name: "index_votes_on_voter_id_and_voter_type_and_vote_scope", using: :btree
add_foreign_key "administrators", "users"
+ add_foreign_key "identities", "users"
add_foreign_key "inappropiate_flags", "users"
add_foreign_key "moderators", "users"
add_foreign_key "organizations", "users"
-end
+end
\ No newline at end of file
diff --git a/lib/acts_as_paranoid_aliases.rb b/lib/acts_as_paranoid_aliases.rb
index dbb0d8350..b4faa19b9 100644
--- a/lib/acts_as_paranoid_aliases.rb
+++ b/lib/acts_as_paranoid_aliases.rb
@@ -5,11 +5,15 @@ module ActsAsParanoidAliases
def hide
update_attribute(:hidden_at, Time.now)
+ after_hide
end
def hidden?
deleted?
end
+
+ def after_hide
+ end
end
module ClassMethods
diff --git a/spec/factories.rb b/spec/factories.rb
index 038a0102e..ded2e20a0 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -1,5 +1,4 @@
FactoryGirl.define do
-
factory :user do
username 'Manuela'
sequence(:email) { |n| "manuela#{n}@madrid.es" }
@@ -7,6 +6,12 @@ FactoryGirl.define do
confirmed_at { Time.now }
end
+ factory :identity do
+ user nil
+ provider "Twitter"
+ uid "MyString"
+ end
+
factory :debate do
sequence(:title) { |n| "Debate #{n} title" }
description 'Debate description'
@@ -17,8 +22,8 @@ FactoryGirl.define do
hidden_at Time.now
end
- trait :reviewed do
- reviewed_at Time.now
+ trait :archived do
+ archived_at Time.now
end
trait :flagged_as_inappropiate do
@@ -32,6 +37,9 @@ FactoryGirl.define do
association :votable, factory: :debate
association :voter, factory: :user
vote_flag true
+ after(:create) do |vote, _|
+ vote.votable.update_cached_votes
+ end
end
factory :comment do
@@ -43,8 +51,8 @@ FactoryGirl.define do
hidden_at Time.now
end
- trait :reviewed do
- reviewed_at Time.now
+ trait :archived do
+ archived_at Time.now
end
trait :flagged_as_inappropiate do
diff --git a/spec/features/comments_spec.rb b/spec/features/comments_spec.rb
index 4ed16d915..58626b02b 100644
--- a/spec/features/comments_spec.rb
+++ b/spec/features/comments_spec.rb
@@ -133,7 +133,7 @@ feature 'Comments' do
expect(page).to have_css(".comment.comment.comment.comment.comment.comment.comment.comment")
end
- scenario "Flagging as inappropiate", :js do
+ scenario "Flagging as inappropriate", :js do
user = create(:user)
debate = create(:debate)
comment = create(:comment, commentable: debate)
@@ -142,15 +142,16 @@ feature 'Comments' do
visit debate_path(debate)
within "#comment_#{comment.id}" do
- expect(page).to_not have_link "Undo flag as inappropiate"
- click_on 'Flag as inappropiate'
- expect(page).to have_link "Undo flag as inappropiate"
+ page.find("#flag-expand-comment-#{comment.id}").click
+ page.find("#flag-comment-#{comment.id}").click
+
+ expect(page).to have_css("#unflag-expand-comment-#{comment.id}")
end
expect(InappropiateFlag.flagged?(user, comment)).to be
end
- scenario "Undoing flagging as inappropiate", :js do
+ scenario "Undoing flagging as inappropriate", :js do
user = create(:user)
debate = create(:debate)
comment = create(:comment, commentable: debate)
@@ -160,9 +161,10 @@ feature 'Comments' do
visit debate_path(debate)
within "#comment_#{comment.id}" do
- expect(page).to_not have_link("Flag as inappropiate", exact: true)
- click_on 'Undo flag as inappropiate'
- expect(page).to have_link("Flag as inappropiate", exact: true)
+ page.find("#unflag-expand-comment-#{comment.id}").click
+ page.find("#unflag-comment-#{comment.id}").click
+
+ expect(page).to have_css("#flag-expand-comment-#{comment.id}")
end
expect(InappropiateFlag.flagged?(user, comment)).to_not be
@@ -286,4 +288,4 @@ feature 'Comments' do
end
end
-end
\ No newline at end of file
+end
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index c685725d8..22b689308 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -323,9 +323,10 @@ feature 'Debates' do
visit debate_path(debate)
within "#debate_#{debate.id}" do
- expect(page).to_not have_link "Undo flag as inappropiate"
- click_on 'Flag as inappropiate'
- expect(page).to have_link "Undo flag as inappropiate"
+ page.find("#flag-expand-debate-#{debate.id}").click
+ page.find("#flag-debate-#{debate.id}").click
+
+ expect(page).to have_css("#unflag-expand-debate-#{debate.id}")
end
expect(InappropiateFlag.flagged?(user, debate)).to be
@@ -340,9 +341,10 @@ feature 'Debates' do
visit debate_path(debate)
within "#debate_#{debate.id}" do
- expect(page).to_not have_link("Flag as inappropiate", exact: true)
- click_on 'Undo flag as inappropiate'
- expect(page).to have_link("Flag as inappropiate", exact: true)
+ page.find("#unflag-expand-debate-#{debate.id}").click
+ page.find("#unflag-debate-#{debate.id}").click
+
+ expect(page).to have_css("#flag-expand-debate-#{debate.id}")
end
expect(InappropiateFlag.flagged?(user, debate)).to_not be
diff --git a/spec/features/moderation/comments_spec.rb b/spec/features/moderation/comments_spec.rb
index 5a4100f77..2e3d1196e 100644
--- a/spec/features/moderation/comments_spec.rb
+++ b/spec/features/moderation/comments_spec.rb
@@ -104,57 +104,57 @@ feature 'Moderate Comments' do
visit moderation_comments_path
expect(page).to_not have_link('All')
expect(page).to have_link('Pending')
- expect(page).to have_link('Reviewed')
+ expect(page).to have_link('Archived')
visit moderation_comments_path(filter: 'all')
expect(page).to_not have_link('All')
expect(page).to have_link('Pending')
- expect(page).to have_link('Reviewed')
+ expect(page).to have_link('Archived')
- visit moderation_comments_path(filter: 'pending_review')
+ visit moderation_comments_path(filter: 'pending')
expect(page).to have_link('All')
expect(page).to_not have_link('Pending')
- expect(page).to have_link('Reviewed')
+ expect(page).to have_link('Archived')
- visit moderation_comments_path(filter: 'reviewed')
+ visit moderation_comments_path(filter: 'archived')
expect(page).to have_link('All')
expect(page).to have_link('Pending')
- expect(page).to_not have_link('Reviewed')
+ expect(page).to_not have_link('Archived')
end
scenario "Filtering comments" do
create(:comment, :flagged_as_inappropiate, body: "Pending comment")
create(:comment, :flagged_as_inappropiate, :hidden, body: "Hidden comment")
- create(:comment, :flagged_as_inappropiate, :reviewed, body: "Reviewed comment")
+ create(:comment, :flagged_as_inappropiate, :archived, body: "Archived comment")
visit moderation_comments_path(filter: 'all')
expect(page).to have_content('Pending comment')
expect(page).to_not have_content('Hidden comment')
- expect(page).to have_content('Reviewed comment')
+ expect(page).to have_content('Archived comment')
- visit moderation_comments_path(filter: 'pending_review')
+ visit moderation_comments_path(filter: 'pending')
expect(page).to have_content('Pending comment')
expect(page).to_not have_content('Hidden comment')
- expect(page).to_not have_content('Reviewed comment')
+ expect(page).to_not have_content('Archived comment')
- visit moderation_comments_path(filter: 'reviewed')
+ visit moderation_comments_path(filter: 'archived')
expect(page).to_not have_content('Pending comment')
expect(page).to_not have_content('Hidden comment')
- expect(page).to have_content('Reviewed comment')
+ expect(page).to have_content('Archived comment')
end
scenario "Reviewing links remember the pagination setting and the filter" do
per_page = Kaminari.config.default_per_page
(per_page + 2).times { create(:comment, :flagged_as_inappropiate) }
- visit moderation_comments_path(filter: 'pending_review', page: 2)
+ visit moderation_comments_path(filter: 'pending', page: 2)
- click_link('Mark as reviewed', match: :first)
+ click_link('Archive', match: :first, exact: true)
uri = URI.parse(current_url)
query_params = Rack::Utils.parse_nested_query(uri.query).symbolize_keys
- expect(query_params[:filter]).to eq('pending_review')
+ expect(query_params[:filter]).to eq('pending')
expect(query_params[:page]).to eq('2')
end
@@ -172,7 +172,7 @@ feature 'Moderate Comments' do
expect(page).to have_content('spammy spam')
expect(page).to have_content('1')
expect(page).to have_link('Hide')
- expect(page).to have_link('Mark as reviewed')
+ expect(page).to have_link('Archive')
end
end
@@ -187,18 +187,18 @@ feature 'Moderate Comments' do
expect(@comment.reload).to be_hidden
end
- scenario 'Marking the comment as reviewed' do
+ scenario 'Marking the comment as archived' do
within("#comment_#{@comment.id}") do
- click_link('Mark as reviewed')
+ click_link('Archive')
end
expect(current_path).to eq(moderation_comments_path)
within("#comment_#{@comment.id}") do
- expect(page).to have_content('Reviewed')
+ expect(page).to have_content('Archived')
end
- expect(@comment.reload).to be_reviewed
+ expect(@comment.reload).to be_archived
end
end
end
diff --git a/spec/features/moderation/debates_spec.rb b/spec/features/moderation/debates_spec.rb
index 1ea3101e0..b1234bb1b 100644
--- a/spec/features/moderation/debates_spec.rb
+++ b/spec/features/moderation/debates_spec.rb
@@ -47,57 +47,57 @@ feature 'Moderate debates' do
visit moderation_debates_path
expect(page).to_not have_link('All')
expect(page).to have_link('Pending')
- expect(page).to have_link('Reviewed')
+ expect(page).to have_link('Archived')
visit moderation_debates_path(filter: 'all')
expect(page).to_not have_link('All')
expect(page).to have_link('Pending')
- expect(page).to have_link('Reviewed')
+ expect(page).to have_link('Archived')
- visit moderation_debates_path(filter: 'pending_review')
+ visit moderation_debates_path(filter: 'pending')
expect(page).to have_link('All')
expect(page).to_not have_link('Pending')
- expect(page).to have_link('Reviewed')
+ expect(page).to have_link('Archived')
- visit moderation_debates_path(filter: 'reviewed')
+ visit moderation_debates_path(filter: 'archived')
expect(page).to have_link('All')
expect(page).to have_link('Pending')
- expect(page).to_not have_link('Reviewed')
+ expect(page).to_not have_link('Archived')
end
scenario "Filtering debates" do
create(:debate, :flagged_as_inappropiate, title: "Pending debate")
create(:debate, :flagged_as_inappropiate, :hidden, title: "Hidden debate")
- create(:debate, :flagged_as_inappropiate, :reviewed, title: "Reviewed debate")
+ create(:debate, :flagged_as_inappropiate, :archived, title: "Archived debate")
visit moderation_debates_path(filter: 'all')
expect(page).to have_content('Pending debate')
expect(page).to_not have_content('Hidden debate')
- expect(page).to have_content('Reviewed debate')
+ expect(page).to have_content('Archived debate')
- visit moderation_debates_path(filter: 'pending_review')
+ visit moderation_debates_path(filter: 'pending')
expect(page).to have_content('Pending debate')
expect(page).to_not have_content('Hidden debate')
- expect(page).to_not have_content('Reviewed debate')
+ expect(page).to_not have_content('Archived debate')
- visit moderation_debates_path(filter: 'reviewed')
+ visit moderation_debates_path(filter: 'archived')
expect(page).to_not have_content('Pending debate')
expect(page).to_not have_content('Hidden debate')
- expect(page).to have_content('Reviewed debate')
+ expect(page).to have_content('Archived debate')
end
scenario "Reviewing links remember the pagination setting and the filter" do
per_page = Kaminari.config.default_per_page
(per_page + 2).times { create(:debate, :flagged_as_inappropiate) }
- visit moderation_debates_path(filter: 'pending_review', page: 2)
+ visit moderation_debates_path(filter: 'pending', page: 2)
- click_link('Mark as reviewed', match: :first)
+ click_link('Archive', match: :first, exact: true)
uri = URI.parse(current_url)
query_params = Rack::Utils.parse_nested_query(uri.query).symbolize_keys
- expect(query_params[:filter]).to eq('pending_review')
+ expect(query_params[:filter]).to eq('pending')
expect(query_params[:page]).to eq('2')
end
@@ -114,7 +114,7 @@ feature 'Moderate debates' do
expect(page).to have_content('buy buy buy')
expect(page).to have_content('1')
expect(page).to have_link('Hide')
- expect(page).to have_link('Mark as reviewed')
+ expect(page).to have_link('Archive')
end
end
@@ -129,18 +129,18 @@ feature 'Moderate debates' do
expect(@debate.reload).to be_hidden
end
- scenario 'Marking the debate as reviewed' do
+ scenario 'Marking the debate as archived' do
within("#debate_#{@debate.id}") do
- click_link('Mark as reviewed')
+ click_link('Archive')
end
expect(current_path).to eq(moderation_debates_path)
within("#debate_#{@debate.id}") do
- expect(page).to have_content('Reviewed')
+ expect(page).to have_content('Archived')
end
- expect(@debate.reload).to be_reviewed
+ expect(@debate.reload).to be_archived
end
end
end
diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index 42511f28c..1fa30bcbe 100644
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
@@ -2,44 +2,159 @@ require 'rails_helper'
feature 'Users' do
- scenario 'Sign up' do
- visit '/'
- click_link 'Sign up'
+ context 'Regular authentication' do
+ scenario 'Sign up' do
+ visit '/'
+ click_link 'Sign up'
- fill_in 'user_username', with: 'Manuela Carmena'
- fill_in 'user_email', with: 'manuela@madrid.es'
- fill_in 'user_password', with: 'judgementday'
- fill_in 'user_password_confirmation', with: 'judgementday'
- fill_in 'user_captcha', with: correct_captcha_text
+ fill_in 'user_username', with: 'Manuela Carmena'
+ fill_in 'user_email', with: 'manuela@madrid.es'
+ fill_in 'user_password', with: 'judgementday'
+ fill_in 'user_password_confirmation', with: 'judgementday'
+ fill_in 'user_captcha', with: correct_captcha_text
- click_button 'Sign up'
+ click_button 'Sign up'
- expect(page).to have_content "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+ expect(page).to have_content "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
- sent_token = /.*confirmation_token=(.*)".*/.match(ActionMailer::Base.deliveries.last.body.to_s)[1]
- visit user_confirmation_path(confirmation_token: sent_token)
+ sent_token = /.*confirmation_token=(.*)".*/.match(ActionMailer::Base.deliveries.last.body.to_s)[1]
+ visit user_confirmation_path(confirmation_token: sent_token)
- expect(page).to have_content "Your email address has been successfully confirmed"
+ expect(page).to have_content "Your email address has been successfully confirmed"
+ end
+
+ scenario 'Errors on sign up' do
+ visit '/'
+ click_link 'Sign up'
+ click_button 'Sign up'
+
+ expect(page).to have_content error_message
+ end
+
+ scenario 'Sign in' do
+ create(:user, email: 'manuela@madrid.es', password: 'judgementday')
+
+ visit '/'
+ click_link 'Log in'
+ fill_in 'user_email', with: 'manuela@madrid.es'
+ fill_in 'user_password', with: 'judgementday'
+ click_button 'Log in'
+
+ expect(page).to have_content 'Signed in successfully.'
+ end
end
- scenario 'Errors on sign up' do
- visit '/'
- click_link 'Sign up'
- click_button 'Sign up'
+ context 'OAuth authentication' do
+ context 'Twitter' do
+ background do
+ #request.env["devise.mapping"] = Devise.mappings[:user]
+ end
- expect(page).to have_content error_message
- end
+ scenario 'Sign up, when email was provided by OAuth provider' do
+ omniauth_twitter_hash = { 'provider' => 'twitter',
+ 'uid' => '12345',
+ 'info' => {
+ 'name' => 'manuela',
+ 'email' => 'manuelacarmena@example.com',
+ 'nickname' => 'ManuelaRocks',
+ 'verified' => '1'
+ },
+ 'extra' => { 'raw_info' =>
+ { 'location' => 'Madrid',
+ 'name' => 'Manuela de las Carmenas'
+ }
+ }
+ }
- scenario 'Sign in' do
- create(:user, email: 'manuela@madrid.es', password: 'judgementday')
+ OmniAuth.config.add_mock(:twitter, omniauth_twitter_hash)
- visit '/'
- click_link 'Log in'
- fill_in 'user_email', with: 'manuela@madrid.es'
- fill_in 'user_password', with: 'judgementday'
- click_button 'Log in'
+ visit '/'
+ click_link 'Sign up'
- expect(page).to have_content 'Signed in successfully.'
+ expect do
+ expect do
+ expect do
+ click_link 'Sign in with Twitter'
+ end.not_to change { ActionMailer::Base.deliveries.size }
+ end.to change { Identity.count }.by(1)
+ end.to change { User.count }.by(1)
+
+ expect(current_path).to eq(root_path)
+ expect_to_be_signed_in
+
+ user = User.last
+ expect(user.username).to eq('ManuelaRocks')
+ expect(user.email).to eq('manuelacarmena@example.com')
+ expect(user.confirmed?).to eq(true)
+ end
+
+ scenario 'Sign up, when neither email nor nickname were provided by OAuth provider' do
+ omniauth_twitter_hash = { 'provider' => 'twitter',
+ 'uid' => '12345',
+ 'info' => {
+ 'name' => 'manuela'
+ },
+ 'extra' => { 'raw_info' =>
+ { 'location' => 'Madrid',
+ 'name' => 'Manuela de las Carmenas'
+ }
+ }
+ }
+
+ OmniAuth.config.add_mock(:twitter, omniauth_twitter_hash)
+
+ visit '/'
+ click_link 'Sign up'
+
+ expect do
+ expect do
+ expect do
+ click_link 'Sign in with Twitter'
+ end.not_to change { ActionMailer::Base.deliveries.size }
+ end.to change { Identity.count }.by(1)
+ end.to change { User.count }.by(1)
+
+ expect(current_path).to eq(finish_signup_path)
+
+ user = User.last
+ expect(user.username).to eq('manuela-de-las-carmenas')
+ expect(user.email).to eq("omniauth@participacion-12345-twitter.com")
+
+ fill_in 'user_email', with: 'manueladelascarmenas@example.com'
+ click_button 'Sign up'
+
+ sent_token = /.*confirmation_token=(.*)".*/.match(ActionMailer::Base.deliveries.last.body.to_s)[1]
+ visit user_confirmation_path(confirmation_token: sent_token)
+
+ expect(page).to have_content "Your email address has been successfully confirmed"
+
+ expect(user.reload.email).to eq('manueladelascarmenas@example.com')
+ end
+
+ scenario 'Sign in, user was already signed up with OAuth' do
+ user = create(:user, email: 'manuela@madrid.es', password: 'judgementday')
+ identity = create(:identity, uid: '12345', provider: 'twitter', user: user)
+ omniauth_twitter_hash = { 'provider' => 'twitter',
+ 'uid' => '12345',
+ 'info' => {
+ 'name' => 'manuela'
+ }
+ }
+
+ OmniAuth.config.add_mock(:twitter, omniauth_twitter_hash)
+
+ visit '/'
+ click_link 'Log in'
+
+ expect do
+ expect do
+ click_link 'Sign in with Twitter'
+ end.not_to change { Identity.count }
+ end.not_to change { User.count }
+
+ expect_to_be_signed_in
+ end
+ end
end
scenario 'Sign out' do
@@ -73,5 +188,4 @@ feature 'Users' do
expect(page).to have_content "Your password has been changed successfully. You are now signed in."
end
-
end
diff --git a/spec/models/ability_spec.rb b/spec/models/ability_spec.rb
index ff3e3800c..a7cfd195f 100644
--- a/spec/models/ability_spec.rb
+++ b/spec/models/ability_spec.rb
@@ -131,8 +131,8 @@ describe Ability do
let(:own_debate) { create(:debate, author: user) }
let(:hidden_comment) { create(:comment, :hidden) }
let(:hidden_debate) { create(:debate, :hidden) }
- let(:reviewed_comment) { create(:comment, :reviewed) }
- let(:reviewed_debate) { create(:debate, :reviewed) }
+ let(:archived_comment) { create(:comment, :archived) }
+ let(:archived_debate) { create(:debate, :archived) }
it { should be_able_to(:hide, comment) }
it { should be_able_to(:hide_in_moderation_screen, comment) }
@@ -144,15 +144,15 @@ describe Ability do
it { should_not be_able_to(:hide, hidden_debate) }
it { should_not be_able_to(:hide, own_debate) }
- it { should be_able_to(:mark_as_reviewed, comment) }
- it { should_not be_able_to(:mark_as_reviewed, hidden_comment) }
- it { should_not be_able_to(:mark_as_reviewed, reviewed_comment) }
- it { should_not be_able_to(:mark_as_reviewed, own_comment) }
+ it { should be_able_to(:archive, comment) }
+ it { should_not be_able_to(:archive, hidden_comment) }
+ it { should_not be_able_to(:archive, archived_comment) }
+ it { should_not be_able_to(:archive, own_comment) }
- it { should be_able_to(:mark_as_reviewed, debate) }
- it { should_not be_able_to(:mark_as_reviewed, hidden_debate) }
- it { should_not be_able_to(:mark_as_reviewed, reviewed_debate) }
- it { should_not be_able_to(:mark_as_reviewed, own_debate) }
+ it { should be_able_to(:archive, debate) }
+ it { should_not be_able_to(:archive, hidden_debate) }
+ it { should_not be_able_to(:archive, archived_debate) }
+ it { should_not be_able_to(:archive, own_debate) }
it { should_not be_able_to(:hide, user) }
it { should be_able_to(:hide, other_user) }
diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb
index 98420c000..4115fedcf 100644
--- a/spec/models/comment_spec.rb
+++ b/spec/models/comment_spec.rb
@@ -8,6 +8,15 @@ describe Comment do
expect(comment).to be_valid
end
+ it "should update cache_counter in debate after hide" do
+ debate = create(:debate)
+ comment = create(:comment, commentable: debate)
+
+ expect(debate.reload.comments_count).to eq(1)
+ comment.hide
+ expect(debate.reload.comments_count).to eq(0)
+ end
+
describe "#children_count" do
let(:comment) { create(:comment) }
let(:debate) { comment.debate }
diff --git a/spec/models/identity_spec.rb b/spec/models/identity_spec.rb
new file mode 100644
index 000000000..82d5c4be3
--- /dev/null
+++ b/spec/models/identity_spec.rb
@@ -0,0 +1,9 @@
+require 'rails_helper'
+
+RSpec.describe Identity, type: :model do
+ let(:identity) { build(:identity) }
+
+ it "should be valid" do
+ expect(identity).to be_valid
+ end
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 5a4bbdf88..e0260285a 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -50,6 +50,26 @@ describe User do
end
end
+ describe 'OmniAuth' do
+ describe '#email_provided?' do
+ it "is false if the email matchs was temporarely assigned by the OmniAuth process" do
+ subject.email = 'omniauth@participacion-ABCD-twitter.com'
+ expect(subject.email_provided?).to eq(false)
+ end
+
+ it "is true if the email is not omniauth-like" do
+ subject.email = 'manuelacarmena@example.com'
+ expect(subject.email_provided?).to eq(true)
+ end
+
+ it "is true if the user's real email is pending to be confirmed" do
+ subject.email = 'omniauth@participacion-ABCD-twitter.com'
+ subject.unconfirmed_email = 'manuelacarmena@example.com'
+ expect(subject.email_provided?).to eq(true)
+ end
+ end
+ end
+
describe "administrator?" do
it "is false when the user is not an admin" do
expect(subject.administrator?).to be false
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index d073cc173..c2f5db0fe 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -22,3 +22,5 @@ RSpec.configure do |config|
end
Capybara.javascript_driver = :poltergeist
+
+OmniAuth.config.test_mode = true
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0e0b14960..bf1a65776 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -27,6 +27,15 @@ RSpec.configure do |config|
DatabaseCleaner.clean
end
+ config.before(:each, type: :feature) do
+ Bullet.start_request
+ end
+
+ config.after(:each, type: :feature) do
+ Bullet.perform_out_of_channel_notifications if Bullet.notification?
+ Bullet.end_request
+ end
+
# Allows RSpec to persist some state between runs in order to support
# the `--only-failures` and `--next-failure` CLI options.
config.example_status_persistence_file_path = "spec/examples.txt"
@@ -57,4 +66,6 @@ RSpec.configure do |config|
# test failures related to randomization by passing the same `--seed` value
# as the one that triggered the failure.
Kernel.srand config.seed
+
+
end
diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb
index 21a98f56f..12d6affd3 100644
--- a/spec/support/common_actions.rb
+++ b/spec/support/common_actions.rb
@@ -77,4 +77,7 @@ module CommonActions
/\d errors? prohibited this (.*) from being saved:/
end
+ def expect_to_be_signed_in
+ expect(find('.top-bar')).to have_content 'My account'
+ end
end