diff options
author | JantsoP <jantso.porali@gmail.com> | 2017-04-05 10:07:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-05 10:07:17 +0200 |
commit | 20b53e6add351e5bb5ff1bd4d675db6252e03293 (patch) | |
tree | e252e354e63765d1f28919f2ac58de26001806cb /spec/rails_helper.rb | |
parent | 3ec221d3b7093e2a2606ec04036cca9e9f1f733d (diff) | |
parent | ccb6a658fd1a2e596c95d5b8e7a39f72a5f5b14b (diff) |
Merge branch 'master' into master
Diffstat (limited to 'spec/rails_helper.rb')
-rw-r--r-- | spec/rails_helper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 977c7bdc0..faac96982 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -8,6 +8,8 @@ require 'rspec/rails' require 'webmock/rspec' require 'paperclip/matchers' +Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f } + ActiveRecord::Migration.maintain_test_schema! WebMock.disable_net_connect!(allow: 'localhost:7575') Sidekiq::Testing.inline! |