- <%= render partial: "featured_debate", collection: @featured_debates %>
-
<%= render @debates %>
-
-
- <% if current_user && @debate.editable_by?(current_user) %>
- <%= link_to t("debates.show.edit_debate_link"), edit_debate_path(@debate), :class => 'button radius right' %>
- <% end %>
<%= t("debates.show.comments") %>
+ ++ <%= t("debates.show.comments_title") %> + (<%= t("debates.show.comments", count: @debate.comment_threads.count) %>) +
<% if user_signed_in? %>
<%= t("debates.show.leave_comment") %>
<%= render 'comments/form', {parent: @debate, toggeable: false} %>
<% end %>
- <%= render @debate.root_comments %>
+ <%= render @debate.root_comments.recent %>
<%= t("devise_views.confirmations.title") %>
<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= render 'shared/errors', resource: resource %>
- <%= f.label :email, t("devise_views.confirmations.email_label") %>
<%= f.email_field :email, autofocus: true, placeholder: t("devise_views.confirmations.email_label"), value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
index cd0cf81ecca..6c1c822bc29 100644
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -1,25 +1,30 @@
-<%= t("devise_views.passwords.edit.title") %>
+
+
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index b09e0435a2f..78a8b8b4ca9 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -3,10 +3,10 @@
+
+
+
+ <%= t("devise_views.passwords.edit.title") %>
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> - <%= devise_error_messages! %> - <%= f.hidden_field :reset_password_token %> + <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> + <%= render 'shared/errors', resource: resource %> -
- <%= f.label :password, t("devise_views.passwords.edit.password_label") %>
- <% if @minimum_password_length %> - <%= t("devise_views.passwords.edit.min_length", min: @minimum_password_length) %> - <% end %>
- <%= f.password_field :password, autofocus: true, autocomplete: "off" %> -
+ <%= f.hidden_field :reset_password_token %>
- - <% if @minimum_password_length %> - <%= t("devise_views.passwords.edit.min_length", min: @minimum_password_length) %> - <% end %>
- <%= f.password_field :password, autofocus: true, autocomplete: "off" %> -
- <%= f.label :password_confirmation, t("devise_views.passwords.edit.password_confirmation_label") %>
- <%= f.password_field :password_confirmation, autocomplete: "off" %> -
+ - <%= f.password_field :password_confirmation, autocomplete: "off" %> -
+ <%= f.password_field :password, autofocus: true, autocomplete: "off",
+ label: t("devise_views.passwords.edit.password_label") %>
+
-
- <%= f.submit t("devise_views.passwords.edit.change_submit") %>
-
-<% end %>
+
+ <%= f.password_field :password_confirmation, autocomplete: "off",
+ label: t("devise_views.passwords.edit.password_confirmation_label") %>
+
-<%= render "devise/shared/links" %>
+
+ <%= f.submit t("devise_views.passwords.edit.change_submit") %>
+
+ <% end %>
+
+ <%= render "devise/shared/links" %>
+
+ <%= t("devise_views.passwords.new.title") %>
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= render 'shared/errors', resource: resource %> +
- <%= f.label :email, t("devise_views.passwords.new.email_label") %>
<%= f.email_field :email, autofocus: true, placeholder: t("devise_views.passwords.new.email_label") %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 1ff5330739e..391ef186c73 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,24 +1,21 @@
-
@@ -32,6 +33,7 @@
<%= t("devise_views.sessions.new.title") %>
+<%= t("devise_views.sessions.new.title") %>
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
- <%= f.label :email, t("devise_views.sessions.new.email_label") %>
<%= f.email_field :email, autofocus: true, placeholder: t("devise_views.sessions.new.email_label") %>
- <%= f.label :password, t("devise_views.sessions.new.password_label") %>
<%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label") %>
<% if devise_mapping.rememberable? -%>
- <%= f.check_box :remember_me %>
- <%= f.label :remember_me, t("devise_views.sessions.new.remember_me") %>
+ <%= f.check_box :remember_me, label: t("devise_views.sessions.new.remember_me") %>
<% end -%>
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
index a9266266407..d2120943807 100644
--- a/app/views/devise/unlocks/new.html.erb
+++ b/app/views/devise/unlocks/new.html.erb
@@ -1,16 +1,23 @@
-<%= t("devise_views.unlocks.new.title") %>
+
+
\ No newline at end of file
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 48ffa41d574..b88dcded4ad 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -11,9 +11,10 @@
]
+
+
+
+ <%= t("devise_views.unlocks.new.title") %>
-<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> + <%= render 'shared/errors', resource: resource %> -
- <%= f.label :email, t("devise_views.unlocks.new.email_label") %>
- <%= f.email_field :email, autofocus: true %> -
+ - <%= f.email_field :email, autofocus: true %> -
+ <%= f.email_field :email, autofocus: true,
+ label: t("devise_views.unlocks.new.email_label") %>
+
-
- <%= f.submit t("devise_views.unlocks.new.submit") %>
-
-<% end %>
+
+ <%= f.submit t("devise_views.unlocks.new.submit") %>
+
+ <% end %>
-<%= render "devise/shared/links" %>
+ <%= render "devise/shared/links" %>
+
+
- <%= link_to t("layouts.header.participation"), root_path, class: "selected" %> |
- <%= t("layouts.header.external_link_transparency") %> |
- <%= t("layouts.header.external_link_opendata") %>
+ <%= link_to t("layouts.header.participation"), root_path, class: "selected" %> |
+ <%= link_to t("layouts.header.external_link_transparency"), "#" %> |
+ <%= link_to t("layouts.header.external_link_opendata"), "#" %> |
+ <%= link_to t("layouts.header.external_link_blog"), "#" %>
<%= t("layouts.header.open_city") %>
<%= t("layouts.header.open_city_slogan") %>
- <%= link_to t("layouts.header.create_debate"), new_debate_path, class: 'button radius' %> + <%= link_to t("layouts.header.see_all_debates"), debates_path, class: 'button radius' %><%= notice %>
+ <% end %> + + <% if alert %> +<%= alert %>
+ <% end %> + +
+ <%= side_menu %>
+
+
+ <%= yield %>
+
+
+
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 36a3c44cc9c..eee30377e7f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -9,7 +9,6 @@
<%= javascript_include_tag "vendor/modernizr" %>
<%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
<%= csrf_meta_tags %>
-
diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb
index fe73e555332..85f448f81f5 100644
--- a/app/views/layouts/devise.html.erb
+++ b/app/views/layouts/devise.html.erb
@@ -9,7 +9,6 @@
<%= javascript_include_tag "vendor/modernizr" %>
<%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
<%= csrf_meta_tags %>
-
diff --git a/app/views/moderation/_menu.html.erb b/app/views/moderation/_menu.html.erb
new file mode 100644
index 00000000000..21997abcaff
--- /dev/null
+++ b/app/views/moderation/_menu.html.erb
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/app/views/organizations/registrations/new.html.erb b/app/views/organizations/registrations/new.html.erb
index f8ca107be61..4f8b05862ca 100644
--- a/app/views/organizations/registrations/new.html.erb
+++ b/app/views/organizations/registrations/new.html.erb
@@ -1,64 +1,36 @@
-
-
+
\ No newline at end of file
diff --git a/config/application.rb b/config/application.rb
index cc325bc6ced..8cd17632d4a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -32,5 +32,6 @@ class Application < Rails::Application
# Add lib to the autoload path
config.autoload_paths << Rails.root.join('lib')
+ config.time_zone = 'Madrid'
end
end
diff --git a/config/database.yml.example b/config/database.yml.example
index 7813e5e3aca..93d3fd3b876 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -10,6 +10,9 @@ development:
<<: *default
database: participacion_development
+staging:
+ <<: *default
+
test:
<<: *default
database: participacion_test
\ No newline at end of file
diff --git a/config/deploy-secrets.yml.example b/config/deploy-secrets.yml.example
index b69fea22574..696f6ce7558 100644
--- a/config/deploy-secrets.yml.example
+++ b/config/deploy-secrets.yml.example
@@ -3,6 +3,8 @@ staging:
ssh_port: 21
server: staging.participacion.madrid.es
user: xxxxx
+ server_name: staging.participacion.madrid.es
+ db_server: postgre.participacion.madrid.es
preproduction:
deploy_to: "/var/www/participacion"
diff --git a/config/deploy.rb b/config/deploy.rb
index 8104d742f5c..9c45bd28389 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -8,14 +8,20 @@ def deploysecret(key)
set :rails_env, fetch(:stage)
set :rvm_ruby_version, '2.2.2'
+set :rvm_type, :user
set :application, 'participacion'
-set :repo_url, 'git@github.com:AyuntamientoMadrid/participacion.git'
+set :server_name, deploysecret(:server_name)
+#set :repo_url, 'git@github.com:AyuntamientoMadrid/participacion.git'
+# If ssh access is restricted, probably you need to use https access
+set :repo_url, 'https://github.com/AyuntamientoMadrid/participacion.git'
set :scm, :git
set :revision, `git rev-parse --short #{fetch(:branch)}`.strip
set :log_level, :info
+set :pty, true
+set :use_sudo, false
set :linked_files, %w{config/database.yml config/secrets.yml}
set :linked_dirs, %w{log tmp public/system public/assets}
@@ -24,15 +30,27 @@ def deploysecret(key)
set :local_user, ENV['USER']
-namespace :deploy do
+# Run test before deploy
+set :tests, ["spec"]
+
+# Config files should be copied by deploy:setup_config
+set(:config_files, %w(
+ log_rotation
+ database.yml
+ secrets.yml
+ unicorn.rb
+ sidekiq.yml
+))
- after :restart, :clear_cache do
- on roles(:web), in: :groups, limit: 3, wait: 10 do
- # Here we can do anything such as:
- # within release_path do
- # execute :rake, 'cache:clear'
- # end
- end
- end
+namespace :deploy do
+ # Check right version of deploy branch
+ before :deploy, "deploy:check_revision"
+ # Run test aund continue only if passed
+ before :deploy, "deploy:run_tests"
+ # Compile assets locally and then rsync
+ after 'deploy:symlink:shared', 'deploy:compile_assets_locally'
+ after :finishing, 'deploy:cleanup'
+ # Restart unicorn
+ after 'deploy:publishing', 'deploy:restart'
end
diff --git a/config/deploy/preproduction.rb b/config/deploy/preproduction.rb
index fb9033c038f..7a18c011d95 100644
--- a/config/deploy/preproduction.rb
+++ b/config/deploy/preproduction.rb
@@ -1,5 +1,9 @@
set :deploy_to, deploysecret(:deploy_to)
-set :branch, :production
+set :server_name, deploysecret(:server_name)
+set :db_server, deploysecret(:db_server)
+set :branch, :master
set :ssh_options, port: deploysecret(:ssh_port)
+set :stage, :production
+set :rails_env, :production
-server deploysecret(:server), user: deploysecret(:user), roles: %w(web app db importer)
\ No newline at end of file
+server deploysecret(:server), user: deploysecret(:user), roles: %w(web app db importer)
diff --git a/config/deploy/production.rb b/config/deploy/production.rb
index fb9033c038f..7a18c011d95 100644
--- a/config/deploy/production.rb
+++ b/config/deploy/production.rb
@@ -1,5 +1,9 @@
set :deploy_to, deploysecret(:deploy_to)
-set :branch, :production
+set :server_name, deploysecret(:server_name)
+set :db_server, deploysecret(:db_server)
+set :branch, :master
set :ssh_options, port: deploysecret(:ssh_port)
+set :stage, :production
+set :rails_env, :production
-server deploysecret(:server), user: deploysecret(:user), roles: %w(web app db importer)
\ No newline at end of file
+server deploysecret(:server), user: deploysecret(:user), roles: %w(web app db importer)
diff --git a/config/deploy/sample_config_files/apache_passenger.conf b/config/deploy/sample_config_files/apache_passenger.conf
new file mode 100644
index 00000000000..f97fc9b2ad0
--- /dev/null
+++ b/config/deploy/sample_config_files/apache_passenger.conf
@@ -0,0 +1,19 @@
+
+
+ ServerName yourdomain.com
+ ServerAlias www.yourdomain.com
+ ServerAdmin webmaster@localhost
+
+ DocumentRoot /path/to/deploy_to/current/public
+
+ # RailsEnv production
+
+ ErrorLog ${APACHE_LOG_DIR}/yourdomain.error.log
+ CustomLog ${APACHE_LOG_DIR}/yourdomain.access.log combined
+
+
+ Options FollowSymLinks
+ Require all granted
+
+
+
diff --git a/config/deploy/sample_config_files/apache_unicorn.conf b/config/deploy/sample_config_files/apache_unicorn.conf
new file mode 100644
index 00000000000..93aafec2342
--- /dev/null
+++ b/config/deploy/sample_config_files/apache_unicorn.conf
@@ -0,0 +1,31 @@
+
+
+ ServerAdmin admin@yourdomain.com
+ ServerName yourdomain.com
+ ServerAlias www.yourdomain.com
+
+ DocumentRoot /path/to/deploy_to/current/public
+
+ RewriteEngine On
+
+
+ BalancerMember http://127.0.0.1:5000
+
+
+ # Redirect all non-static requests to thin
+ RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
+ RewriteRule ^/(.*)$ balancer://unicornservers%{REQUEST_URI} [P,QSA,L]
+
+ ProxyPass / balancer://unicornservers/
+ ProxyPassReverse / balancer://unicornservers/
+ ProxyPreserveHost on
+
+
+ Order deny,allow
+ Allow from all
+
+
+ ErrorLog ${APACHE_LOG_DIR}/yourdomain.error.log
+ CustomLog ${APACHE_LOG_DIR}/yourdomain.access.log combined
+
+
diff --git a/config/deploy/sample_config_files/unicorn_init.sh b/config/deploy/sample_config_files/unicorn_init.sh
new file mode 100644
index 00000000000..1cef9110ba8
--- /dev/null
+++ b/config/deploy/sample_config_files/unicorn_init.sh
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides: unicorn
+# Required-Start: $local_fs $remote_fs $network $syslog
+# Required-Stop: $local_fs $remote_fs $network $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: starts the unicorn web server
+# Description: starts unicorn
+### END INIT INFO
+
+set -e
+
+TIMEOUT=${TIMEOUT-60}
+APP_ROOT=<%= current_path %>
+PID_DIR=$APP_ROOT/tmp/pids
+PID=$PID_DIR/unicorn.pid
+CMD="cd $APP_ROOT; bundle exec unicorn -D -c /path/to/shared/config/unicorn.rb -E production"
+AS_USER=deploy
+set -u
+
+OLD_PIN="$PID.oldbin"
+
+sig () {
+ test -s "$PID" && kill -$1 `cat $PID`
+}
+
+oldsig () {
+ test -s $OLD_PIN && kill -$1 `cat $OLD_PIN`
+}
+
+workersig () {
+ workerpid="$APP_ROOT/tmp/pids/unicorn.$2.pid"
+
+ test -s "$workerpid" && kill -$1 `cat $workerpid`
+}
+
+run () {
+ if [ "$(id -un)" = "$AS_USER" ]; then
+ eval $1
+ else
+ su -c "$1" - $AS_USER
+ fi
+}
+
+case "$1" in
+start)
+ sig 0 && echo >&2 "Already running" && exit 0
+ run "$CMD"
+ ;;
+stop)
+ sig QUIT && exit 0
+ echo >&2 "Not running"
+ ;;
+force-stop)
+ sig TERM && exit 0
+ echo >&2 "Not running"
+ ;;
+kill_worker)
+ workersig QUIT $2 && exit 0
+ echo >&2 "Worker not running"
+ ;;
+restart|reload)
+ sig USR2 && echo reloaded OK && exit 0
+ echo >&2 "Couldn't reload, starting '$CMD' instead"
+ run "$CMD"
+ ;;
+upgrade)
+ if sig USR2 && sleep 2 && sig 0 && oldsig QUIT
+ then
+ n=$TIMEOUT
+ while test -s $OLD_PIN && test $n -ge 0
+ do
+ printf '.' && sleep 1 && n=$(( $n - 1 ))
+ done
+ echo
+
+ if test $n -lt 0 && test -s $OLD_PIN
+ then
+ echo >&2 "$OLD_PIN still exists after $TIMEOUT seconds"
+ exit 1
+ fi
+ exit 0
+ fi
+ echo >&2 "Couldn't upgrade, starting '$CMD' instead"
+ run "$CMD"
+ ;;
+reopen-logs)
+ sig USR1
+ ;;
+*)
+ echo >&2 "Usage: $0 "
+ exit 1
+ ;;
+esac
diff --git a/config/deploy/shared/database.yml.erb b/config/deploy/shared/database.yml.erb
new file mode 100644
index 00000000000..2449ae6f827
--- /dev/null
+++ b/config/deploy/shared/database.yml.erb
@@ -0,0 +1,10 @@
+<%= fetch(:rails_env) %>:
+ adapter: postgresql
+ timeout: 5000
+ encoding: unicode
+ reconnect: false
+ database: <%= "#{fetch(:application)}" %>
+ pool: 5
+ username:
+ password:
+ host: <%= fetch(:db_server) %>
diff --git a/config/deploy/shared/log_rotation.erb b/config/deploy/shared/log_rotation.erb
new file mode 100755
index 00000000000..7507de18401
--- /dev/null
+++ b/config/deploy/shared/log_rotation.erb
@@ -0,0 +1,11 @@
+<%= fetch(:deploy_to) %>/shared/log/*.log {
+ daily
+ missingok
+ rotate 52
+ compress
+ delaycompress
+ notifempty
+ sharedscripts
+ endscript
+ copytruncate
+}
diff --git a/config/deploy/shared/secrets.yml.erb b/config/deploy/shared/secrets.yml.erb
new file mode 100644
index 00000000000..d3c3251af9a
--- /dev/null
+++ b/config/deploy/shared/secrets.yml.erb
@@ -0,0 +1,4 @@
+<%= fetch(:rails_env) %>:
+ recaptcha_public_key: <%= ENV["MADRID_RECAPTCHA_PUBLIC_KEY"] %>
+ recaptcha_private_key: <%= ENV["MADRID_RECAPTCHA_PRIVATE_KEY"] %>
+ secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
diff --git a/config/deploy/shared/sidekiq.yml.erb b/config/deploy/shared/sidekiq.yml.erb
new file mode 100644
index 00000000000..1d4747933a1
--- /dev/null
+++ b/config/deploy/shared/sidekiq.yml.erb
@@ -0,0 +1,2 @@
+<%= fetch(:rails_env) %>:
+ :concurrency: <%= fetch(:sidekiq_concurrency, 5) %>
diff --git a/config/deploy/shared/unicorn.rb.erb b/config/deploy/shared/unicorn.rb.erb
new file mode 100755
index 00000000000..805734276da
--- /dev/null
+++ b/config/deploy/shared/unicorn.rb.erb
@@ -0,0 +1,42 @@
+root = "<%= current_path %>"
+working_directory root
+pid "#{root}/tmp/pids/unicorn.pid"
+stderr_path "#{root}/log/unicorn.log"
+stdout_path "#{root}/log/unicorn.log"
+
+listen 5000
+#listen "/tmp/unicorn.<%= fetch(:application) %>.sock"
+worker_processes 4
+timeout 40
+preload_app true
+
+# Force unicorn to look at the Gemfile in the current_path
+# otherwise once we've first started a master process, it
+# will always point to the first one it started.
+before_exec do |server|
+ ENV['BUNDLE_GEMFILE'] = "<%= current_path %>/Gemfile"
+end
+
+before_fork do |server, worker|
+ defined?(ActiveRecord::Base) and
+ ActiveRecord::Base.connection.disconnect!
+ # Quit the old unicorn process
+ old_pid = "#{server.config[:pid]}.oldbin"
+ if File.exists?(old_pid) && server.pid != old_pid
+ puts "We've got an old pid and server pid is not the old pid"
+ begin
+ Process.kill("QUIT", File.read(old_pid).to_i)
+ puts "killing master process (good thing tm)"
+ rescue Errno::ENOENT, Errno::ESRCH
+ puts "unicorn master already killed"
+ end
+ end
+end
+
+after_fork do |server, worker|
+ port = 5000 + worker.nr
+ child_pid = server.config[:pid].sub('.pid', ".#{port}.pid")
+ system("echo #{Process.pid} > #{child_pid}")
+ defined?(ActiveRecord::Base) and
+ ActiveRecord::Base.establish_connection
+end
diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb
index 5ca436c4297..09ba7401a98 100644
--- a/config/deploy/staging.rb
+++ b/config/deploy/staging.rb
@@ -1,7 +1,11 @@
set :deploy_to, deploysecret(:deploy_to)
+set :server_name, deploysecret(:server_name)
+set :db_server, deploysecret(:db_server)
set :branch, :master
set :ssh_options, port: deploysecret(:ssh_port)
-
-set :passenger_restart_with_sudo, false
+set :stage, :staging
+set :rails_env, :staging
server deploysecret(:server), user: deploysecret(:user), roles: %w(web app db importer)
+
+
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index f0afba346e5..5e6eb28995d 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -89,6 +89,7 @@ search:
# - '{devise,simple_form}.*'
ignore_missing:
- 'unauthorized.*'
+ - 'errors.messages.blank'
## Consider these keys used:
ignore_unused:
@@ -99,6 +100,7 @@ ignore_unused:
# - 'simple_form.{error_notification,required}.:'
ignore_unused:
- 'unauthorized.*'
+ - 'simple_captcha.*'
## Exclude these keys from the `i18n-tasks eq-base' report:
# ignore_eq_base:
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 3be902f1818..f7cdfb2927c 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -6,7 +6,7 @@
# confirmation, reset password and unlock tokens in the database.
# Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key`
# by default. You can change it below and use your own secret key.
- # config.secret_key = '486ed5e25dcabac12a62c72a26e8057cfc2b822dd46c8b593a77aa95479bac481c3d70d5e5ee88a04aac3cf9b40e592575ca7674e248ff747f5afcdf3a320969'
+ config.secret_key = '486ed5e25dcabac12a62c72a26e8057cfc2b822dd46c8b593a77aa95479bac481c3d70d5e5ee88a04aac3cf9b40e592575ca7674e248ff747f5afcdf3a320969'
# ==> Mailer Configuration
# Configure the e-mail address which will be shown in Devise::Mailer,
diff --git a/config/initializers/recaptcha.rb b/config/initializers/recaptcha.rb
deleted file mode 100644
index 36a5cef8b96..00000000000
--- a/config/initializers/recaptcha.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-Recaptcha.configure do |config|
- config.public_key = Rails.application.secrets.recaptcha_public_key
- config.private_key = Rails.application.secrets.recaptcha_private_key
- config.api_version = 'v2'
-end
\ No newline at end of file
diff --git a/config/initializers/simple_captcha.rb b/config/initializers/simple_captcha.rb
new file mode 100644
index 00000000000..25d3a134264
--- /dev/null
+++ b/config/initializers/simple_captcha.rb
@@ -0,0 +1,37 @@
+SimpleCaptcha.always_pass = Rails.env.test?
+
+SimpleCaptcha.setup do |sc|
+ # default: 100x28
+ sc.image_size = '120x40'
+
+ # default: 5
+ sc.length = 6
+
+ # default: simply_blue
+ # possible values:
+ # 'embosed_silver',
+ # 'simply_red',
+ # 'simply_green',
+ # 'simply_blue',
+ # 'distorted_black',
+ # 'all_black',
+ # 'charcoal_grey',
+ # 'almost_invisible'
+ # 'random'
+ sc.image_style = 'simply_green'
+
+ # default: low
+ # possible values: 'low', 'medium', 'high', 'random'
+ sc.distortion = 'random'
+
+ # default: medium
+ # possible values: 'none', 'low', 'medium', 'high'
+ sc.implode = 'medium'
+
+ # sc.image_style = 'mycaptha'
+ # sc.add_image_style('mycaptha', [
+ # "-background '#F4F7F8'",
+ # "-fill '#86818B'",
+ # "-border 1",
+ # "-bordercolor '#E0E2E3'"])
+end
diff --git a/config/initializers/social_share_button.rb b/config/initializers/social_share_button.rb
new file mode 100644
index 00000000000..d8b6e52546a
--- /dev/null
+++ b/config/initializers/social_share_button.rb
@@ -0,0 +1,3 @@
+SocialShareButton.configure do |config|
+ config.allow_sites = %w(twitter facebook google_plus)
+end
diff --git a/config/initializers/vote_extensions.rb b/config/initializers/vote_extensions.rb
new file mode 100644
index 00000000000..4bbf48d206b
--- /dev/null
+++ b/config/initializers/vote_extensions.rb
@@ -0,0 +1,13 @@
+ActsAsVotable::Vote.class_eval do
+ def self.for_debates
+ where(votable_type: 'Debate')
+ end
+
+ def self.in(debates)
+ where(votable_id: debates)
+ end
+
+ def value
+ vote_flag
+ end
+end
\ No newline at end of file
diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml
index e62df2a65e5..c9930c1ae8a 100644
--- a/config/locales/activerecord.en.yml
+++ b/config/locales/activerecord.en.yml
@@ -3,6 +3,7 @@ en:
models:
comment: Comment
debate: Debate
+ tag: Topic
user: User
vote: Vote
organization: Organization
@@ -21,5 +22,6 @@ en:
last_name: "Last name"
nickname: Nickname
password: Password
+ phone_number: Phone number
organization:
name: Organization name
diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml
index 36af7e1b3f1..620e259a819 100644
--- a/config/locales/activerecord.es.yml
+++ b/config/locales/activerecord.es.yml
@@ -3,6 +3,7 @@ es:
models:
comment: Comentario
debate: Debate
+ tag: Tema
user: Usuario
vote: Voto
organization: Organización
@@ -21,5 +22,6 @@ es:
last_name: Apellidos
nickname: Pseudónimo
password: Contraseña
+ phone_number: Teléfono
organization:
name: Nombre de organización
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index dd8cc2b9469..a5b469e1bd9 100644
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -2,4 +2,12 @@ en:
admin:
dashboard:
index:
- title: Administration
\ No newline at end of file
+ title: Administration
+ tags:
+ index:
+ title: 'Debate topics'
+ add_tag: 'Add a new debate topic'
+ mark_as_featured: 'Mark as featured'
+ name:
+ placeholder: 'Write a topic'
+ destroy: Delete Tag
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index 7ebe05bc666..fecb7c5f428 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -2,4 +2,12 @@ es:
admin:
dashboard:
index:
- title: Administración
\ No newline at end of file
+ title: Administración
+ tags:
+ index:
+ title: 'Temas de debate'
+ add_tag: 'Añade un nuevo tema de debate'
+ mark_as_featured: 'Marcar como destacado'
+ name:
+ placeholder: 'Escribe el nombre del tema'
+ destroy: Elimina la etiqueta
diff --git a/config/locales/devise_views.en.yml b/config/locales/devise_views.en.yml
index 6895790cb27..e5a1ec48d29 100644
--- a/config/locales/devise_views.en.yml
+++ b/config/locales/devise_views.en.yml
@@ -29,7 +29,6 @@ en:
edit:
title: "Change your password"
password_label: "New password"
- min_length: "(%{min} characters minimum)"
password_confirmation_label: "Confirm new password"
change_submit: "Change my password"
new:
@@ -58,7 +57,6 @@ en:
email_label: "Email"
phone_number_label: "Phone number"
password_label: "Password"
- min_length: "(%{min} characters minimum)"
password_confirmation_label: "Confirm password"
submit: "Sign up"
organizations:
@@ -69,7 +67,6 @@ en:
email_label: "Email"
password_label: "Password"
phone_number_label: "Phone number"
- min_length: "(%{min} characters minimum)"
password_confirmation_label: "Confirm password"
submit: "Sign up"
sessions:
diff --git a/config/locales/devise_views.es.yml b/config/locales/devise_views.es.yml
index 700040e1256..c44ddfb31a2 100644
--- a/config/locales/devise_views.es.yml
+++ b/config/locales/devise_views.es.yml
@@ -8,7 +8,7 @@ es:
confirmation_instructions:
welcome: "Bienvenido"
text: "Puedes confirmar tu cuenta de correo electrónico en el siguiente enlace:"
- confirm_link: "Confirmar my cuenta"
+ 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:"
@@ -29,7 +29,6 @@ es:
edit:
title: "Cambia tu contraseña"
password_label: "Contraseña nueva"
- min_length: "(mínimo %{min} caracteres)"
password_confirmation_label: "Confirmar contraseña nueva"
change_submit: "Cambiar mi contraseña"
new:
@@ -58,7 +57,6 @@ es:
email_label: "Email"
phone_number_label: "Teléfono"
password_label: "Contraseña"
- min_length: "(mínimo %{min} caracteres)"
password_confirmation_label: "Confirmar contraseña"
submit: "Registrarse"
organizations:
@@ -69,7 +67,6 @@ es:
email_label: "Email"
password_label: "Contraseña"
phone_number_label: "Teléfono"
- min_length: "(mínimo %{min} caracteres)"
password_confirmation_label: "Confirmar contraseña"
submit: "Registrarse"
sessions:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 480a50a56c0..e5d6882c57e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,44 +3,71 @@ en:
header:
external_link_transparency: Transparency
external_link_opendata: Open data
+ external_link_blog: Blog
open_gov: "%{open} government"
open: "Open"
participation: Participation
menu: Menu
open_city: We are opening Madrid
open_city_slogan: So the citizens can decide what kind of city they want.
- create_debate: Create a debate
+ see_all_debates: See all debates
my_account_link: My account
language: Site language
+ administration: Administration
+ moderation: Moderation
footer:
copyright: "Ayuntamiento de Madrid, 2015. All rights reserved"
+ form:
+ error: error
+ errors: errors
+ not_saved: "prohibited this %{resource} from being saved:"
+ accept_terms: I accept the privacy policy and the legal terms
+ user: account
+ debate: debate
debates:
index:
create_debate: Create a debate
debate:
debate: Debate
- vote: vote
- votes: votes
- comment: Comment
- comments: Comments
+ comments:
+ zero: No comments
+ one: 1 Comment
+ other: "%{count} Comments"
+ votes:
+ zero: No votes
+ one: 1 vote
+ other: "%{count} votes"
+ comment:
+ responses:
+ zero: No Responses
+ one: 1 Response
+ other: "%{count} Responses"
+ votes:
+ zero: No votes
+ one: 1 vote
+ other: "%{count} votes"
+ votes_weighted_score: "Total: %{score}"
form:
- error: error
- errors: errors
- not_saved: "prohibited this debate from being saved:"
debate_title: Debate title
title_instructions: "SBe clear and precise with the title, but make it informative"
debate_text: Ellaborate your opinion
text_instructions: "Explain your opinion, go into details, tell us what's the purpose of your idea"
tags_label: Topics
- tags_instructions: Comma separated
- accept_terms: I accept the privacy policy and the legal terms
+ tags_instructions: >
+ Tag this idea. You can choose among our proposals on the list or add any other topic you want by
+ writing them separated by "," and then pressing "enter".
+ Some suggestions:
show:
back_link: Back
- comment: Comment
- comments: Comments
+ comments_title: Comments
+ comments:
+ zero: No comments
+ one: 1 Comment
+ other: "%{count} Comments"
leave_comment: Write a comment
login_to_comment: Log in to participate
edit_debate_link: Edit
+ share: Share
edit:
editing: Edit debate
show_link: Show debate
@@ -61,6 +88,9 @@ en:
agree: I agree
disagree: I disagree
supports: Supports
+ unauthenticated: "You need to %{signin} or %{signup} before continuing."
+ signin: sign in
+ signup: sign up
account:
show:
title: "My account"
@@ -68,17 +98,25 @@ en:
email_on_debate_comment_label: "Receive email when someone comments on my debates"
email_on_comment_reply_label: "Receive email when someone replies to my comments"
change_credentials_link: "Change my credentials"
+ avatar: "Avatar"
+ personal: "Personal data"
first_name_label: "First Name"
last_name_label: "Last Name"
phone_number_label: "Phone number"
+ organization_name_label: "Organization name"
use_nickname_label: "Use nickname"
nickname_label: "Nickname"
- recaptcha:
- errors:
- verification_failed: "The captcha verification failed"
+ notifications: Notifications
+ simple_captcha:
+ placeholder: "Enter the image value"
+ label: "Enter the code in the box"
+ refresh_button_text: "Refresh"
+ message:
+ user: "secret code did not match with the image"
+ debate: "secret code did not match with the image"
shared:
tags_cloud:
- tags: Tags
+ tags: Topics
mailer:
comment:
subject: Someone has commented on your debate
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 2ee0d07b64a..ea68e07f8c3 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1,46 +1,73 @@
es:
layouts:
header:
- external_link_transparency: Portal de Transparencia
+ external_link_transparency: Transparencia
external_link_opendata: Datos abiertos
+ external_link_blog: Blog
open_gov: "Gobierno %{open}"
open: "abierto"
participation: Participación
menu: Menú
open_city: Estamos abriendo Madrid
open_city_slogan: Para que todos los madrileños decidamos que ciudad queremos tener.
- create_debate: Crea un debate
+ see_all_debates: Ver todos los debates
my_account_link: Mi cuenta
language: Idioma de la página
+ administration: Administar
+ moderation: Moderar
footer:
copyright: "Ayuntamiento de Madrid, %{year}. Todos los derechos reservados"
+ form:
+ error: error
+ errors: errores
+ not_saved: "impidieron guardar %{resource}:"
+ accept_terms: Acepto la política de privacidad y el aviso legal
+ user: la cuenta
+ debate: el debate
debates:
index:
create_debate: Crea un debate
debate:
debate: Debate
- vote: voto
- votes: votos
- comment: Comentario
- comments: Comentarios
+ comments:
+ zero: Sin comentarios
+ one: 1 Comentario
+ other: "%{count} Comentarios"
+ votes:
+ zero: Sin votos
+ one: 1 voto
+ other: "%{count} votos"
+ comment:
+ responses:
+ zero: Sin respuestas
+ one: 1 Respuesta
+ other: "%{count} Respuestas"
+ votes:
+ zero: Sin votos
+ one: 1 voto
+ other: "%{count} votos"
+ votes_weighted_score: "Total: %{score}"
form:
- error: error
- errors: errores
- not_saved: "impidieron guardar el debate:"
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!"
debate_text: Describe tu opinión
text_instructions: "Explica con todo el detalle que puedas y de una manera sencilla la idea y que crees que conseguiríamos con ella"
tags_label: Temas
- tags_instructions: Separados por comas
- accept_terms: Acepto la política de privacidad y el aviso legal
+ tags_instructions: >
+ Etiqueta esta idea. Puedes elegir entre nuestras propuestas o introducir las que desees.
+ Para ello solo tienes que escribir las etiquetas que desees separadas por "," y pulsar "intro".
+ Algunas recomendaciones:
show:
back_link: Volver
- comment: Comentario
- comments: Comentarios
+ comments_title: Comentarios
+ comments:
+ zero: Sin comentarios
+ one: 1 Comentario
+ other: "%{count} Comentarios"
leave_comment: Deja tu comentario
login_to_comment: Entra para participar
edit_debate_link: Editar
+ share: Compartir
edit:
editing: Editar debate
show_link: Ver debate
@@ -61,6 +88,9 @@ es:
agree: Estoy de acuerdo
disagree: No estoy de acuerdo
supports: Apoyos
+ unauthenticated: "Necesitas %{signin} o %{signup} para continuar."
+ signin: iniciar sesión
+ signup: registrarte
account:
show:
title: "Mi cuenta"
@@ -68,17 +98,25 @@ es:
change_credentials_link: "Cambiar mis credenciales"
email_on_debate_comment_label: "Recibir un email cuando alguien comenta en mis debates"
email_on_comment_reply_label: "Recibir un email cuando alguien contesta a mis comentarios"
+ avatar: "Avatar"
+ personal: "Datos personales"
first_name_label: "Nombre"
last_name_label: "Apellidos"
phone_number_label: "Teléfono"
+ organization_name_label: "Nombre de la organización"
use_nickname_label: "Usar pseudónimo"
nickname_label: "Pseudónimo"
- recaptcha:
- errors:
- verification_failed: "La verificación por captcha falló"
+ notifications: Notificaciones
+ simple_captcha:
+ placeholder: "Introduce el texto de la imagen"
+ label: "Introduce el texto en la caja"
+ refresh_button_text: "Refrescar"
+ message:
+ user: "el código secreto no coincide con la imagen"
+ debate: "el código secreto no coincide con la imagen"
shared:
tags_cloud:
- tags: Etiquetas
+ tags: Temas
mailer:
comment:
subject: Alguien ha comentado en tu debate
@@ -100,5 +138,3 @@ es:
all: "No tienes permiso para borrar %{subject}"
manage:
all: "No tienes permiso para realizar la acción '%{action}' sobre %{subject}."
-
-
diff --git a/config/locales/rails.en.yml b/config/locales/rails.en.yml
index d09a8dd0951..cb5bdc38ff6 100644
--- a/config/locales/rails.en.yml
+++ b/config/locales/rails.en.yml
@@ -20,7 +20,3 @@
# available at http://guides.rubyonrails.org/i18n.html.
en:
- recaptcha:
- errors:
- verification_failed: "Incorrect Captcha"
- recaptcha_unreachable: "Internet connecion error. Could not load Captcha"
diff --git a/config/locales/rails.es.yml b/config/locales/rails.es.yml
index a5666614d4a..f29361c451c 100644
--- a/config/locales/rails.es.yml
+++ b/config/locales/rails.es.yml
@@ -10,7 +10,7 @@ es:
- vie
- sáb
abbr_month_names:
- -
+ -
- ene
- feb
- mar
@@ -36,7 +36,7 @@ es:
long: "%d de %B de %Y"
short: "%d de %b"
month_names:
- -
+ -
- enero
- febrero
- marzo
@@ -195,8 +195,4 @@ es:
default: "%A, %d de %B de %Y %H:%M:%S %z"
long: "%d de %B de %Y %H:%M"
short: "%d de %b %H:%M"
- pm: pm
- recaptcha:
- errors:
- verification_failed: "El Captcha no es correcto"
- recaptcha_unreachable: "Fallo de conexión a Internet. No se ha podido cargar el Captcha"
\ No newline at end of file
+ pm: pm
\ No newline at end of file
diff --git a/config/locales/responders.en.yml b/config/locales/responders.en.yml
index 41c13a32690..68bf8581b1a 100644
--- a/config/locales/responders.en.yml
+++ b/config/locales/responders.en.yml
@@ -4,12 +4,11 @@ en:
create:
notice: '%{resource_name} was successfully created.'
# alert: '%{resource_name} could not be created.'
- # update:
- # notice: '%{resource_name} was successfully updated.'
+ update:
+ notice: '%{resource_name} was successfully updated.'
# alert: '%{resource_name} could not be updated.'
# destroy:
# notice: '%{resource_name} was successfully destroyed.'
# alert: '%{resource_name} could not be destroyed.'
save_changes:
notice: "Saved"
-
diff --git a/config/locales/responders.es.yml b/config/locales/responders.es.yml
index e11fbccbc19..6b64f572863 100644
--- a/config/locales/responders.es.yml
+++ b/config/locales/responders.es.yml
@@ -3,8 +3,8 @@ es:
actions:
create:
notice: "%{resource_name} creado correctamente."
- # update:
- # notice: "%{resource_name} actualizado correctamente."
+ update:
+ notice: "%{resource_name} actualizado correctamente."
# destroy:
# notice: "%{resource_name} borrado correctamente."
# alert: "%{resource_name} no ha podido ser borrado."
diff --git a/config/locales/social_share_button.en.yml b/config/locales/social_share_button.en.yml
new file mode 100644
index 00000000000..95dba5da939
--- /dev/null
+++ b/config/locales/social_share_button.en.yml
@@ -0,0 +1,19 @@
+en:
+ social_share_button:
+ share_to: Share to %{name}
+ weibo: Sina Weibo
+ twitter: Twitter
+ facebook: Facebook
+ douban: Douban
+ qq: Qzone
+ tqq: Tqq
+ delicious: Delicious
+ baidu: Baidu.com
+ kaixin001: Kaixin001.com
+ renren: Renren.com
+ google_plus: Google+
+ google_bookmark: Google Bookmark
+ tumblr: Tumblr
+ plurk: Plurk
+ pinterest: Pinterest
+ email: Email
diff --git a/config/locales/social_share_button.es.yml b/config/locales/social_share_button.es.yml
new file mode 100644
index 00000000000..e0520c19b2a
--- /dev/null
+++ b/config/locales/social_share_button.es.yml
@@ -0,0 +1,19 @@
+es:
+ social_share_button:
+ share_to: Compartir en %{name}
+ weibo: Sina Weibo
+ twitter: Twitter
+ facebook: Facebook
+ douban: Douban
+ qq: Qzone
+ tqq: Tqq
+ delicious: Delicious
+ baidu: Baidu.com
+ kaixin001: Kaixin001.com
+ renren: Renren.com
+ google_plus: Google+
+ google_bookmark: Google Bookmark
+ tumblr: Tumblr
+ plurk: Plurk
+ pinterest: Pinterest
+ email: Correo electrónico
diff --git a/config/routes.rb b/config/routes.rb
index ba2fc77c4a0..7ccbe2bb027 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -10,7 +10,7 @@
# See how all your routes lay out with "rake routes".
# You can have the root of your site routed with "root"
- root 'debates#index'
+ root 'welcome#index'
resources :debates do
member do
@@ -28,6 +28,8 @@
namespace :admin do
root to: "dashboard#index"
+
+ resources :tags, only: [:index, :create, :update, :destroy]
end
namespace :moderation do
diff --git a/config/secrets.yml.example b/config/secrets.yml.example
index 7fc62888769..f4ad9802733 100644
--- a/config/secrets.yml.example
+++ b/config/secrets.yml.example
@@ -11,8 +11,6 @@
# if you're sharing your code publicly.
default: &default
- recaptcha_public_key: <%= ENV["MADRID_RECAPTCHA_PUBLIC_KEY"] %>
- recaptcha_private_key: <%= ENV["MADRID_RECAPTCHA_PRIVATE_KEY"] %>
development:
secret_key_base: 56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4
diff --git a/db/migrate/20150808141306_create_simple_captcha_data.rb b/db/migrate/20150808141306_create_simple_captcha_data.rb
new file mode 100644
index 00000000000..4573b205640
--- /dev/null
+++ b/db/migrate/20150808141306_create_simple_captcha_data.rb
@@ -0,0 +1,15 @@
+class CreateSimpleCaptchaData < ActiveRecord::Migration
+ def self.up
+ create_table :simple_captcha_data do |t|
+ t.string :key, :limit => 40
+ t.string :value, :limit => 6
+ t.timestamps
+ end
+
+ add_index :simple_captcha_data, :key, :name => "idx_key"
+ end
+
+ def self.down
+ drop_table :simple_captcha_data
+ end
+end
diff --git a/db/migrate/20150811161459_add_children_count_to_comments.rb b/db/migrate/20150811161459_add_children_count_to_comments.rb
new file mode 100644
index 00000000000..ce233542d76
--- /dev/null
+++ b/db/migrate/20150811161459_add_children_count_to_comments.rb
@@ -0,0 +1,9 @@
+class AddChildrenCountToComments < ActiveRecord::Migration
+ def up
+ add_column :comments, :children_count, :integer, default: 0
+ end
+
+ def down
+ remove_column :comments, :children_count
+ end
+end
diff --git a/db/migrate/20150815154430_add_featured_to_tags.rb b/db/migrate/20150815154430_add_featured_to_tags.rb
new file mode 100644
index 00000000000..6ad4d565874
--- /dev/null
+++ b/db/migrate/20150815154430_add_featured_to_tags.rb
@@ -0,0 +1,5 @@
+class AddFeaturedToTags < ActiveRecord::Migration
+ def change
+ add_column :tags, :featured, :boolean, default: false
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2c4e7e639eb..e0ca3ab78ce 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: 20150813161654) do
+ActiveRecord::Schema.define(version: 20150815154430) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -88,6 +88,7 @@
create_table "tags", force: :cascade do |t|
t.string "name"
t.integer "taggings_count", default: 0
+ t.boolean "featured", default: false
end
add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree
diff --git a/doc/style-guide.html b/doc/style-guide.html
new file mode 100644
index 00000000000..a1a99d37417
--- /dev/null
+++ b/doc/style-guide.html
@@ -0,0 +1,455 @@
+
+
+
+
+ gobierno abierto | Guía de estilo web
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
new file mode 100644
index 00000000000..434499859f2
--- /dev/null
+++ b/app/views/welcome/index.html.erb
@@ -0,0 +1,5 @@
+
-
diff --git a/app/views/shared/_tags.html.erb b/app/views/shared/_tags.html.erb
index 8be6da57904..6a61bd4b482 100644
--- a/app/views/shared/_tags.html.erb
+++ b/app/views/shared/_tags.html.erb
@@ -1,3 +1,13 @@
+<%- limit ||= nil %>
+
<% if debate.tags.any? %>
-
-<% end %>
\ No newline at end of file
+
+<% end %>
diff --git a/app/views/simple_captcha/_simple_captcha.erb b/app/views/simple_captcha/_simple_captcha.erb
new file mode 100644
index 00000000000..f97b9b5a64c
--- /dev/null
+++ b/app/views/simple_captcha/_simple_captcha.erb
@@ -0,0 +1,8 @@
+
-
diff --git a/app/views/shared/_admin_login_items.html.erb b/app/views/shared/_admin_login_items.html.erb
new file mode 100644
index 00000000000..e268def4b6e
--- /dev/null
+++ b/app/views/shared/_admin_login_items.html.erb
@@ -0,0 +1,15 @@
+<%= t("devise_views.organizations.registrations.new.title") %>
+
+
+
+
+
+ <% end %>
+
+ <%= render "devise/shared/links" %>
<%= t("devise_views.organizations.registrations.new.title") %>
- <%= form_for(resource, as: :user, url: organization_registration_path) do |f| %> + <%= form_for(resource, as: :user, url: organization_registration_path) do |f| %> + <%= render 'shared/errors', resource: resource %> +
+
- <%= devise_error_messages! %>
+ <%= f.fields_for :organization do |fo| %>
+ <%= fo.text_field :name, autofocus: true, placeholder: t("devise_views.organizations.registrations.new.organization_name_label") %>
+ <% end %>
- <%= f.fields_for :organization do |fo| %>
-
+ <%= f.submit t("devise_views.organizations.registrations.new.submit"), class: "button radius expand" %>
+
-
- <% end %>
+ <%= f.email_field :email, placeholder: t("devise_views.organizations.registrations.new.email_label") %>
-
- <%= fo.label :organization_name, t("devise_views.organizations.registrations.new.organization_name_label") %>
- <%= fo.text_field :name, autofocus: true, placeholder: t("devise_views.organizations.registrations.new.organization_name_label") %>
-
-
-
+ <%= f.text_field :phone_number, placeholder: t("devise_views.organizations.registrations.new.phone_number_label") %>
-
- <%= f.label :email, t("devise_views.organizations.registrations.new.email_label") %>
- <%= f.email_field :email, placeholder: t("devise_views.organizations.registrations.new.email_label") %>
-
-
-
+ <%= f.password_field :password, autocomplete: "off",
+ placeholder: t("devise_views.organizations.registrations.new.password_label") %>
-
- <%= f.label :phone_number, t("devise_views.organizations.registrations.new.phone_number_label") %>
- <%= f.text_field :phone_number, placeholder: t("devise_views.organizations.registrations.new.phone_number_label") %>
-
-
-
+ <%= f.password_field :password_confirmation, autocomplete: "off",
+ label: t("devise_views.organizations.registrations.new.password_confirmation_label"),
+ placeholder: t("devise_views.organizations.registrations.new.password_confirmation_label") %>
-
- <%= f.label :password, t("devise_views.organizations.registrations.new.password_label"), class: "inline-block" %>
- <% if @minimum_password_length %>
- <%= t("devise_views.organizations.registrations.new.min_length", min: @minimum_password_length) %>
- <% end %>
- <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.organizations.registrations.new.password_label") %>
-
-
-
+ <%= f.simple_captcha input_html: {required: false} %>
- <%= render 'shared/captcha', resource: resource %>
-
-
- <%= f.label :password_confirmation, t("devise_views.organizations.registrations.new.password_confirmation_label") %>
- <%= f.password_field :password_confirmation, autocomplete: "off", placeholder: t("devise_views.organizations.registrations.new.password_confirmation_label") %>
-
-
-
- <% end %>
-
- <%= render "devise/shared/links" %>
-
- <%= f.submit t("devise_views.organizations.registrations.new.submit"), class: "button radius expand" %>
-
- -
+ <% if current_user %>
+ <% if current_user.administrator? %>
+
- + <%= link_to t("layouts.header.administration"), admin_root_path %> + + <% end %> + + <% if current_user.moderator? %> +
- + <%= link_to t("layouts.header.moderation"), moderation_root_path %> + + <% end %> + <% end %> +
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/shared/_tag_cloud.html.erb b/app/views/shared/_tag_cloud.html.erb
index c113a76bb92..9fb4ff37130 100644
--- a/app/views/shared/_tag_cloud.html.erb
+++ b/app/views/shared/_tag_cloud.html.erb
@@ -1,6 +1,8 @@
+ + <%= pluralize resource.errors.count, t("form.error"), t("form.errors") %> + <%= t("form.not_saved", resource: t("form.#{resource.class.to_s.downcase}")) %> + +
+
+
<% tag_cloud Debate.tag_counts, %w[s m l] do |tag, css_class| %> - <%= link_to sanitize("#{tag.name}(#{tag.taggings_count})"), debates_path(tag: tag.name), class: css_class %> + <%= link_to sanitize("#{tag.name} #{tag.taggings_count}"), debates_path(tag: tag.name), class: css_class %> <% end %> -
\ No newline at end of file
+<%= t("shared.tags_cloud.tags") %>
+<% tag_cloud Debate.tag_counts, %w[s m l] do |tag, css_class| %> - <%= link_to sanitize("#{tag.name}(#{tag.taggings_count})"), debates_path(tag: tag.name), class: css_class %> + <%= link_to sanitize("#{tag.name} #{tag.taggings_count}"), debates_path(tag: tag.name), class: css_class %> <% end %> -
+ <%= simple_captcha_options[:image] %>
+ <%= simple_captcha_options[:refresh_button] %>
+
+ <%= simple_captcha_options[:label] %>
+
+ <%= simple_captcha_options[:field] %>
+
diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb
index c41028fe6a7..c39c5f5f178 100644
--- a/app/views/users/registrations/new.html.erb
+++ b/app/views/users/registrations/new.html.erb
@@ -1,82 +1,36 @@
-
-
\ No newline at end of file
+
-
-
-
-
+<%= t("devise_views.users.registrations.new.title") %>
- - <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> - <%= devise_error_messages! %> - -
-
-
-
- <%= f.label :first_name, t("devise_views.users.registrations.new.first_name_label") %>
- <%= f.text_field :first_name, autofocus: true, placeholder: t("devise_views.users.registrations.new.first_name_label") %>
-
-
-
-
-
- <%= f.label :last_name, t("devise_views.users.registrations.new.last_name_label") %>
- <%= f.text_field :last_name, placeholder: t("devise_views.users.registrations.new.last_name_label") %>
-
-
-
-
-
- <%= f.check_box :use_nickname %>
- <%= t("devise_views.users.registrations.new.use_nickname_label") %>
-
-
-
-
-
- <%= f.label :nickname, t("devise_views.users.registrations.new.nickname_label") %>
- <%= f.text_field :nickname, placeholder: t("devise_views.users.registrations.new.nickname_label") %>
-
-
-
-
-
- <%= f.label :email, t("devise_views.users.registrations.new.email_label") %>
- <%= f.email_field :email, placeholder: t("devise_views.users.registrations.new.email_label") %>
-
-
-
-
-
- <%= f.label :phone_number, t("devise_views.users.registrations.new.phone_number_label") %>
- <%= f.text_field :phone_number, placeholder: t("devise_views.users.registrations.new.phone_number_label") %>
-
-
-
-
-
- <%= f.label :password, t("devise_views.users.registrations.new.password_label"), class: "inline-block" %>
- <% if @minimum_password_length %>
- <%= t("devise_views.users.registrations.new.min_length", min: @minimum_password_length) %>
- <% end %>
- <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.users.registrations.new.password_label") %>
-
-
-
-
- <%= render 'shared/captcha', resource: resource %>
-
-
- <%= f.label :password_confirmation, t("devise_views.users.registrations.new.password_confirmation_label") %>
- <%= f.password_field :password_confirmation, autocomplete: "off", placeholder: t("devise_views.users.registrations.new.password_confirmation_label") %>
-
-
-
- <% end %>
-
- <%= render "devise/shared/links" %>
-
- <%= f.submit t("devise_views.users.registrations.new.submit"), class: "button radius expand" %>
-
-
+
diff --git a/app/views/debates/_featured_debate.html.erb b/app/views/welcome/_featured_debate.html.erb
similarity index 79%
rename from app/views/debates/_featured_debate.html.erb
rename to app/views/welcome/_featured_debate.html.erb
index 602b3d603d5..a1992e3374f 100644
--- a/app/views/debates/_featured_debate.html.erb
+++ b/app/views/welcome/_featured_debate.html.erb
@@ -8,14 +8,13 @@
+
+
+ <%= t("devise_views.users.registrations.new.title") %>
+ <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> + <%= render 'shared/errors', resource: resource %> +
+
+ <% end %>
+
+ <%= render "devise/shared/links" %>
+ <%= f.text_field :first_name, autofocus: true,
+ placeholder: t("devise_views.users.registrations.new.first_name_label") %>
+ <%= f.text_field :last_name, placeholder: t("devise_views.users.registrations.new.last_name_label") %>
+ <%= f.email_field :email, placeholder: t("devise_views.users.registrations.new.email_label") %>
+ <%= f.text_field :nickname, placeholder: t("devise_views.users.registrations.new.nickname_label") %>
+
+ <%= f.check_box :use_nickname, label: t("devise_views.users.registrations.new.use_nickname_label") %>
+
+ <%= f.text_field :phone_number, placeholder: t("devise_views.users.registrations.new.phone_number_label") %>
+
+ <%= f.password_field :password, autocomplete: "off",
+ placeholder: t("devise_views.users.registrations.new.password_label") %>
+
+ <%= f.password_field :password_confirmation, autocomplete: "off",
+ label: t("devise_views.users.registrations.new.password_confirmation_label"),
+ placeholder: t("devise_views.users.registrations.new.password_confirmation_label") %>
+
+ <%= f.simple_captcha input_html: {required: false} %>
+
+ <%= f.submit t("devise_views.users.registrations.new.submit"), class: "button radius expand" %>
+
<%= link_to featured_debate.title, featured_debate %>
- <%= pluralize(featured_debate.comment_threads.count, - t("debates.show.comment"), t("debates.show.comments")) %> + <%= link_to t("debates.show.comments", count: featured_debate.comment_threads.count), debate_path(featured_debate, anchor: "comments") %>
<%= link_to featured_debate.description, featured_debate %>
- <%= render "shared/tags", debate: featured_debate %>
+ <%= render "shared/tags", debate: featured_debate, limit: 5 %>
@@ -26,4 +25,4 @@
+ <%= render partial: "featured_debate", collection: @featured_debates %>
+
+
+
+
+
\ No newline at end of file
diff --git a/lib/capistrano/substitute_strings.rb b/lib/capistrano/substitute_strings.rb
new file mode 100755
index 00000000000..d4b244323fe
--- /dev/null
+++ b/lib/capistrano/substitute_strings.rb
@@ -0,0 +1,12 @@
+# we often want to refer to variables which
+# are defined in subsequent stage files. This
+# let's us use the {{var}} to represent fetch(:var)
+# in strings which are only evaluated at runtime.
+
+def sub_strings(input_string)
+ output_string = input_string
+ input_string.scan(/{{(\w*)}}/).each do |var|
+ output_string.gsub!("{{#{var[0]}}}", fetch(var[0].to_sym))
+ end
+ output_string
+end
diff --git a/lib/capistrano/tasks/apache.cap b/lib/capistrano/tasks/apache.cap
new file mode 100755
index 00000000000..3dfbced57fa
--- /dev/null
+++ b/lib/capistrano/tasks/apache.cap
@@ -0,0 +1,30 @@
+namespace :apache do
+ %w(start stop restart reload).each do |task_name|
+ desc "#{task } Apache"
+ task task_name do
+ on roles(:app), in: :sequence, wait: 5 do
+ sudo "/etc/init.d/apache2 #{task_name}"
+ end
+ end
+ end
+
+ desc "Enable site virual host"
+ task "enable_virtual_host" do
+ on roles(:app) do
+ "cd /etc/apache2/sites-available/"
+ sudo "a2ensite #{fetch(:server_name)}"
+ end
+ end
+
+ desc "Remove default Apache Virtual Host"
+ task "remove_default_vhost" do
+ on roles(:app) do
+ if test("[ -f /etc/apache2/sites-enabled/000-default.conf ]")
+ sudo "rm /etc/apache2/sites-enabled/000-default.conf"
+ puts "removed default Apache Virtualhost"
+ else
+ puts "No default Apache Virtualhost to remove"
+ end
+ end
+ end
+end
diff --git a/lib/capistrano/tasks/check_revision.cap b/lib/capistrano/tasks/check_revision.cap
new file mode 100755
index 00000000000..12cf3390db8
--- /dev/null
+++ b/lib/capistrano/tasks/check_revision.cap
@@ -0,0 +1,14 @@
+namespace :deploy do
+ desc "checks whether the currently checkout out revision matches the
+ remote one we're trying to deploy from"
+ task :check_revision do
+ branch = fetch(:branch)
+ unless `git rev-parse HEAD` == `git rev-parse origin/#{branch}`
+ puts "WARNING: HEAD is not the same as origin/#{branch}"
+ puts "Run `git push` to sync changes or make sure you've"
+ puts "checked out the branch: #{branch} as you can only deploy"
+ puts "if you've got the target branch checked out"
+ exit
+ end
+ end
+end
diff --git a/lib/capistrano/tasks/compile_assets_locally.cap b/lib/capistrano/tasks/compile_assets_locally.cap
new file mode 100755
index 00000000000..5966ff1ead8
--- /dev/null
+++ b/lib/capistrano/tasks/compile_assets_locally.cap
@@ -0,0 +1,17 @@
+namespace :deploy do
+ desc "compiles assets locally then rsyncs"
+ task :compile_assets_locally do
+ run_locally do
+ execute "RAILS_ENV=#{fetch(:rails_env)} bundle exec rake assets:precompile"
+ end
+ on roles(:app) do |role|
+ run_locally do
+ execute"rsync -av ./public/assets/ #{role.user}@#{role.hostname}:#{release_path}/public/assets/;"
+ end
+ "chmod -R 755 #{release_path}/public/assets/"
+ end
+ run_locally do
+ execute "rm -rf ./public/assets"
+ end
+ end
+end
diff --git a/lib/capistrano/tasks/logs.cap b/lib/capistrano/tasks/logs.cap
new file mode 100755
index 00000000000..7bbfac2e45f
--- /dev/null
+++ b/lib/capistrano/tasks/logs.cap
@@ -0,0 +1,14 @@
+namespace :logs do
+ task :tail, :file do |t, args|
+ if args[:file]
+ on roles(:app) do
+ execute "tail -f #{shared_path}/log/#{args[:file]}.log"
+ end
+ else
+ puts "please specify a logfile e.g: 'rake logs:tail[logfile]"
+ puts "will tail 'shared_path/log/logfile.log'"
+ puts "remember if you use zsh you'll need to format it as:"
+ puts "rake 'logs:tail[logfile]' (single quotes)"
+ end
+ end
+end
diff --git a/lib/capistrano/tasks/restart.cap b/lib/capistrano/tasks/restart.cap
new file mode 100644
index 00000000000..ff8c028f030
--- /dev/null
+++ b/lib/capistrano/tasks/restart.cap
@@ -0,0 +1,10 @@
+namespace :deploy do
+ desc 'Commands for unicorn application'
+ %w(start stop force-stop restart upgrade reopen-logs).each do |command|
+ task command.to_sym do
+ on roles(:app), in: :sequence, wait: 5 do
+ sudo "/etc/init.d/unicorn_#{fetch(:full_app_name)} #{command}"
+ end
+ end
+ end
+end
diff --git a/lib/capistrano/tasks/run_tests.cap b/lib/capistrano/tasks/run_tests.cap
new file mode 100755
index 00000000000..32f26f9cee7
--- /dev/null
+++ b/lib/capistrano/tasks/run_tests.cap
@@ -0,0 +1,18 @@
+namespace :deploy do
+ desc "Runs test before deploying, can't deploy unless they pass"
+ task :run_tests do
+ test_log = "log/capistrano.test.log"
+ tests = fetch(:tests)
+ tests.each do |test|
+ puts "--> Running tests: '#{test}', please wait ..."
+ unless system "bundle exec rspec #{test} > #{test_log} 2>&1"
+ puts "--> Tests: '#{test}' failed. Results in: #{test_log} and below:"
+ system "cat #{test_log}"
+ exit;
+ end
+ puts "--> '#{test}' passed"
+ end
+ puts "--> All tests passed"
+ system "rm #{test_log}"
+ end
+end
diff --git a/lib/capistrano/tasks/setup_config.cap b/lib/capistrano/tasks/setup_config.cap
new file mode 100755
index 00000000000..27ba96a1251
--- /dev/null
+++ b/lib/capistrano/tasks/setup_config.cap
@@ -0,0 +1,27 @@
+namespace :deploy do
+ task :setup_config do
+ on roles(:app) do
+ # make the config dir
+ execute :mkdir, "-p #{shared_path}/config"
+ full_app_name = fetch(:full_app_name)
+
+ # config files to be uploaded to shared/config, see the
+ # definition of smart_template for details of operation.
+ # Essentially looks for #{filename}.erb in deploy/#{full_app_name}/
+ # and if it isn't there, falls back to deploy/#{shared}. Generally
+ # everything should be in deploy/shared with params which differ
+ # set in the stage files
+ config_files = fetch(:config_files)
+ config_files.each do |file|
+ smart_template file
+ end
+
+ # symlink stuff which should be... symlinked
+ symlinks = fetch(:symlinks)
+
+ symlinks.each do |symlink|
+ sudo "ln -nfs #{shared_path}/config/#{symlink[:source]} #{sub_strings(symlink[:link])}"
+ end
+ end
+ end
+end
diff --git a/lib/capistrano/template.rb b/lib/capistrano/template.rb
new file mode 100755
index 00000000000..07bd0be37e2
--- /dev/null
+++ b/lib/capistrano/template.rb
@@ -0,0 +1,32 @@
+# will first try and copy the file:
+# config/deploy/#{full_app_name}/#{from}.erb
+# to:
+# shared/config/to
+# if the original source path doesn exist then it will
+# search in:
+# config/deploy/shared/#{from}.erb
+# this allows files which are common to all enviros to
+# come from a single source while allowing specific
+# ones to be over-ridden
+# if the target file name is the same as the source then
+# the second parameter can be left out
+def smart_template(from, to=nil)
+ to ||= from
+ full_to_path = "#{shared_path}/config/#{to}"
+ if from_erb_path = template_file(from)
+ from_erb = StringIO.new(ERB.new(File.read(from_erb_path)).result(binding))
+ upload! from_erb, full_to_path
+ info "copying: #{from_erb} to: #{full_to_path}"
+ else
+ error "error #{from} not found"
+ end
+end
+
+def template_file(name)
+ if File.exist?((file = "config/deploy/#{fetch(:full_app_name)}/#{name}.erb"))
+ return file
+ elsif File.exist?((file = "config/deploy/shared/#{name}.erb"))
+ return file
+ end
+ return nil
+end
diff --git a/spec/factories.rb b/spec/factories.rb
index 6e7c2541314..6bf82bbaaa4 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -9,28 +9,24 @@
end
factory :debate do
- sequence(:title) {|n| "Debate #{n} title"}
- description 'Debate description'
- terms_of_service '1'
+ sequence(:title) { |n| "Debate #{n} title" }
+ description 'Debate description'
+ terms_of_service '1'
association :author, factory: :user
end
factory :vote do
association :votable, factory: :debate
- association :voter, factory: :user
+ association :voter, factory: :user
vote_flag true
end
factory :comment do
- commentable
+ association :commentable, factory: :debate
user
body 'Comment body'
end
- factory :commentable do
- debate
- end
-
factory :administrator do
user
end
@@ -52,4 +48,16 @@
rejected_at { Time.now}
end
+ factory :tag, class: 'ActsAsTaggableOn::Tag' do
+ sequence(:name) { |n| "Tag #{n} name" }
+
+ trait :featured do
+ featured true
+ end
+
+ trait :unfeatured do
+ featured false
+ end
+ end
+
end
diff --git a/spec/features/account_spec.rb b/spec/features/account_spec.rb
index 59ee23f5b58..1294d59d200 100644
--- a/spec/features/account_spec.rb
+++ b/spec/features/account_spec.rb
@@ -3,35 +3,23 @@
feature 'Account' do
background do
- @user = create(:user, first_name: "Manuela", last_name:"Colau")
+ @user = create(:user, first_name: "Manuela", last_name: "Colau")
+ login_as(@user)
end
scenario 'Show' do
- login_as(@user)
visit root_path
+
click_link "My account"
+
expect(current_path).to eq(account_path)
expect(page).to have_selector("input[value='Manuela']")
expect(page).to have_selector("input[value='Colau']")
- end
-
- scenario "Failed Edit" do
- login_as(@user)
- visit account_path
-
- fill_in 'account_first_name', with: ''
- fill_in 'account_last_name', with: ''
- fill_in 'account_nickname', with: ''
- click_button 'Save changes'
-
- expect(page).to have_content "2 errors prohibited this debate from being saved"
- expect(page).to have_content "First name can't be blank"
- expect(page).to have_content "First name can't be blank"
+ expect(page).to have_selector(avatar('Manuela Colau'), count: 1)
end
scenario 'Edit' do
- login_as(@user)
visit account_path
fill_in 'account_first_name', with: 'Larry'
@@ -49,4 +37,22 @@
expect(page).to have_selector("input[id='account_email_on_debate_comment'][value='1']")
expect(page).to have_selector("input[id='account_email_on_comment_reply'][value='1']")
end
+
+ scenario "Errors on edit" do
+ visit account_path
+
+ fill_in 'account_first_name', with: ''
+ click_button 'Save changes'
+
+ expect(page).to have_content error_message
+ end
+
+ scenario 'Errors editing credentials' do
+ visit account_path
+
+ click_link 'Change my credentials'
+ click_button 'Update'
+
+ expect(page).to have_content error_message
+ end
end
diff --git a/spec/features/admin_spec.rb b/spec/features/admin_spec.rb
index a4728623b39..6c19b03f7c6 100644
--- a/spec/features/admin_spec.rb
+++ b/spec/features/admin_spec.rb
@@ -2,6 +2,14 @@
feature 'Admin' do
let(:user) { create(:user) }
+ let(:administrator) do
+ create(:administrator, user: user)
+ user
+ end
+ let(:moderator) do
+ create(:moderator, user: user)
+ user
+ end
scenario 'Access as regular user is not authorized' do
login_as(user)
@@ -12,9 +20,7 @@
end
scenario 'Access as a moderator is not authorized' do
- create(:moderator, user: user)
-
- login_as(user)
+ login_as(moderator)
visit admin_root_path
expect(current_path).to eq(root_path)
@@ -22,13 +28,92 @@
end
scenario 'Access as an administrator is authorized' do
- create(:administrator, user: user)
-
- login_as(user)
+ login_as(administrator)
visit admin_root_path
expect(current_path).to eq(admin_root_path)
expect(page).to_not have_content "not authorized"
end
+ scenario "Admin access links" do
+ login_as(administrator)
+ visit root_path
+
+ expect(page).to have_link('Administration')
+ expect(page).to_not have_link('Moderator')
+ end
+
+ scenario "Moderation access links" do
+ login_as(moderator)
+ visit root_path
+
+ expect(page).to have_link('Moderation')
+ expect(page).to_not have_link('Administration')
+ end
+
+ scenario 'Admin dashboard' do
+ login_as(administrator)
+ visit root_path
+
+ click_link 'Administration'
+
+ expect(current_path).to eq(admin_root_path)
+ expect(page).to have_css('#admin_menu')
+ expect(page).to_not have_css('#moderation_menu')
+ end
+
+ scenario 'Moderation dashboard' do
+ login_as(moderator)
+ visit root_path
+
+ click_link 'Moderation'
+
+ expect(current_path).to eq(moderation_root_path)
+ expect(page).to have_css('#moderation_menu')
+ expect(page).to_not have_css('#admin_menu')
+ end
+
+ context 'Tags' do
+ let(:unfeatured_tag) { create :tag, :unfeatured, name: 'Mi barrio' }
+
+ background do
+ login_as(administrator)
+ end
+
+ scenario 'adding a new tag' do
+ visit admin_tags_path
+
+ fill_in 'tag_name', with: 'Papeleras'
+
+ click_on 'Create Tag'
+
+ expect(page).to have_content 'Papeleras'
+ end
+
+ scenario 'deleting tag' do
+ unfeatured_tag
+
+ visit admin_tags_path
+
+ expect(page).to have_content 'Mi barrio'
+
+ click_link 'Delete Tag'
+
+ expect(page).not_to have_content 'Mi barrio'
+ end
+
+ scenario 'marking tags as featured / unfeatured' do
+ expect(unfeatured_tag).not_to be_featured
+
+ visit admin_tags_path
+
+ expect(page).to have_content 'Mi barrio'
+
+ check "tag_featured_#{unfeatured_tag.id}"
+ click_button 'Update Tag'
+
+ expect(page).to have_checked_field("tag_featured_#{unfeatured_tag.id}")
+ end
+ end
+
end
diff --git a/spec/features/comments_spec.rb b/spec/features/comments_spec.rb
index 1ec6a8c107b..27a7ac1cd8d 100644
--- a/spec/features/comments_spec.rb
+++ b/spec/features/comments_spec.rb
@@ -26,7 +26,7 @@
visit debate_path(debate)
expect(page).to have_content 'Log in to participate'
- within ('#comments') do
+ within('#comments') do
expect(page).to_not have_content 'Write a comment'
expect(page).to_not have_content 'Reply'
expect(page).to_not have_css('form')
@@ -49,6 +49,18 @@
end
end
+ scenario 'Errors on create', :js do
+ user = create(:user)
+ debate = create(:debate)
+
+ login_as(user)
+ visit debate_path(debate)
+
+ click_button 'Publish comment'
+
+ expect(page).to have_content "Can't be blank"
+ end
+
scenario 'Reply', :js do
citizen = create(:user, first_name: 'Ana')
manuela = create(:user, first_name: 'Manuela')
@@ -59,14 +71,34 @@
visit debate_path(debate)
click_link "Reply"
+
within "#js-comment-form-comment_#{comment.id}" do
fill_in 'comment_body', with: 'It will be done next week.'
click_button 'Publish reply'
end
- within "#comment-#{comment.id}" do
+ within("#comment-#{comment.id}") do
expect(page).to have_content 'It will be done next week.'
end
+
+ expect(page).to_not have_selector("#js-comment-form-comment_#{comment.id}", visible: true)
+ end
+
+ scenario 'Errors on reply', :js do
+ user = create(:user)
+ debate = create(:debate)
+ comment = create(:comment, commentable: debate, user: user)
+
+ login_as(user)
+ visit debate_path(debate)
+
+ click_link "Reply"
+
+ within "#js-comment-form-comment_#{comment.id}" do
+ click_button 'Publish reply'
+ expect(page).to have_content "Can't be blank"
+ end
+
end
scenario "N replies", :js do
@@ -74,13 +106,13 @@
parent = create(:comment, commentable: debate)
7.times do
- create(:comment, commentable: debate).
- move_to_child_of(parent)
- parent = parent.children.first
+ create(:comment, commentable: debate).
+ move_to_child_of(parent)
+ parent = parent.children.first
end
visit debate_path(debate)
expect(page).to have_css(".comment.comment.comment.comment.comment.comment.comment.comment")
end
-end
\ No newline at end of file
+end
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index 894b09b193c..36751e9d46a 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -4,18 +4,9 @@
scenario 'Index' do
debates = [create(:debate), create(:debate), create(:debate)]
- featured_debates = [create(:debate), create(:debate), create(:debate)]
visit debates_path
- expect(page).to have_selector('#featured-debates .debate-featured', count: 3)
- featured_debates.each do |debate|
- within('#featured-debates') do
- expect(page).to have_content debate.title
- expect(page).to have_css("a[href='#{debate_path(debate)}']", text: debate.description)
- end
- end
-
expect(page).to have_selector('#debates .debate', count: 3)
debates.each do |debate|
within('#debates') do
@@ -33,7 +24,12 @@
expect(page).to have_content debate.title
expect(page).to have_content "Debate description"
expect(page).to have_content debate.author.name
- expect(page).to have_content I18n.l(Date.today)
+ expect(page).to have_content I18n.l(debate.created_at.to_date)
+ expect(page).to have_selector(avatar(debate.author.name))
+
+ within('.social-share-button') do
+ expect(page.all('a').count).to be(3) # Twitter, Facebook, Google+
+ end
end
scenario 'Create' do
@@ -43,6 +39,7 @@
visit new_debate_path
fill_in 'debate_title', with: 'Acabar con los desahucios'
fill_in 'debate_description', with: 'Esto es un tema muy importante porque...'
+ fill_in 'debate_captcha', with: correct_captcha_text
check 'debate_terms_of_service'
click_button 'Create Debate'
@@ -51,7 +48,57 @@
expect(page).to have_content 'Acabar con los desahucios'
expect(page).to have_content 'Esto es un tema muy importante porque...'
expect(page).to have_content author.name
- expect(page).to have_content I18n.l(Date.today)
+ expect(page).to have_content I18n.l(Debate.last.created_at.to_date)
+ end
+
+ scenario 'Captcha is required for debate creation' do
+ login_as(create(:user))
+
+ visit new_debate_path
+ fill_in 'debate_title', with: "Great title"
+ fill_in 'debate_description', with: 'Very important issue...'
+ fill_in 'debate_captcha', with: "wrongText!"
+ check 'debate_terms_of_service'
+
+ click_button "Create Debate"
+
+ expect(page).to_not have_content "Debate was successfully created."
+ expect(page).to have_content "1 error"
+
+ fill_in 'debate_captcha', with: correct_captcha_text
+ click_button "Create Debate"
+
+ expect(page).to have_content "Debate was successfully created."
+ end
+
+ scenario 'Failed creation goes back to new showing featured tags' do
+ featured_tag = create(:tag, :featured)
+ tag = create(:tag)
+ login_as(create(:user))
+
+ visit new_debate_path
+ fill_in 'debate_title', with: ""
+ fill_in 'debate_description', with: 'Very important issue...'
+ fill_in 'debate_captcha', with: correct_captcha_text
+ check 'debate_terms_of_service'
+
+ click_button "Create Debate"
+
+ expect(page).to_not have_content "Debate was successfully created."
+ expect(page).to have_content "1 error"
+ within(".tags") do
+ expect(page).to have_content featured_tag.name
+ expect(page).to_not have_content tag.name
+ end
+ end
+
+ scenario 'Errors on create' do
+ author = create(:user)
+ login_as(author)
+
+ visit new_debate_path
+ click_button 'Create Debate'
+ expect(page).to have_content error_message
end
scenario 'JS injection is prevented but safe html is respected' do
@@ -61,6 +108,7 @@
visit new_debate_path
fill_in 'debate_title', with: 'A test'
fill_in 'debate_description', with: 'gobierno abierto Guía de estilo web
+ + + +
+
+ Button success +
+ Button secondary +
+ Button alert +
+ Button success +
+ Button secondary +
+ Button alert +
+ Button success +
+ Button secondary +
+ Button alert +
+
+
+
+
+1. Introducción
+¡Hola! hemos creado algunas directrices de cómo usar el diseño en los diferentes elementos.
+IMPORTANTE
Esta guía de estilo no es definitiva ya que irá creciendo junto al proyecto, por lo que algunos elementos pueden tener modificaciones en el futuro.
En este proyecto para el maquetar el front utilizamos como base el framework Foundation. Puedes leer toda su documentación pero te recomendamos que leas con atención los siguientes enlaces, ya que resumen muy bien el funcionamiento del framework:
+-
+
- Grid +
- Utility classes +
- Kitchen shink +
Para desarrollar el CSS utilizamos SASS. Si clonas el repositorio verás la siguiente estructura en las hojas de estilo:
+ +-
+
application.sccshace un @import del resto de SCSS para compilarlos en un solo fichero.
+ debates.sccstodos los estilos relacionados con la sección de debates.
+ fonts.sccsdesde aquí se important todas las fuentes.
+ foundation_and_overrides.sccsfichero SCSS de Foundation con todas sus variables por defecto.
+ icons.sccsfuente de iconos personalizada para el proyecto, creada en Fontastic.me.
+ variables.sccslista de variables para utilizar en el resto de SCSS.
+
2. Tipografía
+La fuente que utilizamos para el texto es Open Sans y utlizamos Lato para el logotipo: gobierno abierto
+ +Heading 1
+h1 {font-size: 32px;}
+
+ Heading 2
+h2 {font-size: 24px;}
+
+ Heading 3
+h3 {font-size: 18px;}
+
+ Heading 4
+h4 {font-size: 16px;}
+
+ Heading 5
+h5 {font-size: 14px;}
+
+ Heading 6
+h6 {font-size: 13px;}
+
+ Ejemplo de texto
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo.
+ +p {font-size: 13px; line-height: 24px;}
+
+ 3. Enlaces
+Los enlaces sobre fondo blanco utilizan el color #2895F1; y al hacer hover cambian al color #2178BF; Ejemplo: Esto es un enlace
Los enlaces sobre fondo oscuro utilizan el color #FFFFF;/white y al hacer hover cambian al color #2178BF; Ejemplo: Esto es un enlace
4. Botones
+ +Utilizamos los botones con bordes redondeados por defecto en Foundation, en varios tamaños.
+ +Botones expandidos
+ Button default +class="button radius expand">
+ + Button success +
class="button radius success expand"
+ + Button secondary +
class="button radius secondary expand">
+ + Button alert +
class="button radius alert expand"
+
+ Botones normales
+ Button default +class="button radius">
+ + Button success +
class="button radius success"
+ + Button secondary +
class="button radius secondary">
+ + Button alert +
class="button radius alert"
+
+ Botones pequeños
+ Button default +class="button radius small">
+ + Button success +
class="button radius small success"
+ + Button secondary +
class="button radius small secondary">
+ + Button alert +
class="button radius small alert"
+
+ 5. Formularios
+ +
+
+
+
+
+
+ form { background: #F8F8F8; height: 48px; margin-bottom: 16px; }
+ 6. Colores
+
+
+
+ +
+
+
+
+
+
+ body
#E9E9E9 +
+
+ #E9E9E9 +
+ background
#EDEFF0 +
+
+ #EDEFF0 +
+ border
#DEE0E3 +
+
+ #DEE0E3 +
+ brand
#0077B9 +
+ #0077B9 +
+
+ text
#222222 +
+
+ #222222 +
+ text-medium
#999999 +
+
+ #999999 +
+ text-light
#CCCCCC +
+ #CCCCCC +
+ +
+ link
#2895F1 +
+
+ #2895F1 +
+ link-hover
#2178BF +
+ #2178BF +
+
+ debates
#008CCF +
+
+ #008CCF +
+ votes-bg
#26AEEE +
+
+ #26AEEE +
+ votes-border
#1F94CB +
+ #1F94CB +
+
+ votes-like
#7BD2A8 +
+
+ #7BD2A8 +
+ votes-like-act
#5D9E7F +
+
+ #5D9E7F +
+ votes-unlike
#EF8585 +
+
+ #EF8585 +
+ votes-unlike-act
#BD6A6A +
+ #BD6A6A +
+
+ check
#46DB91 +
+ #46DB91 +
7. Alertas
+ +Lorem ipsum dolor sit amet, consectetur adipisicing elit.
+ class="alert-bx radius success"
+ +
Lorem ipsum dolor sit amet, consectetur adipisicing elit.
+ class="alert-bx radius info"
+ +
Lorem ipsum dolor sit amet, consectetur adipisicing elit.
+ class="alert-bx radius alert"
+ +
Lorem ipsum dolor sit amet, consectetur adipisicing elit.
+ class="alert-bx radius warning"
+ +
Lorem ipsum dolor sit amet, consectetur adipisicing elit.
+ class="alert-bx radius secondary"
+
+ This is
' + fill_in 'debate_captcha', with: correct_captcha_text check 'debate_terms_of_service' click_button 'Create Debate' @@ -72,25 +120,55 @@ expect(page.html).to_not include '<p>This is' end - scenario 'tagging using dangerous strings' do + context 'Tagging debates' do + let(:author) { create(:user) } - author = create(:user) - login_as(author) + background do + login_as(author) + end - visit new_debate_path + scenario 'using featured tags', :js do + ['Medio Ambiente', 'Ciencia'].each do |tag_name| + create(:tag, :featured, name: tag_name) + end - fill_in 'debate_title', with: 'A test' - fill_in 'debate_description', with: 'A test' - fill_in 'debate_tag_list', with: 'user_id=1, &a=3, ' - check 'debate_terms_of_service' + visit new_debate_path - click_button 'Create Debate' + fill_in 'debate_title', with: 'A test' + fill_in_ckeditor 'debate_description', with: 'A test' + fill_in 'debate_captcha', with: correct_captcha_text + check 'debate_terms_of_service' - expect(page).to have_content 'Debate was successfully created.' - expect(page).to have_content 'user_id1' - expect(page).to have_content 'a3' - expect(page).to have_content 'scriptalert("hey");script' - expect(page.html).to_not include 'user_id=1, &a=3, ' + ['Medio Ambiente', 'Ciencia'].each do |tag_name| + find('.js-add-tag-link', text: tag_name).click + end + + click_button 'Create Debate' + + expect(page).to have_content 'Debate was successfully created.' + ['Medio Ambiente', 'Ciencia'].each do |tag_name| + expect(page).to have_content tag_name + end + end + + scenario 'using dangerous strings' do + visit new_debate_path + + fill_in 'debate_title', with: 'A test' + fill_in 'debate_description', with: 'A test' + fill_in 'debate_captcha', with: correct_captcha_text + check 'debate_terms_of_service' + + fill_in 'debate_tag_list', with: 'user_id=1, &a=3, ' + + click_button 'Create Debate' + + expect(page).to have_content 'Debate was successfully created.' + expect(page).to have_content 'user_id1' + expect(page).to have_content 'a3' + expect(page).to have_content 'scriptalert("hey");script' + expect(page.html).to_not include 'user_id=1, &a=3, ' + end end scenario 'Update should not be posible if logged user is not the author' do @@ -105,12 +183,12 @@ scenario 'Update should not be posible if debate is not editable' do debate = create(:debate) - vote = create(:vote, votable: debate) + create(:vote, votable: debate) expect(debate).to_not be_editable login_as(debate.author) visit edit_debate_path(debate) - edit_debate_path(debate) + expect(current_path).to eq(root_path) expect(page).to have_content 'not authorized' end @@ -124,6 +202,7 @@ fill_in 'debate_title', with: "End child poverty" fill_in 'debate_description', with: "Let's..." + fill_in 'debate_captcha', with: correct_captcha_text click_button "Update Debate" @@ -132,4 +211,90 @@ expect(page).to have_content "Let's..." end + scenario 'Errors on update' do + debate = create(:debate) + login_as(debate.author) + + visit edit_debate_path(debate) + fill_in 'debate_title', with: "" + click_button 'Update Debate' + + expect(page).to have_content error_message + end + + scenario 'Captcha is required to update a debate' do + debate = create(:debate) + login_as(debate.author) + + visit edit_debate_path(debate) + expect(current_path).to eq(edit_debate_path(debate)) + + fill_in 'debate_title', with: "New title" + fill_in 'debate_captcha', with: "wrong!" + click_button "Update Debate" + + expect(page).to_not have_content "Debate was successfully updated." + expect(page).to have_content "1 error" + + fill_in 'debate_captcha', with: correct_captcha_text + click_button "Update Debate" + + expect(page).to have_content "Debate was successfully updated." + end + + scenario 'Failed update goes back to edit showing featured tags' do + debate = create(:debate) + featured_tag = create(:tag, :featured) + tag = create(:tag) + login_as(debate.author) + + visit edit_debate_path(debate) + expect(current_path).to eq(edit_debate_path(debate)) + + fill_in 'debate_title', with: "" + fill_in 'debate_captcha', with: correct_captcha_text + click_button "Update Debate" + + expect(page).to_not have_content "Debate was successfully updated." + expect(page).to have_content "1 error" + within(".tags") do + expect(page).to have_content featured_tag.name + expect(page).to_not have_content tag.name + end + end + + describe 'Limiting tags shown' do + tags = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa", "Huelgas"] + let(:all_tags) { tags } + let(:debate) { create :debate, tag_list: all_tags } + + scenario 'Index page shows up to 5 tags per debate' do + debate + visible_tags = ["Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa", "Huelgas"] + + visit debates_path + + within('.debate .tags') do + visible_tags.each do |tag| + expect(page).to have_content tag + end + expect(page).to have_content '2+' + end + end + + scenario 'Index page shows 3 tags with no plus link' do + tag_list = ["Medio Ambiente", "Corrupción", "Fiestas populares"] + create :debate, tag_list: tag_list + + visit debates_path + + within('.debate .tags') do + tag_list.each do |tag| + expect(page).to have_content tag + end + expect(page).not_to have_content '+' + end + end + end + end diff --git a/spec/features/home_spec.rb b/spec/features/home_spec.rb index 2efa307cc12..fcad1ca249d 100644 --- a/spec/features/home_spec.rb +++ b/spec/features/home_spec.rb @@ -2,4 +2,19 @@ feature "Home" do + scenario 'featured debates' do + featured_debates = [create(:debate), create(:debate), create(:debate)] + + visit root_path + + expect(page).to have_selector('#featured-debates .debate-featured', count: 3) + featured_debates.each do |debate| + within('#featured-debates') do + expect(page).to have_content debate.title + expect(page).to have_css("a[href='#{debate_path(debate)}']", text: debate.description) + end + end + + end + end diff --git a/spec/features/organizations_spec.rb b/spec/features/organizations_spec.rb index d0144ecb536..a79264d656a 100644 --- a/spec/features/organizations_spec.rb +++ b/spec/features/organizations_spec.rb @@ -21,15 +21,6 @@ expect(user.organization).to_not be_verified end - scenario "Organization fields are validated" do - visit new_organization_registration_path - click_button 'Sign up' - - expect(page).to have_content "Email can't be blank" - expect(page).to have_content "Password can't be blank" - expect(page).to have_content "Organization name can't be blank" - end - scenario 'Shared links' do visit new_user_registration_path expect(page).to have_link "Sign up as an organization" diff --git a/spec/features/tags_spec.rb b/spec/features/tags_spec.rb index 8ea48eabc92..a15902dc7a9 100644 --- a/spec/features/tags_spec.rb +++ b/spec/features/tags_spec.rb @@ -51,11 +51,9 @@ visit debates_path - within "#tag-cloud" do - expect(page).to have_css(".s", text: "Medio Ambiente(1)") - expect(page).to have_css(".m", text: "Corrupción(5)") - expect(page).to have_css(".l", text: "Economía(10)") - end + within(:css, "#tag-cloud .s") { expect(page).to have_content('Medio Ambiente 1') } + within(:css, "#tag-cloud .m") { expect(page).to have_content('Corrupción 5') } + within(:css, "#tag-cloud .l") { expect(page).to have_content('Economía 10') } end scenario 'Create' do @@ -65,6 +63,7 @@ visit new_debate_path fill_in 'debate_title', with: 'Title' fill_in 'debate_description', with: 'Description' + fill_in 'debate_captcha', with: correct_captcha_text check 'debate_terms_of_service' fill_in 'debate_tag_list', with: "Impuestos, Economía, Hacienda" @@ -86,6 +85,7 @@ expect(page).to have_selector("input[value='Economía']") fill_in 'debate_tag_list', with: "Economía, Hacienda" + fill_in 'debate_captcha', with: correct_captcha_text click_button 'Update Debate' expect(page).to have_content 'Debate was successfully updated.' @@ -102,6 +102,7 @@ visit edit_debate_path(debate) fill_in 'debate_tag_list', with: "" + fill_in 'debate_captcha', with: correct_captcha_text click_button 'Update Debate' expect(page).to have_content 'Debate was successfully updated.' diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb index c15869bae6a..2b79848334a 100644 --- a/spec/features/users_spec.rb +++ b/spec/features/users_spec.rb @@ -11,6 +11,7 @@ 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' @@ -22,8 +23,16 @@ 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 - user = create(:user, email: 'manuela@madrid.es', password: 'judgementday') + create(:user, email: 'manuela@madrid.es', password: 'judgementday') visit '/' click_link 'Log in' diff --git a/spec/features/votes_spec.rb b/spec/features/votes_spec.rb index ecb8a8b8fe8..548c7e30895 100644 --- a/spec/features/votes_spec.rb +++ b/spec/features/votes_spec.rb @@ -13,57 +13,106 @@ visit debate_path(@debate) end - scenario "Index show user votes on debates" do + scenario "Home shows user votes on featured debates" do debate1 = create(:debate) debate2 = create(:debate) debate3 = create(:debate) - vote = create(:vote, voter: @manuela, votable: debate1, vote_flag: true) - vote = create(:vote, voter: @manuela, votable: debate3, vote_flag: false) + create(:vote, voter: @manuela, votable: debate1, vote_flag: true) + create(:vote, voter: @manuela, votable: debate3, vote_flag: false) - visit debates_path + visit root_path - within("#debate_#{debate1.id}_votes") do - within(".in-favor") do - expect(page).to have_css("a.voted") - expect(page).to_not have_css("a.no-voted") + within("#featured-debates") do + within("#debate_#{debate1.id}_votes") do + within(".in-favor") do + expect(page).to have_css("a.voted") + expect(page).to_not have_css("a.no-voted") + end + + within(".against") do + expect(page).to have_css("a.no-voted") + expect(page).to_not have_css("a.voted") + end end - within(".against") do - expect(page).to have_css("a.no-voted") - expect(page).to_not have_css("a.voted") - end - end + within("#debate_#{debate2.id}_votes") do + within(".in-favor") do + expect(page).to_not have_css("a.voted") + expect(page).to_not have_css("a.no-voted") + end - within("#debate_#{debate2.id}_votes") do - within(".in-favor") do - expect(page).to_not have_css("a.voted") - expect(page).to_not have_css("a.no-voted") + within(".against") do + expect(page).to_not have_css("a.no-voted") + expect(page).to_not have_css("a.voted") + end end - within(".against") do - expect(page).to_not have_css("a.no-voted") - expect(page).to_not have_css("a.voted") + within("#debate_#{debate3.id}_votes") do + within(".in-favor") do + expect(page).to have_css("a.no-voted") + expect(page).to_not have_css("a.voted") + end + + within(".against") do + expect(page).to have_css("a.voted") + expect(page).to_not have_css("a.no-voted") + end end end + end - within("#debate_#{debate3.id}_votes") do - within(".in-favor") do - expect(page).to have_css("a.no-voted") - expect(page).to_not have_css("a.voted") + scenario "Index shows user votes on debates" do + debate1 = create(:debate) + debate2 = create(:debate) + debate3 = create(:debate) + create(:vote, voter: @manuela, votable: debate1, vote_flag: true) + create(:vote, voter: @manuela, votable: debate3, vote_flag: false) + + visit debates_path + + within("#debates") do + within("#debate_#{debate1.id}_votes") do + within(".in-favor") do + expect(page).to have_css("a.voted") + expect(page).to_not have_css("a.no-voted") + end + + within(".against") do + expect(page).to have_css("a.no-voted") + expect(page).to_not have_css("a.voted") + end end - within(".against") do - expect(page).to have_css("a.voted") - expect(page).to_not have_css("a.no-voted") + within("#debate_#{debate2.id}_votes") do + within(".in-favor") do + expect(page).to_not have_css("a.voted") + expect(page).to_not have_css("a.no-voted") + end + + within(".against") do + expect(page).to_not have_css("a.no-voted") + expect(page).to_not have_css("a.voted") + end end - end + within("#debate_#{debate3.id}_votes") do + within(".in-favor") do + expect(page).to have_css("a.no-voted") + expect(page).to_not have_css("a.voted") + end + + within(".against") do + expect(page).to have_css("a.voted") + expect(page).to_not have_css("a.no-voted") + end + end + end end scenario 'Show no votes' do visit debate_path(@debate) - expect(page).to have_content "0 votes" + expect(page).to have_content "No votes" within('.in-favor') do expect(page).to have_content "0%" @@ -71,7 +120,7 @@ expect(page).to_not have_css("a.no-voted") end - within('.against') do + within('.against') do expect(page).to have_content "0%" expect(page).to_not have_css("a.voted") expect(page).to_not have_css("a.no-voted") @@ -79,8 +128,8 @@ end scenario 'Show' do - vote = create(:vote, voter: @manuela, votable: @debate, vote_flag: true) - vote = create(:vote, voter: @pablo, votable: @debate, vote_flag: false) + create(:vote, voter: @manuela, votable: @debate, vote_flag: true) + create(:vote, voter: @pablo, votable: @debate, vote_flag: false) visit debate_path(@debate) @@ -91,7 +140,7 @@ expect(page).to have_css("a.voted") end - within('.against') do + within('.against') do expect(page).to have_content "50%" expect(page).to have_css("a.no-voted") end @@ -105,7 +154,7 @@ expect(page).to have_css("a.voted") end - within('.against') do + within('.against') do expect(page).to have_content "0%" expect(page).to have_css("a.no-voted") end @@ -114,7 +163,7 @@ end scenario 'Create from debate featured', :js do - visit debates_path + visit root_path within("#featured-debates") do find('.in-favor a').click @@ -124,22 +173,20 @@ expect(page).to have_css("a.voted") end - within('.against') do + within('.against') do expect(page).to have_content "0%" expect(page).to have_css("a.no-voted") end expect(page).to have_content "1 vote" end - expect(URI.parse(current_url).path).to eq(debates_path) + expect(URI.parse(current_url).path).to eq(root_path) end scenario 'Create from debate index', :js do - 3.times { create(:debate) } visit debates_path within("#debates") do - expect(page).to have_css(".debate", count: 1) find('.in-favor a').click @@ -148,7 +195,7 @@ expect(page).to have_css("a.voted") end - within('.against') do + within('.against') do expect(page).to have_content "0%" expect(page).to have_css("a.no-voted") end @@ -167,7 +214,7 @@ expect(page).to have_css("a.no-voted") end - within('.against') do + within('.against') do expect(page).to have_content "100%" expect(page).to have_css("a.voted") end @@ -183,18 +230,15 @@ expect(page).to have_content "100%" end - within('.against') do + within('.against') do expect(page).to have_content "0%" end expect(page).to have_content "1 vote" end - end - feature 'Comments' do - background do @manuela = create(:user) @pablo = create(:user) @@ -206,19 +250,21 @@ end scenario 'Show' do - vote = create(:vote, voter: @manuela, votable: @comment, vote_flag: true) - vote = create(:vote, voter: @pablo, votable: @comment, vote_flag: false) + create(:vote, voter: @manuela, votable: @comment, vote_flag: true) + create(:vote, voter: @pablo, votable: @comment, vote_flag: false) visit debate_path(@debate) within("#comment_#{@comment.id}_votes") do - within(".in_favor") do + within(".in_favor") do expect(page).to have_content "1" end - within(".against") do + within(".against") do expect(page).to have_content "1" end + + expect(page).to have_content "2 votes" end end @@ -230,9 +276,11 @@ expect(page).to have_content "1" end - within(".against") do + within(".against") do expect(page).to have_content "0" end + + expect(page).to have_content "1 vote" end end @@ -245,9 +293,11 @@ expect(page).to have_content "0" end - within('.against') do + within('.against') do expect(page).to have_content "1" end + + expect(page).to have_content "1 vote" end end @@ -260,11 +310,13 @@ expect(page).to have_content "1" end - within('.against') do + within('.against') do expect(page).to have_content "0" end + + expect(page).to have_content "1 vote" end end end -end \ No newline at end of file +end diff --git a/spec/helpers/recaptcha_helper_spec.rb b/spec/helpers/recaptcha_helper_spec.rb deleted file mode 100644 index 7d44e2f08ab..00000000000 --- a/spec/helpers/recaptcha_helper_spec.rb +++ /dev/null @@ -1,36 +0,0 @@ -require 'rails_helper' - -describe RecaptchaHelper do - - describe '#recaptchable?' do - - it 'should be true if new record' do - debate = build(:debate) - expect(helper.recaptchable?(debate)).to be true - end - - it 'should be false if existing record' do - debate = create(:debate) - expect(helper.recaptchable?(debate)).to be false - end - - end - - describe "#recaptcha_keys?" do - - it "should be true if Recaptcha keys are configured" do - allow(Recaptcha.configuration).to receive(:public_key).and_return("akjasf") - allow(Recaptcha.configuration).to receive(:private_key).and_return("akjasf4532") - - expect(helper.recaptcha_keys?).to be true - end - - it "should be false if Recaptcha keys are not configured" do - allow(Recaptcha.configuration).to receive(:public_key).and_return(nil) - allow(Recaptcha.configuration).to receive(:private_key).and_return(nil) - - expect(helper.recaptcha_keys?).to be false - end - - end -end diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb new file mode 100644 index 00000000000..5af7afc1c18 --- /dev/null +++ b/spec/models/comment_spec.rb @@ -0,0 +1,41 @@ +require 'rails_helper' + +describe Comment do + + let(:comment) { build(:comment) } + + it "should be valid" do + expect(comment).to be_valid + end + + describe "#children_count" do + let(:comment) { create(:comment) } + let(:debate) { comment.debate } + + it "should count first level children" do + parent = comment + + 3.times do + create(:comment, commentable: debate). + move_to_child_of(parent) + parent = parent.children.first + end + + expect(comment.children_count).to eq(1) + expect(debate.comment_threads.count).to eq(4) + end + + it "should increase children count" do + expect do + create(:comment, commentable: debate). + move_to_child_of(comment) + end.to change { comment.children_count }.from(0).to(1) + end + + it "should decrease children count" do + new_comment = create(:comment, commentable: debate).move_to_child_of(comment) + + expect { new_comment.destroy }.to change { comment.children_count }.from(1).to(0) + end + end +end diff --git a/spec/models/debate_spec.rb b/spec/models/debate_spec.rb index 00f6217bdde..5e1ed76c8e2 100644 --- a/spec/models/debate_spec.rb +++ b/spec/models/debate_spec.rb @@ -1,88 +1,104 @@ require 'rails_helper' describe Debate do - - before(:each) do - @debate = build(:debate) - end + let(:debate) { build(:debate) } it "should be valid" do - expect(@debate).to be_valid + expect(debate).to be_valid end it "should not be valid without an author" do - @debate.author = nil - expect(@debate).to_not be_valid + debate.author = nil + expect(debate).to_not be_valid end it "should not be valid without a title" do - @debate.title = nil - expect(@debate).to_not be_valid + debate.title = nil + expect(debate).to_not be_valid end describe "#description" do it "should be mandatory" do - @debate.description = nil - expect(@debate).to_not be_valid + debate.description = nil + expect(debate).to_not be_valid end it "should be sanitized" do - @debate.description = "" - @debate.valid? - expect(@debate.description).to eq("alert('danger');") + debate.description = "" + debate.valid? + expect(debate.description).to eq("alert('danger');") end it "should be html_safe" do - @debate.description = "" - expect(@debate.description).to be_html_safe + debate.description = "" + expect(debate.description).to be_html_safe end end it "should sanitize the tag list" do - @debate.tag_list = "user_id=1" - @debate.valid? - expect(@debate.tag_list).to eq(['user_id1']) + debate.tag_list = "user_id=1" + debate.valid? + expect(debate.tag_list).to eq(['user_id1']) end it "should not be valid without accepting terms of service" do - @debate.terms_of_service = nil - expect(@debate).to_not be_valid + debate.terms_of_service = nil + expect(debate).to_not be_valid end describe "#editable?" do - before(:each) do - @debate = create(:debate) - end + let(:debate) { create(:debate) } it "should be true if debate has no votes yet" do - expect(@debate.total_votes).to eq(0) - expect(@debate.editable?).to be true + expect(debate.total_votes).to eq(0) + expect(debate.editable?).to be true end it "should be false if debate has votes" do - create(:vote, votable: @debate) - expect(@debate.total_votes).to eq(1) - expect(@debate.editable?).to be false + create(:vote, votable: debate) + expect(debate.total_votes).to eq(1) + expect(debate.editable?).to be false end end describe "#editable_by?" do - before(:each) do - @debate = create(:debate) - end + let(:debate) { create(:debate) } it "should be true if user is the author and debate is editable" do - expect(@debate.editable_by?(@debate.author)).to be true + expect(debate.editable_by?(debate.author)).to be true end it "should be false if debate is not editable" do - create(:vote, votable: @debate) - expect(@debate.editable_by?(@debate.author)).to be false + create(:vote, votable: debate) + expect(debate.editable_by?(debate.author)).to be false end it "should be false if user is not the author" do - expect(@debate.editable_by?(create(:user))).to be false + expect(debate.editable_by?(create(:user))).to be false + end + end + + describe "#search" do + let!(:economy) { create(:debate, tag_list: "Economy") } + let!(:health) { create(:debate, tag_list: "Health") } + + it "returns debates tagged with params tag" do + params = {tag: "Economy"} + expect(Debate.search(params)).to match_array([economy]) + end + + it "returns all debates if no parameters" do + params = {} + expect(Debate.search(params)).to match_array([economy, health]) + end + end + + describe '#default_order' do + let!(:economy) { create(:debate) } + let!(:health) { create(:debate) } + it "returns debates ordered by last one first" do + expect(Debate.all).to eq([health, economy]) end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 7d79898c075..7f1cd3460ec 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -2,25 +2,21 @@ describe User do - describe "#votes_on_debates" do - before(:each) do - @user = create(:user) - end + describe "#debate_votes" do + let(:user) { create(:user) } it "returns {} if no debate" do - expect(@user.votes_on_debates()).to eq({}) - expect(@user.votes_on_debates([])).to eq({}) - expect(@user.votes_on_debates([nil, nil])).to eq({}) + expect(user.debate_votes([])).to eq({}) end it "returns a hash of debates ids and votes" do debate1 = create(:debate) debate2 = create(:debate) debate3 = create(:debate) - create(:vote, voter: @user, votable: debate1, vote_flag: true) - create(:vote, voter: @user, votable: debate3, vote_flag: false) + create(:vote, voter: user, votable: debate1, vote_flag: true) + create(:vote, voter: user, votable: debate3, vote_flag: false) - voted = @user.votes_on_debates([debate1.id, debate2.id, debate3.id]) + voted = user.debate_votes([debate1, debate2, debate3]) expect(voted[debate1.id]).to eq(true) expect(voted[debate2.id]).to eq(nil) diff --git a/spec/models/vote_spec.rb b/spec/models/vote_spec.rb new file mode 100644 index 00000000000..41fcf847166 --- /dev/null +++ b/spec/models/vote_spec.rb @@ -0,0 +1,46 @@ +require 'rails_helper' + +describe 'Vote' do + + describe '#for_debates' do + it 'returns votes for debates' do + debate = create(:debate) + create(:vote, votable: debate) + + expect(Vote.for_debates.count).to eq(1) + end + + it 'does not returns votes for other votables' do + comment = create(:comment) + create(:vote, votable: comment) + + expect(Vote.for_debates.count).to eq(0) + end + end + + describe '#in' do + it 'returns debates send in parameters' do + debate = create(:debate) + create(:vote, votable: debate) + + expect(Vote.in(debate).count).to eq(1) + end + + it 'does not return debates not in parameters' do + debate = create(:debate) + create(:vote, votable: debate) + + expect(Vote.in([]).count).to eq(0) + end + end + + describe '#value' do + it 'returns vote flag' do + vote = create(:vote, vote_flag: true) + expect(vote.value).to eq(true) + + vote = create(:vote, vote_flag: false) + expect(vote.value).to eq(false) + end + end +end \ No newline at end of file diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 640f9e96c82..5558c63d452 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,7 +1,7 @@ require 'factory_girl_rails' require 'database_cleaner' require "email_spec" -Dir["./spec/support/**/*.rb"].sort.each { |f| require f} +Dir["./spec/support/**/*.rb"].sort.each { |f| require f } RSpec.configure do |config| config.use_transactional_fixtures = false @@ -17,7 +17,7 @@ end config.before(:each) do |example| - DatabaseCleaner.strategy= example.metadata[:js] ? :truncation : :transaction + DatabaseCleaner.strategy = example.metadata[:js] ? :truncation : :transaction DatabaseCleaner.start end diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb index d07f6026116..32252aa1a42 100644 --- a/spec/support/common_actions.rb +++ b/spec/support/common_actions.rb @@ -9,6 +9,7 @@ def sign_up 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' end @@ -51,4 +52,30 @@ def reply_to(user) expect(page).to have_content 'It will be done next week.' end -end \ No newline at end of file + def correct_captcha_text + SimpleCaptcha::SimpleCaptchaData.last.value + end + + def avatar(name) + "img.initialjs-avatar[data-name='#{name}']" + end + + # Used to fill ckeditor fields + # @param [String] locator label text for the textarea or textarea id + def fill_in_ckeditor(locator, params = {}) + # Find out ckeditor id at runtime using its label + locator = find('label', text: locator)[:for] if page.has_css?('label', text: locator) + # Fill the editor content + page.execute_script <<-SCRIPT + var ckeditor = CKEDITOR.instances.#{locator} + ckeditor.setData('#{params[:with]}') + ckeditor.focus() + ckeditor.updateElement() + SCRIPT + end + + def error_message + /\d errors? prohibited this (.*) from being saved:/ + end + +end
<%= comment.body %>
+<%= comment.body %>
- - <%= render 'comments/votes', comment: comment %> - + + <%= render 'comments/votes', comment: comment %> + - <% if user_signed_in? %> -<%= render 'comments/form', {parent: comment, toggeable: true} %>
- <% end %> -+ <%= t("debates.comment.responses", count: comment.children_count) %> + <% if user_signed_in? %> + | + <%= render 'comments/form', {parent: comment, toggeable: true} %> + <% end %> +
+