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

fix global account js specs for rails 3 

apparently oj is even more conservative than activesupport, and escapes
forward slashes

Change-Id: Ib7c2be9d049034890e3646ed11c8297ae6ea5f6d
Reviewed-on: https://gerrit.instructure.com/31783
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
Cody Cutrer 2014-03-11 22:25:29 -06:00
parent f8ac07ddb8
commit 28ba55eae6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spec/helpers/application_helper_spec.rb
View File

@ -291,7 +291,7 @@ describe ApplicationHelper do
output = include_account_js
output.should have_tag 'script'
output.should match %r{/path/to/js}
output.should match %r{\\?/path\\?/to\\?/js}
end
it "should include site admin javascript" do
@ -301,7 +301,7 @@ describe ApplicationHelper do
output = include_account_js
output.should have_tag 'script'
output.should match %r{/path/to/js}
output.should match %r{\\?/path\\?/to\\?/js}
end
it "should include both site admin and root account javascript, site admin first" do
@ -315,7 +315,7 @@ describe ApplicationHelper do
output = include_account_js
output.should have_tag 'script'
output.scan(%r{/path/to/(admin/|root/)?js}).should eql [['admin/'], ['root/']]
output.scan(%r{\\?/path\\?/to\\?/(admin|root)?\\?/?js}).should eql [['admin'], ['root']]
end
end
end
@ -325,7 +325,7 @@ describe ApplicationHelper do
@site_admin = Account.site_admin
@site_admin.expects(:global_includes_hash).once.returns({:css => "/path/to/css", :js => "/path/to/js"})
include_account_css.should match %r{/path/to/css}
include_account_js.should match %r{/path/to/js}
include_account_js.should match %r{\\?/path\\?/to\\?/js}
end
it "should only compute includes once, with includes" do