Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename by_stage to by_lesson #40801

Merged
merged 1 commit into from
May 27, 2021
Merged

Rename by_stage to by_lesson #40801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion dashboard/app/models/user_level.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions dashboard/test/models/user_level_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down