diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-09-03 06:23:55 +0400 |
|---|---|---|
| committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-09-03 06:23:55 +0400 |
| commit | ee64428a406674ee20365cabb79b95536d3687f1 (patch) | |
| tree | e55f239e86e9073b8df92aea67c2f373f08dfc3d /test | |
| parent | 4ae2c8b8863aef79c326059f29fe4afbf9d75162 (diff) | |
| parent | 881ce27c6b4101698ea849283933203e20861a33 (diff) | |
Merge branch 'master' into next
Conflicts:
assets/stylesheets/bootstrap/_variables.scss
lib/bootstrap-sass/version.rb
test/test_helper.rb
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_helper.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/test_helper.rb b/test/test_helper.rb index 21e946c..c1c1e9a 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -4,10 +4,10 @@ Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new require 'active_support/core_ext/kernel/reporting' -Dir.chdir 'test' do - Dir['support/**/*.rb'].each do |file| - require file - end +Dir['test/support/**/*.rb'].each do |file| + # strip ^test/ and .rb$ + file = file[5..-4] + require_relative File.join('.', file) end GEM_PATH = File.expand_path('../', File.dirname(__FILE__)) |