From 7c46ae50805470e3d475cfe0bbaeb61f10fd3ae2 Mon Sep 17 00:00:00 2001
From: Brian Palmer <brianp@instructure.com>
Date: Wed, 19 Jun 2013 16:30:51 -0600
Subject: [PATCH] rename the submissions :id param to :user_id

it was brought to my attention that it's really not very clear that :id
is referring to the user id, not some unobtainable submission id.

test plan: specs should still pass. re-generate the api documentation,
and the submissions api docs should refer to :user_id instead of :id in
the show and update actions.

Change-Id: I2edb11f4b94a3ae4b7e960b92b46f0d5a5264140
Reviewed-on: https://gerrit.instructure.com/21607
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
---
 app/controllers/submissions_api_controller.rb |  4 +-
 config/routes.rb                              |  4 +-
 spec/apis/v1/submissions_api_spec.rb          | 84 +++++++++----------
 3 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/app/controllers/submissions_api_controller.rb b/app/controllers/submissions_api_controller.rb
index ed6c3d52b7b..bd52a4a24a7 100644
--- a/app/controllers/submissions_api_controller.rb
+++ b/app/controllers/submissions_api_controller.rb
@@ -148,7 +148,7 @@ class SubmissionsApiController < ApplicationController
   # @argument include[] ["submission_history"|"submission_comments"|"rubric_assessment"] Associations to include with the group.
   def show
     @assignment = @context.assignments.active.find(params[:assignment_id])
-    @user = get_user_considering_section(params[:id])
+    @user = get_user_considering_section(params[:user_id])
     @submission = @assignment.submission_for_student(@user)
 
     if authorized_action(@submission, @current_user, :read)
@@ -250,7 +250,7 @@ class SubmissionsApiController < ApplicationController
   #       rubric_assessment[crit1][points]=3&rubric_assessment[crit2][points]=5&rubric_assessment[crit2][comments]=Well%20Done.
   def update
     @assignment = @context.assignments.active.find(params[:assignment_id])
-    @user = get_user_considering_section(params[:id])
+    @user = get_user_considering_section(params[:user_id])
 
     authorized = false
     if params[:submission] || params[:rubric_assessment]
diff --git a/config/routes.rb b/config/routes.rb
index 04d31a75bed..4c3a7c6e93b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -739,10 +739,10 @@ ActionController::Routing::Routes.draw do |map|
       def submissions_api(submissions, context)
         submissions.get "#{context.pluralize}/:#{context}_id/assignments/:assignment_id/submissions", :action => :index, :path_name => "#{context}_assignment_submissions"
         submissions.get "#{context.pluralize}/:#{context}_id/students/submissions", :controller => :submissions_api, :action => :for_students, :path_name => "#{context}_student_submissions"
-        submissions.get "#{context.pluralize}/:#{context}_id/assignments/:assignment_id/submissions/:id", :action => :show, :path_name => "#{context}_assignment_submission"
+        submissions.get "#{context.pluralize}/:#{context}_id/assignments/:assignment_id/submissions/:user_id", :action => :show, :path_name => "#{context}_assignment_submission"
         submissions.post "#{context.pluralize}/:#{context}_id/assignments/:assignment_id/submissions", :action => :create, :controller => :submissions
         submissions.post "#{context.pluralize}/:#{context}_id/assignments/:assignment_id/submissions/:user_id/files", :action => :create_file
-        submissions.put "#{context.pluralize}/:#{context}_id/assignments/:assignment_id/submissions/:id", :action => :update, :path_name => "#{context}_assignment_submission"
+        submissions.put "#{context.pluralize}/:#{context}_id/assignments/:assignment_id/submissions/:user_id", :action => :update, :path_name => "#{context}_assignment_submission"
       end
       submissions_api(submissions, "course")
       submissions_api(submissions, "section")
diff --git a/spec/apis/v1/submissions_api_spec.rb b/spec/apis/v1/submissions_api_spec.rb
index 129248812a0..a1054aa1a68 100644
--- a/spec/apis/v1/submissions_api_spec.rb
+++ b/spec/apis/v1/submissions_api_spec.rb
@@ -46,7 +46,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'show',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => @assignment.id.to_s, :id => student.id.to_s },
+            :assignment_id => @assignment.id.to_s, :user_id => student.id.to_s },
           { :include => %w(submission_history submission_comments rubric_assessment) })
     json.should == {
       "assignment_id" => @assignment.id,
@@ -126,7 +126,7 @@ describe 'Submissions API', :type => :integration do
                       "/api/v1/sections/#{@default_section.id}/assignments/#{@a1.id}/submissions/#{@student1.id}",
       { :controller => 'submissions_api', :action => 'update',
         :format => 'json', :section_id => @default_section.id.to_s,
-        :assignment_id => @a1.id.to_s, :id => @student1.id.to_s },
+        :assignment_id => @a1.id.to_s, :user_id => @student1.id.to_s },
         { :submission => { :posted_grade => '75%' } })
       response.status.should == "404 Not Found"
 
@@ -135,7 +135,7 @@ describe 'Submissions API', :type => :integration do
                       "/api/v1/sections/sis_section_id:my-section-sis-id/assignments/#{@a1.id}/submissions/#{@student1.id}",
       { :controller => 'submissions_api', :action => 'update',
         :format => 'json', :section_id => 'sis_section_id:my-section-sis-id',
-        :assignment_id => @a1.id.to_s, :id => @student1.id.to_s },
+        :assignment_id => @a1.id.to_s, :user_id => @student1.id.to_s },
         { :submission => { :posted_grade => '75%' } })
         # never more than 1 job added, because it's in a Delayed::Batch
       }.to change { Delayed::Job.jobs_count(:current) }.by(1)
@@ -153,7 +153,7 @@ describe 'Submissions API', :type => :integration do
             "/api/v1/sections/sis_section_id:my-section-sis-id/assignments/#{@a1.id}/submissions/#{@student1.id}",
             { :controller => 'submissions_api', :action => 'show',
               :format => 'json', :section_id => 'sis_section_id:my-section-sis-id',
-              :assignment_id => @a1.id.to_s, :id => @student1.id.to_s },
+              :assignment_id => @a1.id.to_s, :user_id => @student1.id.to_s },
             { :include => %w(submission_history submission_comments rubric_assessment) })
       json['user_id'].should == @student1.id
     end
@@ -170,7 +170,7 @@ describe 'Submissions API', :type => :integration do
             "/api/v1/sections/sis_section_id:my-section-sis-id/assignments/#{@a1.id}/submissions/#{@student1.id}",
             { :controller => 'submissions_api', :action => 'show',
               :format => 'json', :section_id => 'sis_section_id:my-section-sis-id',
-              :assignment_id => @a1.id.to_s, :id => @student1.id.to_s },
+              :assignment_id => @a1.id.to_s, :user_id => @student1.id.to_s },
             { :include => %w(submission_comments rubric_assessment) })
 
       %w(score published_grade published_score grade).each do |a|
@@ -186,7 +186,7 @@ describe 'Submissions API', :type => :integration do
             "/api/v1/sections/sis_section_id:my-section-sis-id/assignments/#{@a1.id}/submissions/#{@student1.id}",
             { :controller => 'submissions_api', :action => 'show',
               :format => 'json', :section_id => 'sis_section_id:my-section-sis-id',
-              :assignment_id => @a1.id.to_s, :id => @student1.id.to_s },
+              :assignment_id => @a1.id.to_s, :user_id => @student1.id.to_s },
             { :include => %w(submission_comments rubric_assessment) })
       json["submission_comments"].size.should == 2
       json["grade"].should == "5"
@@ -198,7 +198,7 @@ describe 'Submissions API', :type => :integration do
             "/api/v1/sections/sis_section_id:my-section-sis-id/assignments/#{@a1.id}/submissions/#{@student1.id}",
             { :controller => 'submissions_api', :action => 'show',
               :format => 'json', :section_id => 'sis_section_id:my-section-sis-id',
-              :assignment_id => @a1.id.to_s, :id => @student1.id.to_s },
+              :assignment_id => @a1.id.to_s, :user_id => @student1.id.to_s },
             { :include => %w(submission_comments rubric_assessment) })
       json["submission_comments"].size.should == 2
       json["grade"].should == "5"
@@ -243,7 +243,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/submissions/#{@student.id}.json",
           { :controller => 'submissions_api', :action => 'show',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => @assignment.id.to_s, :id => @student.id.to_s })
+            :assignment_id => @assignment.id.to_s, :user_id => @student.id.to_s })
 
     json['discussion_entries'].sort_by { |h| h['user_id'] }.should ==
       [{
@@ -274,7 +274,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/submissions/#{@student.id}",
           { :controller => 'submissions_api', :action => 'show',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => @assignment.id.to_s, :id => @student.id.to_s },
+            :assignment_id => @assignment.id.to_s, :user_id => @student.id.to_s },
           { :response_fields => SubmissionsApiController::SUBMISSION_JSON_FIELDS })
     json['discussion_entries'].should be_nil
 
@@ -282,7 +282,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/submissions/#{@student.id}",
           { :controller => 'submissions_api', :action => 'show',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => @assignment.id.to_s, :id => @student.id.to_s },
+            :assignment_id => @assignment.id.to_s, :user_id => @student.id.to_s },
           { :exclude_response_fields => %w(discussion_entries) })
     json['discussion_entries'].should be_nil
   end
@@ -310,7 +310,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/submissions/#{@student.id}.json",
           { :controller => 'submissions_api', :action => 'show',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => @assignment.id.to_s, :id => @student.id.to_s })
+            :assignment_id => @assignment.id.to_s, :user_id => @student.id.to_s })
 
     json['discussion_entries'].sort_by { |h| h['user_id'] }.should ==
       [{
@@ -436,7 +436,7 @@ describe 'Submissions API', :type => :integration do
                     "/api/v1/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student1.id}.json",
                     { :controller => "submissions_api", :action => "show",
                       :format => "json", :course_id => @course.id.to_s,
-                      :assignment_id => a1.id.to_s, :id => student1.id.to_s },
+                      :assignment_id => a1.id.to_s, :user_id => student1.id.to_s },
                     { :include => %w(submission_comments) })
 
     json.should == {
@@ -482,7 +482,7 @@ describe 'Submissions API', :type => :integration do
                     "/api/v1/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student1.id}.json",
                     { :controller => "submissions_api", :action => "show",
                       :format => "json", :course_id => @course.id.to_s,
-                      :assignment_id => a1.id.to_s, :id => student1.id.to_s },
+                      :assignment_id => a1.id.to_s, :user_id => student1.id.to_s },
                     { :include => %w(submission_comments) })
     response.status.should =~ /401/
   end
@@ -499,7 +499,7 @@ describe 'Submissions API', :type => :integration do
     json = api_call(:get, "/api/v1/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{@student.id}.json",
                   { :controller => "submissions_api", :action => "show",
                     :format => "json", :course_id => @course.id.to_s,
-                    :assignment_id => a1.id.to_s, :id => @student.id.to_s })
+                    :assignment_id => a1.id.to_s, :user_id => @student.id.to_s })
     json["score"].should == 15
   end
 
@@ -513,7 +513,7 @@ describe 'Submissions API', :type => :integration do
       json = api_call(:get, "/api/v1/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student1.id}.json",
                     { :controller => "submissions_api", :action => "show",
                       :format => "json", :course_id => @course.id.to_s,
-                      :assignment_id => a1.id.to_s, :id => student1.id.to_s })
+                      :assignment_id => a1.id.to_s, :user_id => student1.id.to_s })
       json["body"]
     end
   end
@@ -910,7 +910,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'show',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => a1.id.to_s, :id => student.id.to_s })
+            :assignment_id => a1.id.to_s, :user_id => student.id.to_s })
     json.should have_key 'turnitin_data'
     sample_turnitin_data.delete :last_processed_attempt
     json['turnitin_data'].should == sample_turnitin_data.with_indifferent_access
@@ -921,7 +921,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'show',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => a1.id.to_s, :id => student.id.to_s })
+            :assignment_id => a1.id.to_s, :user_id => student.id.to_s })
     json.should_not have_key 'turnitin_data'
 
     # as student after grading
@@ -931,7 +931,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'show',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => a1.id.to_s, :id => student.id.to_s })
+            :assignment_id => a1.id.to_s, :user_id => student.id.to_s })
     json.should have_key 'turnitin_data'
     json['turnitin_data'].should == sample_turnitin_data.with_indifferent_access
 
@@ -1099,7 +1099,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => a1.id.to_s, :id => student.id.to_s },
+            :assignment_id => a1.id.to_s, :user_id => student.id.to_s },
           { :submission => { :posted_grade => 'B' } })
 
     Submission.count.should == 1
@@ -1121,7 +1121,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/sis_course_id:my-course-id/assignments/#{a1.id}/submissions/sis_user_id:my-user-id.json",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => 'sis_course_id:my-course-id',
-            :assignment_id => a1.id.to_s, :id => 'sis_user_id:my-user-id' },
+            :assignment_id => a1.id.to_s, :user_id => 'sis_user_id:my-user-id' },
           { :submission => { :posted_grade => 'B' } })
 
     Submission.count.should == 1
@@ -1143,7 +1143,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => a1.id.to_s, :id => student.id.to_s },
+            :assignment_id => a1.id.to_s, :user_id => student.id.to_s },
           { :comment => { :text_comment => 'witty remark' } })
 
     Submission.count.should == 1
@@ -1166,7 +1166,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => a1.id.to_s, :id => student.id.to_s },
+            :assignment_id => a1.id.to_s, :user_id => student.id.to_s },
           { :comment => { :text_comment => 'witty remark' },
             :submission => { :posted_grade => 'B' } })
     response.status.should == '401 Unauthorized'
@@ -1184,7 +1184,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => a1.id.to_s, :id => student.id.to_s },
+            :assignment_id => a1.id.to_s, :user_id => student.id.to_s },
           { :comment => { :text_comment => 'witty remark' },
             :rubric_assessment => { :criteria => { :points => 5 } } })
     response.status.should == '401 Unauthorized'
@@ -1229,7 +1229,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => a1.id.to_s, :id => student.id.to_s },
+            :assignment_id => a1.id.to_s, :user_id => student.id.to_s },
           { :submission => { :posted_grade => 'B' } })
 
     Submission.count.should == 1
@@ -1251,7 +1251,7 @@ describe 'Submissions API', :type => :integration do
     api_call(:put, "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}/submissions/#{student.id}",
       { :controller => 'submissions_api', :action => 'update', :format => 'json',
         :course_id => @course.to_param, :assignment_id => assignment.to_param,
-        :id => student.to_param },
+        :user_id => student.to_param },
       { :comment => { :text_comment => 'hidden comment' } })
     submission.submission_comments.order("id DESC").first.should be_hidden
   end
@@ -1267,7 +1267,7 @@ describe 'Submissions API', :type => :integration do
     api_call(:put, "/api/v1/courses/#{@course.id}/assignments/#{assignment.id}/submissions/#{student.id}",
       { :controller => 'submissions_api', :action => 'update', :format => 'json',
         :course_id => @course.to_param, :assignment_id => assignment.to_param,
-        :id => student.to_param },
+        :user_id => student.to_param },
       { :comment => { :text_comment => 'hidden comment' } })
     submission.submission_comments.order("id DESC").first.should_not be_hidden
   end
@@ -1350,7 +1350,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => a1.id.to_s, :id => student.id.to_s },
+            :assignment_id => a1.id.to_s, :user_id => student.id.to_s },
           { :submission => { :posted_grade => param } })
 
     Submission.count.should == 1
@@ -1373,7 +1373,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => a1.id.to_s, :id => student.id.to_s },
+            :assignment_id => a1.id.to_s, :user_id => student.id.to_s },
           { :rubric_assessment =>
              { :crit1 => { :points => 7 },
                :crit2 => { :points => 2, :comments => 'Rock on' } } })
@@ -1412,7 +1412,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => @assignment.id.to_s, :id => student.id.to_s },
+            :assignment_id => @assignment.id.to_s, :user_id => student.id.to_s },
           { :comment =>
             { :text_comment => "ohai!" } })
 
@@ -1438,7 +1438,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/submissions/#{student1.id}.json",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => @assignment.id.to_s, :id => student1.id.to_s },
+            :assignment_id => @assignment.id.to_s, :user_id => student1.id.to_s },
           { :comment =>
             { :text_comment => "ohai!", :group_comment => "1" } })
     json['submission_comments'].size.should == 1
@@ -1462,7 +1462,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => @assignment.id.to_s, :id => student.id.to_s },
+            :assignment_id => @assignment.id.to_s, :user_id => student.id.to_s },
           { :comment =>
             { :media_comment_id => '1234', :media_comment_type => 'audio' } })
 
@@ -1485,7 +1485,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{a1.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => a1.id.to_s, :id => student.id.to_s },
+            :assignment_id => a1.id.to_s, :user_id => student.id.to_s },
           { :comment => { :text_comment => "Why U no submit" } })
 
     Submission.count.should == 1
@@ -1512,7 +1512,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => @assignment.id.to_s, :id => student.id.to_s },
+            :assignment_id => @assignment.id.to_s, :user_id => student.id.to_s },
           { :submission => { :posted_grade => '' } })
     Submission.count.should == 1
     @submission = Submission.first
@@ -1532,7 +1532,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => @assignment.id.to_s, :id => student.id.to_s },
+            :assignment_id => @assignment.id.to_s, :user_id => student.id.to_s },
           { :comment => { :text_comment => "This works" } })
     Submission.count.should == 1
     @submission = Submission.first
@@ -1542,7 +1542,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => @assignment.id.to_s, :id => student.id.to_s },
+            :assignment_id => @assignment.id.to_s, :user_id => student.id.to_s },
           { :submission => { :posted_grade => '10' } })
     Submission.count.should == 1
     @submission = Submission.first
@@ -1552,7 +1552,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => @assignment.id.to_s, :id => student.id.to_s },
+            :assignment_id => @assignment.id.to_s, :user_id => student.id.to_s },
           { :comment => { :text_comment => "10/12 ain't bad" } })
     Submission.count.should == 1
     @submission = Submission.first
@@ -1572,7 +1572,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/submissions/#{student.id}.json",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => @assignment.id.to_s, :id => student.id.to_s },
+            :assignment_id => @assignment.id.to_s, :user_id => student.id.to_s },
           { :submission => { :posted_grade => '12' } })
     Submission.count.should == 1
     @submission = Submission.first
@@ -1616,7 +1616,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/submissions/#{s2.user_id}",
           { :controller => 'submissions_api', :action => 'show',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => @assignment.id.to_s, :id => s2.user_id.to_s })
+            :assignment_id => @assignment.id.to_s, :user_id => s2.user_id.to_s })
     response.status.should == "404 Not Found"
 
     # try querying the other section directly
@@ -1624,7 +1624,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/sections/#{section2.id}/assignments/#{@assignment.id}/submissions/#{s2.user_id}",
           { :controller => 'submissions_api', :action => 'show',
             :format => 'json', :section_id => section2.id.to_s,
-            :assignment_id => @assignment.id.to_s, :id => s2.user_id.to_s })
+            :assignment_id => @assignment.id.to_s, :user_id => s2.user_id.to_s })
     response.status.should == "404 Not Found"
 
     json = api_call(:get,
@@ -1647,7 +1647,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/submissions/#{s1.user_id}",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => @assignment.id.to_s, :id => s1.user_id.to_s },
+            :assignment_id => @assignment.id.to_s, :user_id => s1.user_id.to_s },
           { :submission => { :posted_grade => '10' } })
     @submission = @assignment.submission_for_student(s1.user)
     @submission.should be_present
@@ -1658,7 +1658,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/courses/#{@course.id}/assignments/#{@assignment.id}/submissions/#{s2.user_id}",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :course_id => @course.id.to_s,
-            :assignment_id => @assignment.id.to_s, :id => s2.user_id.to_s },
+            :assignment_id => @assignment.id.to_s, :user_id => s2.user_id.to_s },
           { :submission => { :posted_grade => '10' } })
     response.status.should == "404 Not Found"
 
@@ -1667,7 +1667,7 @@ describe 'Submissions API', :type => :integration do
           "/api/v1/sections/#{section2.id}/assignments/#{@assignment.id}/submissions/#{s2.user_id}",
           { :controller => 'submissions_api', :action => 'update',
             :format => 'json', :section_id => section2.id.to_s,
-            :assignment_id => @assignment.id.to_s, :id => s2.user_id.to_s },
+            :assignment_id => @assignment.id.to_s, :user_id => s2.user_id.to_s },
           { :submission => { :posted_grade => '10' } })
     response.status.should == "404 Not Found"
   end