uses new hash syntax by default
This commit is contained in:
@@ -1,10 +1,10 @@
|
|||||||
class Comment < ActiveRecord::Base
|
class Comment < ActiveRecord::Base
|
||||||
acts_as_nested_set :scope => [:commentable_id, :commentable_type]
|
acts_as_nested_set scope: [:commentable_id, :commentable_type]
|
||||||
|
|
||||||
validates :body, :presence => true
|
validates :body, presence: true
|
||||||
validates :user, :presence => true
|
validates :user, presence: true
|
||||||
|
|
||||||
belongs_to :commentable, :polymorphic => true
|
belongs_to :commentable, polymorphic: true
|
||||||
belongs_to :user
|
belongs_to :user
|
||||||
|
|
||||||
def self.build(commentable, user, body)
|
def self.build(commentable, user, body)
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
<% if user_signed_in? %>
|
<% if user_signed_in? %>
|
||||||
<li>
|
<li>
|
||||||
<%= link_to('Logout', destroy_user_session_path, :method => :delete) %>
|
<%= link_to('Logout', destroy_user_session_path, method: :delete) %>
|
||||||
</li>
|
</li>
|
||||||
<% else %>
|
<% else %>
|
||||||
<li>
|
<li>
|
||||||
<%= link_to('Login', new_user_session_path) %>
|
<%= link_to('Login', new_user_session_path) %>
|
||||||
</li>
|
</li>
|
||||||
<% end %>
|
<% end %>
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
Rails.application.routes.draw do
|
Rails.application.routes.draw do
|
||||||
devise_for :users, :controllers => { registrations: 'registrations' }
|
devise_for :users, controllers: { registrations: 'registrations' }
|
||||||
|
|
||||||
# The priority is based upon order of creation: first created -> highest priority.
|
# The priority is based upon order of creation: first created -> highest priority.
|
||||||
# See how all your routes lay out with "rake routes".
|
# See how all your routes lay out with "rake routes".
|
||||||
|
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ class ActsAsVotableMigration < ActiveRecord::Migration
|
|||||||
def self.up
|
def self.up
|
||||||
create_table :votes do |t|
|
create_table :votes do |t|
|
||||||
|
|
||||||
t.references :votable, :polymorphic => true
|
t.references :votable, polymorphic: true
|
||||||
t.references :voter, :polymorphic => true
|
t.references :voter, polymorphic: true
|
||||||
|
|
||||||
t.boolean :vote_flag
|
t.boolean :vote_flag
|
||||||
t.string :vote_scope
|
t.string :vote_scope
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
class ActsAsCommentableWithThreadingMigration < ActiveRecord::Migration
|
class ActsAsCommentableWithThreadingMigration < ActiveRecord::Migration
|
||||||
def self.up
|
def self.up
|
||||||
create_table :comments, :force => true do |t|
|
create_table :comments, force: true do |t|
|
||||||
t.integer :commentable_id
|
t.integer :commentable_id
|
||||||
t.string :commentable_type
|
t.string :commentable_type
|
||||||
t.string :title
|
t.string :title
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ feature 'Comments' do
|
|||||||
visit debate_path(debate)
|
visit debate_path(debate)
|
||||||
|
|
||||||
expect(page).to have_css('.comment', count: 3)
|
expect(page).to have_css('.comment', count: 3)
|
||||||
|
|
||||||
comment = Comment.first
|
comment = Comment.first
|
||||||
within first('.comment') do
|
within first('.comment') do
|
||||||
expect(page).to have_content comment.user.name
|
expect(page).to have_content comment.user.name
|
||||||
@@ -22,7 +22,7 @@ feature 'Comments' do
|
|||||||
scenario 'Create' do
|
scenario 'Create' do
|
||||||
user = create(:user)
|
user = create(:user)
|
||||||
debate = create(:debate)
|
debate = create(:debate)
|
||||||
|
|
||||||
login_as(user)
|
login_as(user)
|
||||||
visit debate_path(debate)
|
visit debate_path(debate)
|
||||||
|
|
||||||
@@ -30,7 +30,7 @@ feature 'Comments' do
|
|||||||
click_button 'Publicar comentario'
|
click_button 'Publicar comentario'
|
||||||
|
|
||||||
expect(page).to have_content 'Comentario guardado'
|
expect(page).to have_content 'Comentario guardado'
|
||||||
|
|
||||||
within "#comments" do
|
within "#comments" do
|
||||||
expect(page).to have_content '¿Has pensado en esto...?'
|
expect(page).to have_content '¿Has pensado en esto...?'
|
||||||
end
|
end
|
||||||
@@ -41,9 +41,9 @@ feature 'Comments' do
|
|||||||
manuela = create(:user, first_name: 'Manuela')
|
manuela = create(:user, first_name: 'Manuela')
|
||||||
debate = create(:debate)
|
debate = create(:debate)
|
||||||
comment = create(:comment, commentable: debate, user: citizen)
|
comment = create(:comment, commentable: debate, user: citizen)
|
||||||
|
|
||||||
visit debate_path(debate)
|
|
||||||
login_as(manuela)
|
login_as(manuela)
|
||||||
|
visit debate_path(debate)
|
||||||
|
|
||||||
within "#comment-#{comment.id}" do
|
within "#comment-#{comment.id}" do
|
||||||
fill_in 'comment_body', with: 'La semana que viene está hecho.'
|
fill_in 'comment_body', with: 'La semana que viene está hecho.'
|
||||||
@@ -60,7 +60,7 @@ feature 'Comments' do
|
|||||||
debate = create(:debate)
|
debate = create(:debate)
|
||||||
parent = create(:comment, commentable: debate)
|
parent = create(:comment, commentable: debate)
|
||||||
|
|
||||||
7.times do
|
7.times do
|
||||||
create(:comment, commentable: debate).
|
create(:comment, commentable: debate).
|
||||||
move_to_child_of(parent)
|
move_to_child_of(parent)
|
||||||
parent = parent.children.first
|
parent = parent.children.first
|
||||||
@@ -69,5 +69,5 @@ feature 'Comments' do
|
|||||||
visit debate_path(debate)
|
visit debate_path(debate)
|
||||||
expect(page).to have_css(".comment.comment.comment.comment.comment.comment.comment.comment")
|
expect(page).to have_css(".comment.comment.comment.comment.comment.comment.comment.comment")
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
Reference in New Issue
Block a user