Skip to content

Commit

Permalink
fix linter
Browse files Browse the repository at this point in the history
  • Loading branch information
BANCUNGUYE66 committed Oct 3, 2023
1 parent e67fe0f commit f73ceb6
Show file tree
Hide file tree
Showing 11 changed files with 69 additions and 62 deletions.
19 changes: 10 additions & 9 deletions app/controllers/courses_controller.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class CoursesController < ApplicationController
before_action :set_course, only: %i[ show update destroy ]
before_action :set_course, only: %i[show update destroy]

# GET /courses
def index
Expand Down Expand Up @@ -39,13 +39,14 @@ def destroy
end

private
# Use callbacks to share common setup or constraints between actions.
def set_course
@course = Course.find(params[:id])
end

# Only allow a list of trusted parameters through.
def course_params
params.require(:course).permit(:name, :description, :image, :fee, :startDate)
end
# Use callbacks to share common setup or constraints between actions.
def set_course
@course = Course.find(params[:id])
end

# Only allow a list of trusted parameters through.
def course_params
params.require(:course).permit(:name, :description, :image, :fee, :startDate)
end
end
19 changes: 10 additions & 9 deletions app/controllers/reservations_controller.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class ReservationsController < ApplicationController
before_action :set_reservation, only: %i[ show update destroy ]
before_action :set_reservation, only: %i[show update destroy]

# GET /reservations
def index
Expand Down Expand Up @@ -39,13 +39,14 @@ def destroy
end

private
# Use callbacks to share common setup or constraints between actions.
def set_reservation
@reservation = Reservation.find(params[:id])
end

# Only allow a list of trusted parameters through.
def reservation_params
params.require(:reservation).permit(:user_id, :course_id, :city, :date)
end
# Use callbacks to share common setup or constraints between actions.
def set_reservation
@reservation = Reservation.find(params[:id])
end

# Only allow a list of trusted parameters through.
def reservation_params
params.require(:reservation).permit(:user_id, :course_id, :city, :date)
end
end
19 changes: 10 additions & 9 deletions app/controllers/users_controller.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class UsersController < ApplicationController
before_action :set_user, only: %i[ show update destroy ]
before_action :set_user, only: %i[show update destroy]

# GET /users
def index
Expand Down Expand Up @@ -39,13 +39,14 @@ def destroy
end

private
# Use callbacks to share common setup or constraints between actions.
def set_user
@user = User.find(params[:id])
end

# Only allow a list of trusted parameters through.
def user_params
params.require(:user).permit(:name)
end
# Use callbacks to share common setup or constraints between actions.
def set_user
@user = User.find(params[:id])
end

# Only allow a list of trusted parameters through.
def user_params
params.require(:user).permit(:name)
end
end
4 changes: 2 additions & 2 deletions app/models/course.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class Course < ApplicationRecord
has_many :reservations
has_many :users, through: :reservations
has_many :reservations
has_many :users, through: :reservations
end
4 changes: 2 additions & 2 deletions app/models/user.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class User < ApplicationRecord
has_many :reservations
has_many :courses, through: :reservations
has_many :reservations
has_many :courses, through: :reservations
end
22 changes: 12 additions & 10 deletions test/controllers/courses_controller_test.rb
Original file line number Diff line number Diff line change
@@ -1,35 +1,37 @@
require "test_helper"
require 'test_helper'

class CoursesControllerTest < ActionDispatch::IntegrationTest
setup do
@course = courses(:one)
end

test "should get index" do
test 'should get index' do
get courses_url, as: :json
assert_response :success
end

test "should create course" do
assert_difference("Course.count") do
post courses_url, params: { course: { description: @course.description, fee: @course.fee, image: @course.image, name: @course.name, startDate: @course.startDate } }, as: :json
test 'should create course' do
assert_difference('Course.count') do
post courses_url,
params: { course: { description: @course.description, fee: @course.fee, image: @course.image, name: @course.name, startDate: @course.startDate } }, as: :json
end

assert_response :created
end

test "should show course" do
test 'should show course' do
get course_url(@course), as: :json
assert_response :success
end

test "should update course" do
patch course_url(@course), params: { course: { description: @course.description, fee: @course.fee, image: @course.image, name: @course.name, startDate: @course.startDate } }, as: :json
test 'should update course' do
patch course_url(@course),
params: { course: { description: @course.description, fee: @course.fee, image: @course.image, name: @course.name, startDate: @course.startDate } }, as: :json
assert_response :success
end

test "should destroy course" do
assert_difference("Course.count", -1) do
test 'should destroy course' do
assert_difference('Course.count', -1) do
delete course_url(@course), as: :json
end

Expand Down
22 changes: 12 additions & 10 deletions test/controllers/reservations_controller_test.rb
Original file line number Diff line number Diff line change
@@ -1,35 +1,37 @@
require "test_helper"
require 'test_helper'

class ReservationsControllerTest < ActionDispatch::IntegrationTest
setup do
@reservation = reservations(:one)
end

test "should get index" do
test 'should get index' do
get reservations_url, as: :json
assert_response :success
end

test "should create reservation" do
assert_difference("Reservation.count") do
post reservations_url, params: { reservation: { city: @reservation.city, course_id: @reservation.course_id, date: @reservation.date, user_id: @reservation.user_id } }, as: :json
test 'should create reservation' do
assert_difference('Reservation.count') do
post reservations_url,
params: { reservation: { city: @reservation.city, course_id: @reservation.course_id, date: @reservation.date, user_id: @reservation.user_id } }, as: :json
end

assert_response :created
end

test "should show reservation" do
test 'should show reservation' do
get reservation_url(@reservation), as: :json
assert_response :success
end

test "should update reservation" do
patch reservation_url(@reservation), params: { reservation: { city: @reservation.city, course_id: @reservation.course_id, date: @reservation.date, user_id: @reservation.user_id } }, as: :json
test 'should update reservation' do
patch reservation_url(@reservation),
params: { reservation: { city: @reservation.city, course_id: @reservation.course_id, date: @reservation.date, user_id: @reservation.user_id } }, as: :json
assert_response :success
end

test "should destroy reservation" do
assert_difference("Reservation.count", -1) do
test 'should destroy reservation' do
assert_difference('Reservation.count', -1) do
delete reservation_url(@reservation), as: :json
end

Expand Down
16 changes: 8 additions & 8 deletions test/controllers/users_controller_test.rb
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
require "test_helper"
require 'test_helper'

class UsersControllerTest < ActionDispatch::IntegrationTest
setup do
@user = users(:one)
end

test "should get index" do
test 'should get index' do
get users_url, as: :json
assert_response :success
end

test "should create user" do
assert_difference("User.count") do
test 'should create user' do
assert_difference('User.count') do
post users_url, params: { user: { name: @user.name } }, as: :json
end

assert_response :created
end

test "should show user" do
test 'should show user' do
get user_url(@user), as: :json
assert_response :success
end

test "should update user" do
test 'should update user' do
patch user_url(@user), params: { user: { name: @user.name } }, as: :json
assert_response :success
end

test "should destroy user" do
assert_difference("User.count", -1) do
test 'should destroy user' do
assert_difference('User.count', -1) do
delete user_url(@user), as: :json
end

Expand Down
2 changes: 1 addition & 1 deletion test/models/course_test.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "test_helper"
require 'test_helper'

class CourseTest < ActiveSupport::TestCase
# test "the truth" do
Expand Down
2 changes: 1 addition & 1 deletion test/models/reservation_test.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "test_helper"
require 'test_helper'

class ReservationTest < ActiveSupport::TestCase
# test "the truth" do
Expand Down
2 changes: 1 addition & 1 deletion test/models/user_test.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "test_helper"
require 'test_helper'

class UserTest < ActiveSupport::TestCase
# test "the truth" do
Expand Down

0 comments on commit f73ceb6

Please sign in to comment.