Merge pull request #40801 from code-dot-org/rename-21

Rename by_stage to by_lesson

dashboard/app/models/user_level.rb

@@ -42,7 +42,7 @@ class UserLevel < ApplicationRecord
   scope :passing, -> {where('best_result >= ?', ActivityConstants::MINIMUM_PASS_RESULT)}
   scope :perfect, -> {where('best_result > ?', ActivityConstants::MAXIMUM_NONOPTIMAL_RESULT)}
 
-  def self.by_stage(lesson)
+  def self.by_lesson(lesson)
     levels = lesson.script_levels.map(&:level_ids).flatten
     where(script: lesson.script, level: levels)
   end

dashboard/test/models/user_level_test.rb

@@ -14,7 +14,7 @@ class UserLevelTest < ActiveSupport::TestCase
     @driver_user_level.navigator_user_levels << @navigator_user_level
   end
 
-  test "by_stage" do
+  test "by_lesson" do
     script = create :script
     stage = create :lesson, script: script
     script_level = create :script_level, script: script, lesson: stage
@@ -23,11 +23,11 @@ class UserLevelTest < ActiveSupport::TestCase
     stage_user_level = create :user_level, script: script, level: level
     other_user_level = create :user_level
 
-    assert_includes UserLevel.by_stage(stage), stage_user_level
-    refute_includes UserLevel.by_stage(stage), other_user_level
+    assert_includes UserLevel.by_lesson(stage), stage_user_level
+    refute_includes UserLevel.by_lesson(stage), other_user_level
   end
 
-  test "by_stage will find all levels for each script_level" do
+  test "by_lesson will find all levels for each script_level" do
     script = create :script
     stage = create :lesson, script: script
     first_level = create :level
@@ -40,15 +40,15 @@ class UserLevelTest < ActiveSupport::TestCase
         second_level
       ]
 
-    assert_equal UserLevel.by_stage(stage), []
+    assert_equal UserLevel.by_lesson(stage), []
 
     first_user_level = create :user_level, script: script, level: first_level
 
-    assert_equal UserLevel.by_stage(stage), [first_user_level]
+    assert_equal UserLevel.by_lesson(stage), [first_user_level]
 
     second_user_level = create :user_level, script: script, level: second_level
 
-    assert_equal UserLevel.by_stage(stage), [first_user_level, second_user_level]
+    assert_equal UserLevel.by_lesson(stage), [first_user_level, second_user_level]
   end
 
   test "perfect? finished? and passing? should be able to handle ScriptLevels that have nil as best_result" do