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

fix context_modules_controller_spec for rails 3 

Change-Id: I453aa576bad33454b669b6efc4810a15ad7bcdd7
Reviewed-on: https://gerrit.instructure.com/29844
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
Cody Cutrer 2014-02-07 16:20:45 -07:00
parent 74d508b1fb
commit 497dd2f917
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spec/controllers/context_modules_controller_spec.rb
View File

@ -104,19 +104,19 @@ describe ContextModulesController do
assignmentTag2 = @module.add_item :type => 'assignment', :id => assignment2.id
header2 = @module.add_item :type => 'context_module_sub_header'
get 'module_redirect', :course_id => @course.id, :context_module_id => @module.id, :first => 1
get 'module_redirect', :course_id => @course.id, :context_module_id => @module.id, :first => 1, :use_route => :course_context_module_first_redirect
response.should redirect_to course_assignment_url(@course.id, assignment1.id, :module_item_id => assignmentTag1.id)
get 'module_redirect', :course_id => @course.id, :context_module_id => @module.id, :last => 1
get 'module_redirect', :course_id => @course.id, :context_module_id => @module.id, :last => 1, :use_route => :course_context_module_last_redirect
response.should redirect_to course_assignment_url(@course.id, assignment2.id, :module_item_id => assignmentTag2.id)
assignmentTag1.destroy
assignmentTag2.destroy
get 'module_redirect', :course_id => @course.id, :context_module_id => @module.id, :first => 1
get 'module_redirect', :course_id => @course.id, :context_module_id => @module.id, :first => 1, :use_route => :course_context_module_first_redirect
response.should redirect_to course_context_modules_url(@course.id, :anchor => "module_#{@module.id}")
get 'module_redirect', :course_id => @course.id, :context_module_id => @module.id, :last => 1
get 'module_redirect', :course_id => @course.id, :context_module_id => @module.id, :last => 1, :use_route => :course_context_module_last_redirect
response.should redirect_to course_context_modules_url(@course.id, :anchor => "module_#{@module.id}")
end
end
@ -342,7 +342,7 @@ describe ContextModulesController do
tags << make_content_tag(assign, @course, mod)
end
ContextModule.expects(:update_all).once
ContentTag.expects(:touch_context_modules).once
order = tags.reverse.map(&:id)
post 'reorder_items', :course_id => @course.id, :context_module_id => mod.id, :order => order.join(",")
mod.reload.content_tags.map(&:id).should == order

10
spec/spec_helper.rb
View File

@ -49,6 +49,16 @@ if CANVAS_RAILS2
end
alias :describe_without_rspec2_types :describe
alias :describe :describe_with_rspec2_types
ActionController::TestProcess.module_eval do
def process_with_use_route_shim(action, parameters = nil, session = nil, flash = nil, http_method = 'GET')
if parameters.is_a?(Hash)
parameters.delete(:use_route)
end
process_without_use_route_shim(action, parameters, session, flash, http_method)
end
alias_method_chain :process, :use_route_shim
end
else
require 'rspec/rails'
end