ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove some duplicate hash keys 

Change-Id: I19a2afcfbbd40e5c3ab638384f84e4b9ad907f41
Reviewed-on: https://gerrit.instructure.com/56174
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
Cody Cutrer 2015-06-10 13:52:56 -06:00
parent e934af35db
commit 43ab37b7db
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/turnitin.rb
View File

@ -88,7 +88,7 @@ module Turnitin
end
def createCourse(course)
sendRequest(:create_course, 2, :utp => '2', :course => course, :user => course, :utp => '2')
sendRequest(:create_course, 2, :course => course, :user => course, :utp => '2')
end
def enrollStudent(course, student)

1
spec/apis/v1/assignments_api_spec.rb
View File

@ -2023,7 +2023,6 @@ describe AssignmentsApiController, type: :request do
'require_initial_post' => nil,
'discussion_subentry_count' => 0,
'assignment_id' => @assignment.id,
'published' => true,
'delayed_post_at' => nil,
'lock_at' => nil,
'user_name' => @topic.user_name,

2
spec/apis/v1/pseudonyms_api_spec.rb
View File

@ -210,7 +210,7 @@ describe PseudonymsController, type: :request do
@admin.pseudonyms.create!(:unique_id => 'admin@example.com')
@teacher.pseudonyms.create!(:unique_id => 'teacher@example.com')
@path = "/api/v1/accounts/#{@account.id}/logins/#{@student.pseudonym.id}"
@path_options = { :controller => 'pseudonyms', :action => 'create', :format => 'json', :action => 'update', :account_id => @account.id.to_param, :id => @student.pseudonym.id.to_param }
@path_options = { :controller => 'pseudonyms', :format => 'json', :action => 'update', :account_id => @account.id.to_param, :id => @student.pseudonym.id.to_param }
a = Account.find(Account.default)
a.settings[:admins_can_change_passwords] = true
a.save!

5
spec/apis/v1/users_api_spec.rb
View File

@ -72,7 +72,6 @@ describe Api::V1::User do
expect(@test_api.user_json(@user, @admin, {}, [], Account.default)).to eq({
'name' => 'User',
'sortable_name' => 'User',
'sis_user_id' => 'xyz',
'sis_import_id' => nil,
'id' => @user.id,
'short_name' => 'User',
@ -94,7 +93,6 @@ describe Api::V1::User do
expect(@test_api.user_json(@user, @admin, {}, [], Account.default)).to eq({
'name' => 'User',
'sortable_name' => 'User',
'sis_user_id' => 'xyz',
'sis_import_id' => sis_batch.id,
'id' => @user.id,
'short_name' => 'User',
@ -181,7 +179,6 @@ describe Api::V1::User do
@test_api.user_json(@student, @admin, {}, [])
end).to eq({ "name"=>"Student",
"sortable_name"=>"Student",
"sis_user_id"=>"sis-user-id",
"id"=>@student.id,
"short_name"=>"Student",
"sis_user_id"=>"sis-user-id",
@ -368,7 +365,6 @@ describe "Users API", type: :request do
expect(json).to eq({
'name' => @other_user.name,
'sortable_name' => @other_user.sortable_name,
'sis_user_id' => @other_user.pseudonym.sis_user_id,
'sis_import_id' => nil,
'id' => @other_user.id,
'short_name' => @other_user.short_name,
@ -425,7 +421,6 @@ describe "Users API", type: :request do
expect(json).to eq [{
'name' => user.name,
'sortable_name' => user.sortable_name,
'sis_user_id' => user.pseudonym.sis_user_id,
'sis_import_id' => nil,
'id' => user.id,
'short_name' => user.short_name,