Merge pull request #136 from openHPI/fix-tests

Fix Tests
This commit is contained in:
rteusner
2017-11-01 10:10:04 +01:00
committed by GitHub
11 changed files with 57 additions and 80 deletions

View File

@ -39,6 +39,7 @@ class ProxyExercise < ActiveRecord::Base
Rails.logger.debug("find new matching exercise for user #{user.id}" )
matching_exercise =
begin
Rails.logger.debug("find new matching exercise for user #{user.id}" )
find_matching_exercise(user)
rescue => e #fallback
Rails.logger.error("finding matching exercise failed. Fall back to random exercise! Error: #{$!}" )
@ -72,7 +73,7 @@ class ProxyExercise < ActiveRecord::Base
# find exercises
potential_recommended_exercises = []
exercises.where("expected_difficulty > 1").each do |ex|
exercises.where("expected_difficulty >= 1").each do |ex|
## find exercises which have only tags the user has already seen
if (ex.tags - tags_user_has_seen).empty?
potential_recommended_exercises << ex
@ -85,8 +86,7 @@ class ProxyExercise < ActiveRecord::Base
@reason[:reason] = "easiest exercise in pool. empty potential exercises"
select_easiest_exercise(exercises)
else
recommended_exercise = select_best_matching_exercise(user, exercises_user_has_accessed, potential_recommended_exercises)
recommended_exercise
select_best_matching_exercise(user, exercises_user_has_accessed, potential_recommended_exercises)
end
end
@ -238,4 +238,4 @@ class ProxyExercise < ActiveRecord::Base
exercises.order(:expected_difficulty).first
end
end
end