htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing tests p3

Browse Source
This commit is contained in:
Tom Staubitz
2017-01-13 09:56:36 +01:00
parent 4af24d4317
commit 6bf73757ae
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/exercises_controller.rb
View File

@ -158,9 +158,11 @@ class ExercisesController < ApplicationController
def redirect_to_lti_return_path
lti_parameter = LtiParameter.where(consumers_id: session[:consumer_id],
external_users_id: @current_user.id,
external_users_id: @submission.user_id,
exercises_id: @submission.exercise_id).first
# binding.pry
path = lti_return_path(consumer_id: session[:consumer_id],
submission_id: @submission.id,
url: consumer_return_url(build_tool_provider(consumer: Consumer.find_by(id: session[:consumer_id]),
@ -228,7 +230,8 @@ class ExercisesController < ApplicationController
def submit
@submission = Submission.create(submission_params)
score_submission(@submission)
if lti_outcome_service?(@submission.exercise_id, @current_user.id, @current_user.consumer_id)
current_user = ExternalUser.find(@submission.user_id)
if !current_user.nil? && lti_outcome_service?(@submission.exercise_id, current_user.id, current_user.consumer_id)
transmit_lti_score
else
redirect_after_submit

3
spec/controllers/exercises_controller_spec.rb
View File

@ -230,11 +230,14 @@ describe ExercisesController do
describe 'POST #submit' do
let(:output) { {} }
let(:request) { post :submit, format: :json, id: exercise.id, submission: {cause: 'submit', exercise_id: exercise.id} }
let!(:external_user) { FactoryGirl.create(:external_user) }
let!(:lti_parameter) { FactoryGirl.create(:lti_parameter) }
before(:each) do
allow_any_instance_of(Submission).to receive(:normalized_score).and_return(1)
expect(controller).to receive(:collect_test_results).and_return([{score: 1, weight: 1}])
expect(controller).to receive(:score_submission).and_call_original
controller.session[:consumer_id] = external_user.consumer_id
end
context 'when LTI outcomes are supported' do