Merge pull request #16354 from code-dot-org/sectionFix

redirect to course page on login if section has course and no script

dashboard/app/controllers/sections_controller.rb

@@ -23,7 +23,7 @@ def log_in
       bypass_sign_in user
       user.update_tracked_fields!(request)
       session[:show_pairing_dialog] = true if params[:show_pairing_dialog]
-      redirect_to_section_script
+      redirect_to_section_script_or_course
     else
       flash[:alert] = I18n.t('signinsection.invalid_login')
       redirect_to section_path(id: @section.code)
@@ -32,9 +32,11 @@ def log_in
 
   private
 
-  def redirect_to_section_script
+  def redirect_to_section_script_or_course
     if @section.script
       redirect_to @section.script
+    elsif @section.course
+      redirect_to @section.course
     else
       redirect_to '/'
     end

dashboard/test/controllers/sections_controller_test.rb

@@ -21,8 +21,10 @@ class SectionsControllerTest < ActionController::TestCase
 
   setup do
     # place in setup instead of setup_all otherwise course ends up being serialized
-    # to a file in levelbuilder_mode is true
+    # to a file if levelbuilder_mode is true
     @course = create(:course)
+    @section_with_course = create(:section, user: @teacher, login_type: 'word', course_id: @course.id)
+    @section_with_course_user_1 = create(:follower, section: @section_with_course).student_user
   end
 
   test "do not show login screen for invalid section code" do
@@ -107,6 +109,16 @@ class SectionsControllerTest < ActionController::TestCase
     assert_redirected_to '/s/flappy'
   end
 
+  test "login to section with a course redirects to course" do
+    post :log_in, params: {
+      id: @section_with_course.code,
+      user_id: @section_with_course_user_1.id,
+      secret_words: @section_with_course_user_1.secret_words
+    }
+
+    assert_redirected_to "/courses/#{@section_with_course.course.name}"
+  end
+
   test "login with show_pairing_dialog shows pairing dialog" do
     post :log_in, params: {
       id: @flappy_section.code,