Rename user to contributor in submission

spec/controllers/code_ocean/files_controller_spec.rb

@@ -5,9 +5,9 @@ require 'rails_helper'
 describe CodeOcean::FilesController do
   render_views
 
-  let(:user) { create(:admin) }
+  let(:contributor) { create(:admin) }
 
-  before { allow(controller).to receive(:current_user).and_return(user) }
+  before { allow(controller).to receive(:current_user).and_return(contributor) }
 
   describe 'GET #show_protected_upload' do
     context 'with a valid filename' do
@@ -30,7 +30,7 @@ describe CodeOcean::FilesController do
   end
 
   describe 'POST #create' do
-    let(:submission) { create(:submission, user:) }
+    let(:submission) { create(:submission, contributor:) }
 
     context 'with a valid file' do
       let(:perform_request) { proc { post :create, params: {code_ocean_file: build(:file, context: submission).attributes, format: :json} } }

spec/controllers/exercises_controller_spec.rb

@@ -164,7 +164,7 @@ describe ExercisesController do
       expect_assigns(exercise: :exercise)
 
       context 'with an existing submission' do
-        let!(:submission) { create(:submission, exercise_id: exercise.id, user_id: user.id, user_type: user.class.name) }
+        let!(:submission) { create(:submission, exercise:, contributor: user) }
 
         it "populates the editors with the submission's files' content" do
           perform_request.call
@@ -260,18 +260,18 @@ describe ExercisesController do
     let(:external_user) { create(:external_user) }
 
     before do
-      2.times { create(:submission, cause: 'autosave', user: external_user, exercise:) }
-      2.times { create(:submission, cause: 'run', user: external_user, exercise:) }
-      create(:submission, cause: 'assess', user: external_user, exercise:)
+      create_list(:submission, 2, cause: 'autosave', contributor: external_user, exercise:)
+      create_list(:submission, 2, cause: 'run', contributor: external_user, exercise:)
+      create(:submission, cause: 'assess', contributor: external_user, exercise:)
     end
 
     context 'when viewing the default submission statistics page without a parameter' do
       it 'does not list autosaved submissions' do
         perform_request
         expect(assigns(:all_events).filter {|event| event.is_a? Submission }).to contain_exactly(
-          an_object_having_attributes(cause: 'run', user_id: external_user.id),
-          an_object_having_attributes(cause: 'assess', user_id: external_user.id),
-          an_object_having_attributes(cause: 'run', user_id: external_user.id)
+          an_object_having_attributes(cause: 'run', contributor: external_user),
+          an_object_having_attributes(cause: 'assess', contributor: external_user),
+          an_object_having_attributes(cause: 'run', contributor: external_user)
         )
       end
     end
@@ -283,7 +283,7 @@ describe ExercisesController do
         perform_request
         submissions = assigns(:all_events).filter {|event| event.is_a? Submission }
         expect(submissions).to match_array Submission.all
-        expect(submissions).to include an_object_having_attributes(cause: 'autosave', user_id: external_user.id)
+        expect(submissions).to include an_object_having_attributes(cause: 'autosave', contributor: external_user)
       end
     end
   end
@@ -291,7 +291,7 @@ describe ExercisesController do
   describe 'POST #submit' do
     let(:output) { {} }
     let(:perform_request) { post :submit, format: :json, params: {id: exercise.id, submission: {cause: 'submit', exercise_id: exercise.id}} }
-    let(:user) { create(:external_user) }
+    let(:contributor) { create(:external_user) }
     let(:scoring_response) do
       [{
         status: :ok,
@@ -312,8 +312,8 @@ describe ExercisesController do
     end
 
     before do
-      create(:lti_parameter, external_user: user, exercise:)
-      submission = build(:submission, exercise:, user:)
+      create(:lti_parameter, external_user: contributor, exercise:)
+      submission = build(:submission, exercise:, contributor:)
       allow(submission).to receive_messages(normalized_score: 1, calculate_score: scoring_response, redirect_to_feedback?: false)
       allow(Submission).to receive(:create).and_return(submission)
     end

spec/controllers/sessions_controller_spec.rb

@@ -210,7 +210,7 @@ describe SessionsController do
       # Todo replace session with lti_parameter
       # Todo create LtiParameter Object
       # session[:lti_parameters] = {}
-      allow(controller).to receive(:current_user).and_return(submission.user)
+      allow(controller).to receive(:current_user).and_return(submission.contributor)
       perform_request.call
     end
 

spec/controllers/submissions_controller_spec.rb

@@ -6,9 +6,9 @@ describe SubmissionsController do
   render_views
 
   let(:submission) { create(:submission) }
-  let(:user) { create(:admin) }
+  let(:contributor) { create(:admin) }
 
-  before { allow(controller).to receive(:current_user).and_return(user) }
+  before { allow(controller).to receive(:current_user).and_return(contributor) }
 
   describe 'POST #create' do
     before do