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

spec: add _core_en.js and selinimum files to whitelist 

rails4 modifies _core_en.js while running compile_assets (presumably due
to new formats), this will allow the rails4 build to be selinimized

also whitelist selinimum's own files, since changes to them don't affect
the actual selenium tests

test plan:
1. rails3 and rails4 builds of this commit should get selinimized

Change-Id: I0f012f8e900f44290f258a791c96d5ab6e4cc095
Reviewed-on: https://gerrit.instructure.com/60010
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
This commit is contained in:
Jon Jensen 2015-08-04 20:06:42 -06:00
parent 586ea66713
commit 0f85ad522d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gems/selinimum/lib/selinimum/detectors/whitelist_detector.rb
View File

@ -9,7 +9,9 @@ module Selinimum
return false if file =~ %r{\Aspec/fixtures/}
return true if file =~ %r{\.(txt|md|png|jpg|gif|ico|svg|html|yml)\z}
return true if file =~ %r{\A(spec/coffeescripts|doc|guard|bin|script|gems/rubocop-canvas\z)/}
return true if file =~ %r{\Agems/selinimum/}
return true if file == "spec/spec.opts"
return true if file == "public/javascripts/translations/_core_en.js"
return true if file == "Gemfile.d/test.rb" # TODO: this is :totes: temporary, just until https://gerrit.instructure.com/#/c/58088/ lands and we can remove testbot from canvas-lms proper
false
end