Revert "display quiz questions in grader's language in SpeedGrader"

This reverts commit 6533b36. fixes CNVS-29795 Test plan: Submission translation should match the user who took the quiz Change-Id: Ib615a24b702cccbc5b9b01c5377bee265b6b99ee Reviewed-on: https://gerrit.instructure.com/81603 Reviewed-by: Bryan Petty <[email protected]> Tested-by: Jenkins QA-Review: Michael Hargiss <[email protected]> Product-Review: Jason Sparks <[email protected]> Product-Review: Chris Wang <[email protected]>
beyond-z · Jun 6, 2016 · 580e16f · 580e16f
1 parent df67a6e
commit 580e16f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 113 deletions.
diff --git a/app/models/quizzes/quiz_question_builder.rb b/app/models/quizzes/quiz_question_builder.rb
@@ -106,19 +106,14 @@ def build_submission_questions(quiz_id, quiz_data)
     end
   end
 
-  def self.translate_question_number_text(q, position)
+  def self.decorate_question_for_submission(q, position)
     question_name = t(
       '#quizzes.quiz.question_name_counter',
       "Question %{question_number}", {
         question_number: position
       })
 
     q[:position] = position
-    q[:name] = q[:question_name] = question_name
-  end
-
-  def self.decorate_question_for_submission(q, position)
-    translate_question_number_text(q, position)
 
     case q[:question_type]
     when ::Quizzes::QuizQuestion::Q_TEXT_ONLY
@@ -183,6 +178,7 @@ def self.decorate_question_for_submission(q, position)
       q[:question_text] = text
     end # case q[:question_type]
 
+    q[:name] = q[:question_name] = question_name
     q
   end
 

diff --git a/app/views/quizzes/quizzes/_display_question.html.erb b/app/views/quizzes/quizzes/_display_question.html.erb
@@ -1,7 +1,6 @@
 <%
   display_question ||= nil
   question = display_question
-  Quizzes::QuizQuestionBuilder.translate_question_number_text(question, question[:position]) if question.present?
   question_type = answer_type(question)
   user_answer ||= nil
   user_answer_hash ||= {}

diff --git a/app/views/quizzes/quizzes/_quiz_submission.html.erb b/app/views/quizzes/quizzes/_quiz_submission.html.erb
@@ -63,10 +63,7 @@
         <%= before_label(:questions_need_review, "The following questions need review") %>
         <ul id="questions_needing_review" style="margin-top: 0;">
           <% questions_needing_review.each do |answer| %>
-            <%
-              question = submission_questions_hash[answer[:question_id]]
-              Quizzes::QuizQuestionBuilder.decorate_question_for_submission(question, question[:position])
-            %>
+            <% question = submission_questions_hash[answer[:question_id]] %>
             <li>
               <a href="#question_<%= answer[:question_id] %>"><%= h(question[:name]) %></a>
             </li>

diff --git a/spec/models/quizzes/quiz_question_builder_spec.rb b/spec/models/quizzes/quiz_question_builder_spec.rb
@@ -273,46 +273,4 @@
       subject.shuffle_matches(question)
     end
   end
-
-  describe '.translate_question_number_text' do
-    before(:once) do
-      @question = Quizzes::QuizQuestion.new({
-        question_data: {
-          question_type: 'essay_question',
-          question_text: 'qq 1'
-        }
-      })
-    end
-
-    it 'does not translate the question_name when no locale is set' do
-      question_data = @question.question_data
-      Quizzes::QuizQuestionBuilder.translate_question_number_text(question_data, 3)
-
-      expect(question_data[:name]).to eq('Question 3')
-      expect(question_data[:name]).to eq(question_data[:question_name])
-    end
-
-    it 'translates the question_name to the current locale' do
-      {
-        es: 'Pregunta',
-        de: 'Frage'
-      }.each do |locale, translation|
-        I18n.locale = locale.to_s
-
-        question_data = @question.question_data
-        Quizzes::QuizQuestionBuilder.translate_question_number_text(question_data, 3)
-
-        expect(question_data[:name]).to eq("#{translation} 3")
-        expect(question_data[:name]).to eq(question_data[:question_name])
-      end
-    end
-
-    it 'handles nil positions' do
-      question_data = @question.question_data
-      Quizzes::QuizQuestionBuilder.translate_question_number_text(question_data, nil)
-
-      expect(question_data[:name]).to eq('Question ')
-      expect(question_data[:name]).to eq(question_data[:question_name])
-    end
-  end
 end
diff --git a/spec/selenium/quizzes/quizzes_grading_teacher_spec.rb b/spec/selenium/quizzes/quizzes_grading_teacher_spec.rb
@@ -6,14 +6,14 @@
   include QuizzesCommon
 
   context 'as a teacher' do
-    before(:each) do
+    before(:once) do
       course_with_teacher(active_all: 1)
       student_in_course(active_all: 1)
       @quiz = seed_quiz_with_submission(1, student: @student)
-
-      user_session(@teacher)
     end
 
+    before(:each) { user_session(@teacher) }
+
     context 'when on the course home page' do
       before(:each) { get "/courses/#{@course.id}" }
 

diff --git a/spec/views/quizzes/quizzes/_display_question.html.erb_spec.rb b/spec/views/quizzes/quizzes/_display_question.html.erb_spec.rb
@@ -20,73 +20,29 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../views_helper')
 
 describe "/quizzes/quizzes/_display_question" do
-  def render_as(user)
-    view_context @course, user
 
-    render :partial => "quizzes/quizzes/display_question", :object => @q, :locals => {
-      :user_answer => @submission.submission_data.find{|a| a[:question_id] == @q[:id]},
-      :assessment_results => true}
-  end
-
-  before(:once) do
-    course_with_teacher(active_all: 1)
-    student_in_course(active_all: 1)
-
-    @student.update_attribute(:locale, 'es')
-    @teacher.update_attribute(:locale, 'de')
+  it "should render" do
+    course_with_student
+    view_context
 
     @quiz = @course.quizzes.create!(:title => "new quiz")
-    @quiz.quiz_questions.create!(
-      question_data: {
-        name: 'LTUE',
-        points_possible: 1,
-        question_type: 'numerical_question',
-        answers: {
-          answer_0: {
-            numerical_answer_type: 'exact_answer',
-            answer_exact: 42,
-            answer_text: '',
-            answer_weight: '100'
-          }
-        }
-      }
-    )
+    @quiz.quiz_questions.create!(:question_data =>
+      {:name => 'LTUE', :points_possible => 1, 'question_type' => 'numerical_question',
+       'answers' => {'answer_0' => {'numerical_answer_type' => 'exact_answer',
+                                    'answer_exact' => 42, 'answer_text' => '', 'answer_weight' => '100'}}})
     @quiz.generate_quiz_data
     @quiz.save
 
     @submission = @quiz.generate_submission(@student)
     @submission.submission_data = { "question_#{@quiz.quiz_data[0][:id]}" => "42.0" }
     Quizzes::SubmissionGrader.new(@submission).grade_submission
 
-    @q = @quiz.stored_questions.first
-    @q[:answers][0].delete(:margin) # sometimes this is missing; see #10785
-  end
-
-  before(:each) do
     assigns[:quiz] = @quiz
-  end
-
-  it "should render" do
-    render_as @student
-
-    expect(rendered).not_to be_nil
-  end
-
-  context 'when the student and teacher have different locales' do
-    it "shows question names in Spanish to the student" do
-      I18n.locale = @student.locale
-
-      render_as @student
-
-      expect(rendered).to include('Pregunta')
-    end
-
-    it "shows question names in Spanish to the teacher" do
-      I18n.locale = @teacher.locale
-
-      render_as @teacher
-
-      expect(rendered).to include('Frage')
-    end
+    q = @quiz.stored_questions.first
+    q[:answers][0].delete(:margin) # sometimes this is missing; see #10785
+    render :partial => "quizzes/quizzes/display_question", :object => q, :locals => {
+        :user_answer => @submission.submission_data.find{|a| a[:question_id] == q[:id]},
+        :assessment_results => true}
+    expect(response).not_to be_nil
   end
 end