fixes spacing
This commit is contained in:
@@ -16,6 +16,7 @@ class AccountController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def set_account
|
def set_account
|
||||||
@account = current_user
|
@account = current_user
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ class CommentsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def comment_params
|
def comment_params
|
||||||
params.require(:comments).permit(:commentable_type, :commentable_id, :body)
|
params.require(:comments).permit(:commentable_type, :commentable_id, :body)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ class DebatesController < ApplicationController
|
|||||||
|
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def debate_params
|
def debate_params
|
||||||
params.require(:debate).permit(:title, :description, :tag_list, :terms_of_service, :captcha, :captcha_key)
|
params.require(:debate).permit(:title, :description, :tag_list, :terms_of_service, :captcha, :captcha_key)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ class Debate < ActiveRecord::Base
|
|||||||
default_scope { order('created_at DESC') }
|
default_scope { order('created_at DESC') }
|
||||||
|
|
||||||
apply_simple_captcha
|
apply_simple_captcha
|
||||||
TITLE_LENGTH = Debate.columns.find{|c| c.name == 'title'}.limit
|
TITLE_LENGTH = Debate.columns.find { |c| c.name == 'title' }.limit
|
||||||
|
|
||||||
acts_as_votable
|
acts_as_votable
|
||||||
acts_as_commentable
|
acts_as_commentable
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ class User < ActiveRecord::Base
|
|||||||
|
|
||||||
def debate_votes(debates)
|
def debate_votes(debates)
|
||||||
voted = votes.for_debates.in(debates)
|
voted = votes.for_debates.in(debates)
|
||||||
voted.each_with_object({}) { |v,_| _[v.votable_id] = v.value }
|
voted.each_with_object({}) { |v, _| _[v.votable_id] = v.value }
|
||||||
end
|
end
|
||||||
|
|
||||||
def administrator?
|
def administrator?
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ FactoryGirl.define do
|
|||||||
end
|
end
|
||||||
|
|
||||||
factory :debate do
|
factory :debate do
|
||||||
sequence(:title) {|n| "Debate #{n} title"}
|
sequence(:title) { |n| "Debate #{n} title" }
|
||||||
description 'Debate description'
|
description 'Debate description'
|
||||||
terms_of_service '1'
|
terms_of_service '1'
|
||||||
association :author, factory: :user
|
association :author, factory: :user
|
||||||
@@ -36,7 +36,7 @@ FactoryGirl.define do
|
|||||||
end
|
end
|
||||||
|
|
||||||
factory :tag, class: 'ActsAsTaggableOn::Tag' do
|
factory :tag, class: 'ActsAsTaggableOn::Tag' do
|
||||||
sequence(:name) {|n| "Tag #{n} name"}
|
sequence(:name) { |n| "Tag #{n} name" }
|
||||||
|
|
||||||
trait :featured do
|
trait :featured do
|
||||||
featured true
|
featured true
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ require 'rails_helper'
|
|||||||
feature 'Account' do
|
feature 'Account' do
|
||||||
|
|
||||||
background do
|
background do
|
||||||
@user = create(:user, first_name: "Manuela", last_name:"Colau")
|
@user = create(:user, first_name: "Manuela", last_name: "Colau")
|
||||||
login_as(@user)
|
login_as(@user)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ feature 'Comments' do
|
|||||||
visit debate_path(debate)
|
visit debate_path(debate)
|
||||||
|
|
||||||
expect(page).to have_content 'Log in to participate'
|
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 'Write a comment'
|
||||||
expect(page).to_not have_content 'Reply'
|
expect(page).to_not have_content 'Reply'
|
||||||
expect(page).to_not have_css('form')
|
expect(page).to_not have_css('form')
|
||||||
@@ -77,7 +77,7 @@ feature 'Comments' do
|
|||||||
click_button 'Publish reply'
|
click_button 'Publish reply'
|
||||||
end
|
end
|
||||||
|
|
||||||
within "#comment-#{comment.id}" do
|
within("#comment-#{comment.id}") do
|
||||||
expect(page).to have_content 'It will be done next week.'
|
expect(page).to have_content 'It will be done next week.'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ feature 'Debates' do
|
|||||||
|
|
||||||
visit new_debate_path
|
visit new_debate_path
|
||||||
click_button 'Create Debate'
|
click_button 'Create Debate'
|
||||||
expect(page).to have_content /error/
|
expect(page).to have_content error_message
|
||||||
end
|
end
|
||||||
|
|
||||||
scenario 'JS injection is prevented but safe html is respected' do
|
scenario 'JS injection is prevented but safe html is respected' do
|
||||||
@@ -183,7 +183,7 @@ feature 'Debates' do
|
|||||||
|
|
||||||
scenario 'Update should not be posible if debate is not editable' do
|
scenario 'Update should not be posible if debate is not editable' do
|
||||||
debate = create(:debate)
|
debate = create(:debate)
|
||||||
vote = create(:vote, votable: debate)
|
create(:vote, votable: debate)
|
||||||
expect(debate).to_not be_editable
|
expect(debate).to_not be_editable
|
||||||
login_as(debate.author)
|
login_as(debate.author)
|
||||||
|
|
||||||
@@ -264,12 +264,9 @@ feature 'Debates' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
describe 'Limiting tags shown' do
|
describe 'Limiting tags shown' do
|
||||||
let(:all_tags) {
|
tags = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa", "Huelgas"]
|
||||||
["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa", "Huelgas"]
|
let(:all_tags) { tags }
|
||||||
}
|
let(:debate) { create :debate, tag_list: all_tags }
|
||||||
let(:debate) {
|
|
||||||
create :debate, tag_list: all_tags
|
|
||||||
}
|
|
||||||
|
|
||||||
scenario 'Index page shows up to 5 tags per debate' do
|
scenario 'Index page shows up to 5 tags per debate' do
|
||||||
debate
|
debate
|
||||||
@@ -287,7 +284,7 @@ feature 'Debates' do
|
|||||||
|
|
||||||
scenario 'Index page shows 3 tags with no plus link' do
|
scenario 'Index page shows 3 tags with no plus link' do
|
||||||
tag_list = ["Medio Ambiente", "Corrupción", "Fiestas populares"]
|
tag_list = ["Medio Ambiente", "Corrupción", "Fiestas populares"]
|
||||||
debate = create :debate, tag_list: tag_list
|
create :debate, tag_list: tag_list
|
||||||
|
|
||||||
visit debates_path
|
visit debates_path
|
||||||
|
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ feature 'Users' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
scenario 'Sign in' do
|
scenario 'Sign in' do
|
||||||
user = create(:user, email: 'manuela@madrid.es', password: 'judgementday')
|
create(:user, email: 'manuela@madrid.es', password: 'judgementday')
|
||||||
|
|
||||||
visit '/'
|
visit '/'
|
||||||
click_link 'Log in'
|
click_link 'Log in'
|
||||||
|
|||||||
@@ -17,8 +17,8 @@ feature 'Votes' do
|
|||||||
debate1 = create(:debate)
|
debate1 = create(:debate)
|
||||||
debate2 = create(:debate)
|
debate2 = create(:debate)
|
||||||
debate3 = create(:debate)
|
debate3 = create(:debate)
|
||||||
vote = create(:vote, voter: @manuela, votable: debate1, vote_flag: true)
|
create(:vote, voter: @manuela, votable: debate1, vote_flag: true)
|
||||||
vote = create(:vote, voter: @manuela, votable: debate3, vote_flag: false)
|
create(:vote, voter: @manuela, votable: debate3, vote_flag: false)
|
||||||
|
|
||||||
visit root_path
|
visit root_path
|
||||||
|
|
||||||
@@ -65,8 +65,8 @@ feature 'Votes' do
|
|||||||
debate1 = create(:debate)
|
debate1 = create(:debate)
|
||||||
debate2 = create(:debate)
|
debate2 = create(:debate)
|
||||||
debate3 = create(:debate)
|
debate3 = create(:debate)
|
||||||
vote = create(:vote, voter: @manuela, votable: debate1, vote_flag: true)
|
create(:vote, voter: @manuela, votable: debate1, vote_flag: true)
|
||||||
vote = create(:vote, voter: @manuela, votable: debate3, vote_flag: false)
|
create(:vote, voter: @manuela, votable: debate3, vote_flag: false)
|
||||||
|
|
||||||
visit debates_path
|
visit debates_path
|
||||||
|
|
||||||
@@ -128,8 +128,8 @@ feature 'Votes' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
scenario 'Show' do
|
scenario 'Show' do
|
||||||
vote = create(:vote, voter: @manuela, votable: @debate, vote_flag: true)
|
create(:vote, voter: @manuela, votable: @debate, vote_flag: true)
|
||||||
vote = create(:vote, voter: @pablo, votable: @debate, vote_flag: false)
|
create(:vote, voter: @pablo, votable: @debate, vote_flag: false)
|
||||||
|
|
||||||
visit debate_path(@debate)
|
visit debate_path(@debate)
|
||||||
|
|
||||||
@@ -250,8 +250,8 @@ feature 'Votes' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
scenario 'Show' do
|
scenario 'Show' do
|
||||||
vote = create(:vote, voter: @manuela, votable: @comment, vote_flag: true)
|
create(:vote, voter: @manuela, votable: @comment, vote_flag: true)
|
||||||
vote = create(:vote, voter: @pablo, votable: @comment, vote_flag: false)
|
create(:vote, voter: @pablo, votable: @comment, vote_flag: false)
|
||||||
|
|
||||||
visit debate_path(@debate)
|
visit debate_path(@debate)
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
require 'factory_girl_rails'
|
require 'factory_girl_rails'
|
||||||
require 'database_cleaner'
|
require 'database_cleaner'
|
||||||
require "email_spec"
|
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|
|
RSpec.configure do |config|
|
||||||
config.use_transactional_fixtures = false
|
config.use_transactional_fixtures = false
|
||||||
@@ -17,7 +17,7 @@ RSpec.configure do |config|
|
|||||||
end
|
end
|
||||||
|
|
||||||
config.before(:each) do |example|
|
config.before(:each) do |example|
|
||||||
DatabaseCleaner.strategy= example.metadata[:js] ? :truncation : :transaction
|
DatabaseCleaner.strategy = example.metadata[:js] ? :truncation : :transaction
|
||||||
DatabaseCleaner.start
|
DatabaseCleaner.start
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user