Merge branch 'main' into user-pages-show-articles-and-comments

Author: paulmckissock

app/controllers/articles_controller.rb

@@ -6,7 +6,7 @@ def index
 
   def show
     @article = Article.find(params[:id])
-    @comments = @article.comments.order(created_at: :desc).limit(20)
+    @comments = @article.comments.order(created_at: :desc)
     @comment = Comment.new
   end
 

app/controllers/comments_controller.rb

@@ -1,5 +1,5 @@
 class CommentsController < ApplicationController
-  before_action :authorized, only: [:create]
+  before_action :authorized
 
   def create
     @article = Article.find(params[:article_id])
@@ -9,6 +9,7 @@ def create
     if @comment.save
       redirect_to @article
     else
+      @comments = @article.comments.order(created_at: :desc)
       render "articles/show", status: :unprocessable_entity
     end
   end

config/routes.rb

@@ -1,10 +1,8 @@
 Rails.application.routes.draw do
   root "articles#index"
   resources :articles do
-    resources :comments, only: [:create, :index]
+    resources :comments, only: [:create]
   end
-  resources :users
-  resources :articles
   resources :users, only: [:create, :show]
   get "/signup", to: "users#new"
   get "/login", to: "sessions#new"

db/seeds.rb

@@ -10,6 +10,7 @@
 # Clear existing records
 User.destroy_all
 Article.destroy_all
+Comment.destroy_all
 
 # Create users
 users = [
@@ -37,3 +38,14 @@
     user: users.sample
   )
 end
+
+articles = Article.all
+
+# Create comments
+90.times do |i|
+  Comment.create!(
+    text: "Sample Comment #{i + 1}",
+    article: articles.sample,
+    user: users.sample
+  )
+end

test/controllers/comments_controller_test.rb

@@ -0,0 +1,35 @@
+require "test_helper"
+
+class CommentsControllerTest < ActionDispatch::IntegrationTest
+  def setup
+    @user = create(:user)
+    @article = create(:article, user: @user)
+    @comment_params = {text: "This is a test comment"}
+  end
+  test "should not create comment when not logged in" do
+    assert_no_difference "Comment.count" do
+      post article_comments_path(@article), params: {comment: @comment_params}
+    end
+    assert_redirected_to login_path
+  end
+
+  describe "when logged in" do
+    before do
+      @user = create(:user) # There are errors if I don't add this line. didn't need this in articles_controller_test
+      log_in_as(@user)
+    end
+
+    it "should create comment when logged in" do
+      assert_difference("Comment.count", 1) do
+        post article_comments_path(@article), params: {comment: @comment_params}
+      end
+      assert_redirected_to @article
+    end
+    it "should not create comment with invalid params" do
+      assert_no_difference "Comment.count" do
+        post article_comments_path(@article), params: {comment: {text: ""}}
+      end
+      assert_response :unprocessable_entity
+    end
+  end
+end

test/models/comment_test.rb

@@ -0,0 +1,28 @@
+require "test_helper"
+
+class CommentTest < ActiveSupport::TestCase
+  def setup
+    @user = create(:user)
+    @article = create(:article, user: @user)
+    @comment = Comment.new(text: "This is a test comment", article: @article, user: @user)
+  end
+
+  test "should be valid" do
+    assert @comment.valid?
+  end
+
+  test "text should be present" do
+    @comment.text = " "
+    assert_not @comment.valid?
+  end
+
+  test "should belong to an article" do
+    @comment.article = nil
+    assert_not @comment.valid?
+  end
+
+  test "should belong to a user" do
+    @comment.user = nil
+    assert_not @comment.valid?
+  end
+end