Merge pull request #7958 from fjordllc/bug/fix-inaccessibility-to-cou…

…rses /coursesにアクセスした時の挙動が正しくなるよう修正
fjordllc · Aug 7, 2024 · 6791836 · 6791836
2 parents 71b0bc3 + c1ecf42
commit 6791836
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 15 deletions.
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
@@ -1,10 +1,16 @@
 # frozen_string_literal: true
 
 class CoursesController < ApplicationController
-  before_action :require_mentor_login, except: %i[index]
+  skip_before_action :require_active_user_login, raise: false
 
   def index
-    @courses = Course.order(created_at: :desc)
+    if logged_in?
+      @courses = Course.order(created_at: :desc)
+    else
+      @rails_course = Course.preload(categories: :practices).find_by(title: 'Railsエンジニア')
+      @frontend_course = Course.preload(categories: :practices).find_by(title: 'フロントエンドエンジニア')
+      render 'welcome/courses', layout: 'welcome'
+    end
   end
 
   private

diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
@@ -24,8 +24,4 @@ def pp; end
   def law; end
 
   def coc; end
-
-  def courses
-    @courses = Course.order(:created_at)
-  end
 end
diff --git a/app/views/welcome/courses.html.slim b/app/views/welcome/courses.html.slim
@@ -46,15 +46,13 @@
         .row.is-gutter-width-32
           .col-md-6.col-xs-12
             .course-selection-item-anchor#rails-programmer-course
-            - course = Course.find_by(title: 'Railsエンジニア')
-            - if course
-              = render('course', course: course)
+            - if @rails_course
+              = render 'welcome/course', course: @rails_course
             - else
               p コースが見つかりませんでした。
           .col-md-6.col-xs-12
             .course-selection-item-anchor#front-engineer-course
-            - course = Course.find_by(title: 'フロントエンドエンジニア')
-            - if course
-              = render('course', course: course)
+            - if @frontend_course
+              = render 'welcome/course', course: @frontend_course
             - else
               p コースが見つかりませんでした。
diff --git a/config/routes.rb b/config/routes.rb
@@ -15,7 +15,6 @@
   get "pp", to: "welcome#pp", as: "pp"
   get "law", to: "welcome#law", as: "law"
   get "coc", to: "welcome#coc", as: "coc"
-  get "courses", to: "welcome#courses", as: "courses"
   draw :scheduler
   draw :api
   draw :paper

diff --git a/test/system/courses_test.rb b/test/system/courses_test.rb
@@ -5,7 +5,7 @@
 class CoursesTest < ApplicationSystemTestCase
   test 'show listing courses' do
     visit_with_auth '/courses', 'mentormentaro'
-    assert_equal 'コース選択 | FJORD BOOT CAMP（フィヨルドブートキャンプ）', title
+    assert_equal 'コース一覧 | FBC', title
   end
 
   test 'create course' do
@@ -31,7 +31,7 @@ class CoursesTest < ApplicationSystemTestCase
 
   test 'show published courses' do
     visit_with_auth '/courses', 'hajime'
-    assert_text courses(:course1).title
+    assert_text '公開コースはありません。'
     visit_with_auth "/mentor/courses/#{courses(:course1).id}/edit", 'komagata'
     within 'form[name=course]' do
       find(:css, '#checkbox-published-course').set(true)
@@ -49,4 +49,9 @@ class CoursesTest < ApplicationSystemTestCase
     visit_with_auth '/courses', 'mentormentaro'
     assert_text courses(:course1).title
   end
+
+  test 'show welcome page when user isnt logged in' do
+    visit '/courses'
+    assert_text 'コースを選択してください'
+  end
 end