Skip to content

Commit c802017

Browse files
committed
fix version number preload for no versions
refs CNVS-32804 otherwise it will still query individually Change-Id: I46b078b6f3bcf509e8844c3e698b991178ee838e Reviewed-on: https://gerrit.instructure.com/94370 Tested-by: Jenkins Reviewed-by: brian kirkby <bkirkby@instructure.com> Reviewed-by: Simon Williams <simon@instructure.com> Product-Review: Cody Cutrer <cody@instructure.com> QA-Review: Cody Cutrer <cody@instructure.com>
1 parent 6a930f7 commit c802017

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

app/models/assessment_question.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ def self.find_or_create_quiz_questions(assessment_questions, quiz_id, quiz_group
237237
group_by(&:assessment_question_id)
238238

239239
assessment_questions.map do |aq|
240-
aq.force_version_number(current_versions[aq.id])
240+
aq.force_version_number(current_versions[aq.id] || 0)
241241
qq = existing_quiz_questions[aq.id].try(:first)
242242
if !qq
243243
begin

spec/models/assessment_question_spec.rb

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -217,16 +217,19 @@ def attachment_in_course(course)
217217
end
218218

219219
it 'should find and update an out of date quiz_question' do
220-
qq = AssessmentQuestion.find_or_create_quiz_questions([assessment_question], quiz.id, nil).first
220+
aq = assessment_question
221+
qq = AssessmentQuestion.find_or_create_quiz_questions([aq], quiz.id, nil).first
221222

222-
assessment_question.name = 'changed'
223-
assessment_question.with_versioning(&:save!)
223+
aq = AssessmentQuestion.find(aq)
224+
aq.name = 'changed'
225+
aq.with_versioning(&:save!)
224226

225-
expect(qq.assessment_question_version).to_not eql(assessment_question.version_number)
227+
expect(qq.assessment_question_version).to_not eql(aq.version_number)
226228

227-
qq2 = AssessmentQuestion.find_or_create_quiz_questions([assessment_question], quiz.id, nil).first
229+
qq2 = AssessmentQuestion.find_or_create_quiz_questions([aq], quiz.id, nil).first
230+
aq = AssessmentQuestion.find(aq)
228231
expect(qq.assessment_question_version).to_not eql(qq2.assessment_question_version)
229-
expect(qq2.assessment_question_version).to eql(assessment_question.version_number)
232+
expect(qq2.assessment_question_version).to eql(aq.version_number)
230233
end
231234

232235
it "grabs the first match by ID order" do

0 commit comments

Comments
 (0)