diff --git a/Gemfile.lock b/Gemfile.lock index f1b75bfea..d9cbcb184 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -116,10 +116,10 @@ GEM docile (1.1.5) domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) - dotenv (2.1.2) - dotenv-rails (2.1.2) - dotenv (= 2.1.2) - railties (>= 3.2, < 5.1) + dotenv (2.2.1) + dotenv-rails (2.2.1) + dotenv (= 2.2.1) + railties (>= 3.2, < 5.2) equalizer (0.0.11) erubis (2.7.0) execjs (2.7.0) diff --git a/test/test_helper.rb b/test/test_helper.rb index 6ab56437e..04a3d3edd 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -16,6 +16,8 @@ require 'webmock/minitest' Dir[File.expand_path(File.dirname(__FILE__) + "/factories/*.rb")].each {|file| require file} Dir[File.expand_path(File.dirname(__FILE__) + "/test_helpers/*.rb")].each {|file| require file} +Dotenv.load(Rails.root + ".env.local") + Shoulda::Matchers.configure do |config| config.integrate do |with| with.library :rails