fix: tests, remove home controller

AlexStavrianos · AlexStavrianos · commit b56b89ffe9bc · 2025-06-01T17:30:00.000+03:00
diff --git a/app/controllers/concerns/authentication.rb b/app/controllers/concerns/authentication.rb
@@ -35,7 +35,7 @@ def request_authentication
     end
 
     def after_authentication_url
-      session.delete(:return_to_after_authenticating) || root_url
+      session.delete(:return_to_after_authenticating) || movies_url
     end
 
     def start_new_session_for(user)
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb
@@ -1,4 +1,5 @@
 class MoviesController < ApplicationController
+  allow_unauthenticated_access only: %i[ index ]
   before_action :set_current_user
   before_action :set_movie, only: %i[ show edit update destroy ]
 
@@ -80,7 +81,7 @@ def destroy
 
   private
     def set_current_user
-      @current_user ||= Current.session.user
+      @current_user ||= Current.session&.user
     end
 
     def set_movie
diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb
@@ -1,37 +1,29 @@
 class VotesController < ApplicationController
   before_action :set_current_user
-  before_action :set_movie, only: %i[ create update destroy ]
+  before_action :set_movie, only: %i[ create destroy ]
 
   # POST /movies/:movie_id/votes
   def create
-    @vote = @movie.votes.new(vote_params)
-    @vote.user = @current_user
-
-    if @vote.save
-      redirect_to @movie, notice: "Vote was successfully created."
+    @vote =  case params[:vote][:vote_type]
+    when "like"
+       @current_user.like(@movie)
+    when "dislike"
+      @current_user.dislike(@movie)
     else
-      redirect_to @movie, alert: "Failed to create vote."
+      nil
     end
-  end
 
-  # PATCH /movies/:movie_id/votes
-  def update
-    @vote = @movie.votes.find_by(user: @current_user)
-    if @vote&.update(vote_params)
-      redirect_to @movie, notice: "Vote was successfully updated."
+    if @vote
+      redirect_to @movie, notice: "Vote was successfully created."
     else
-      redirect_to @movie, alert: "Failed to update vote."
+      redirect_to @movie, alert: "Failed to create vote."
     end
   end
 
   # DELETE /movies/:movie_id/votes/:id
   def destroy
-    @vote = @movie.votes.find_by(user: @current_user)
-    if @vote&.destroy
-      redirect_to @movie, notice: "Vote was successfully deleted."
-    else
-      redirect_to @movie, alert: "Failed to delete vote."
-    end
+     @movie.votes.destroy_by(user: @current_user)
+    redirect_to @movie, notice: "Vote was successfully deleted."
   end
 
   private
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -26,6 +26,7 @@ def like(movie)
 
     if vote = votes.find_by(movie: movie)
       vote.update(vote_type: "like") unless vote.vote_type == "like"
+      vote
     else
       votes.create(movie: movie, vote_type: "like")
     end
@@ -36,6 +37,7 @@ def dislike(movie)
 
     if vote = votes.find_by(movie: movie)
       vote.update(vote_type: "dislike") unless vote.vote_type == "dislike"
+      vote
     else
       votes.create(movie: movie, vote_type: "dislike")
     end
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -24,7 +24,7 @@
   </head>
 
   <body>
-    <%= render partial: 'components/main_header', locals: { current_user: Current.session&.user } %>
+    <%= render partial: 'components/main_header', locals: { current_user: @current_user } %>
     <main class="main">
       <%= yield %>
     </main>
diff --git a/app/views/movies/index.html.erb b/app/views/movies/index.html.erb
@@ -1,16 +1,8 @@
-<p style="color: green"><%= notice %></p>
-
-<% content_for :title, "Movies" %>
-
-<h1>Movies</h1>
-
-<div id="movies">
-  <% @movies.each do |movie| %>
-    <%= render movie %>
-    <p>
-      <%= link_to "Show this movie", movie %>
-    </p>
-  <% end %>
-</div>
-
-<%= link_to "New movie", new_movie_path %>
+<%= render 'components/movie_sort_bar' %>
+<section class="content">
+    <%= render partial: 'components/movie_list', locals: { movies: @movies, current_user: Current.session&.user } %>
+
+    <% if authenticated? %>
+        <%= render 'components/new_movie_cta' %>
+    <% end %>
+</section>
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,8 +1,6 @@
 Rails.application.routes.draw do
-  root "home#index", controller: "HomeController"
   resources :movies do
     resources :votes, only: [ :create ]
-    patch "votes" => "votes#update"
     delete "votes" => "votes#destroy"
   end
   resource :session
diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb
@@ -7,8 +7,49 @@ class MoviesControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should get index" do
-    get movies_url
+    get movies_url(format: :json)
     assert_response :success
+    json = JSON.parse(@response.body)
+
+    expected_movies = Movie.all.order(created_at: :desc)
+    assert_equal expected_movies.map(&:id), json.map { |movie| movie["id"] }
+  end
+
+  test "should return movies sorted by like count descending" do
+    get movies_url(format: :json), params: { sort: "likes" }
+    assert_response :success
+    json = JSON.parse(@response.body)
+
+    expected_movies = [ movies(:two), movies(:three), movies(:one) ]
+    assert_equal expected_movies.map(&:id), json.map { |movie| movie["id"] }
+  end
+
+  test "should return movies sorted by dislike count descending" do
+    get movies_url(format: :json), params: { sort: "dislikes" }
+    assert_response :success
+    json = JSON.parse(@response.body)
+
+    expected_movies = [ movies(:one), movies(:three), movies(:two) ]
+    assert_equal expected_movies.map(&:id), json.map { |movie| movie["id"] }
+  end
+
+  test "should return movies sorted by creation date ascending" do
+    get movies_url(format: :json), params: { sort: "date" }
+    assert_response :success
+    json = JSON.parse(@response.body)
+
+    expected_movies = Movie.all
+    assert_equal expected_movies.map(&:id), json.map { |movie| movie["id"] }
+  end
+
+
+  test "should return movies for a specific user" do
+    get movies_url(format: :json), params: { user_id: users(:one).id }
+    assert_response :success
+    json = JSON.parse(@response.body)
+
+    expected_movies = [ movies(:three), movies(:one) ]
+    assert_equal expected_movies.map(&:id), json.map { |movie| movie["id"] }
   end
 
   test "should get new" do
diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
@@ -14,7 +14,7 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
 
   test "should redirect to home after login" do
     post session_url, params: { email_address: users(:one).email_address, password: "password" }
-    assert_redirected_to root_url
+    assert_redirected_to movies_url
   end
 
   test "should not login with invalid credentials" do
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
@@ -10,14 +10,14 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_difference -> { User.count } do
         post users_url, params: { user: { email_address: "assa@sada.com", password: "password", password_confirmation: "password", username: "testuser" } }
     end
-    assert_redirected_to root_url
+    assert_redirected_to movies_url
   end
 
   test "should login the created user and redirect to home" do
     assert_difference -> { Session.count } do
         post users_url, params: { user: { email_address: "assa@sada.com", password: "password", password_confirmation: "password", username: "testuser" } }
     end
-    assert_redirected_to root_url
+    assert_redirected_to movies_url
   end
 
   test "should not create user with invalid data" do
diff --git a/test/controllers/votes_controller_test.rb b/test/controllers/votes_controller_test.rb
@@ -13,16 +13,28 @@ class VotesControllerTest < ActionDispatch::IntegrationTest
     assert_equal "Vote was successfully created.", flash[:notice]
   end
 
-  test "should update an existing vote" do
-    login_user(users(:two))
-    movie = movie_votes(:two).movie
+  test "should update a vote to like" do
+    login_user(users(:one))
+    movie = movies(:two)
 
     assert_no_difference -> { movie.votes.count } do
-      patch movie_votes_url(movie), params: { vote: { vote_type: "like" } }
+      post movie_votes_url(movie), params: { vote: { vote_type: "like" } }
     end
+
     assert_redirected_to movie_url(movie)
-    assert_equal "Vote was successfully updated.", flash[:notice]
-    assert_equal movie_votes(:two).reload.vote_type, "like"
+    assert_equal "Vote was successfully created.", flash[:notice]
+  end
+
+  test "should update a vote to dislike" do
+    login_user(users(:one))
+    movie = movies(:two)
+
+    assert_no_difference -> { movie.votes.count } do
+      post movie_votes_url(movie), params: { vote: { vote_type: "dislike" } }
+    end
+
+    assert_redirected_to movie_url(movie)
+    assert_equal "Vote was successfully created.", flash[:notice]
   end
 
   test "should not create vote without type" do
diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml
@@ -1,13 +1,13 @@
 # Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 one:
-  title: MyString
-  description: MyString
+  title: The Shawshank Redemption
+  description: Banker sentenced to life in prison
   user: one
 
 two:
-  title: MyString
-  description: MyString
+  title: Harry Potter
+  description: Magical adventure
   user: two
 
 three:
diff --git a/test/helpers/movie/vote_helper_test.rb b/test/helpers/movie/vote_helper_test.rb
@@ -0,0 +1,4 @@
+require "test_helper"
+
+class Movie::VoteHelperTest < ActiveSupport::TestCase
+end
