jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update dotenv.

Browse Source 
dotenv-2.2.1 no longer loads .env.local in the test environment. Load it
manually for backwards compatibility.
This commit is contained in:
evazion
2018-01-20 18:25:59 -06:00
parent 074a4be38f
commit 46b0f9e6d6
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Gemfile.lock
View File

@@ -116,10 +116,10 @@ GEM
docile (1.1.5) docile (1.1.5)
domain_name (0.5.20170404) domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
dotenv (2.1.2) dotenv (2.2.1)
dotenv-rails (2.1.2) dotenv-rails (2.2.1)
dotenv (= 2.1.2) dotenv (= 2.2.1)
railties (>= 3.2, < 5.1) railties (>= 3.2, < 5.2)
equalizer (0.0.11) equalizer (0.0.11)
erubis (2.7.0) erubis (2.7.0)
execjs (2.7.0) execjs (2.7.0)

2
test/test_helper.rb
View File

@@ -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__) + "/factories/*.rb")].each {|file| require file}
Dir[File.expand_path(File.dirname(__FILE__) + "/test_helpers/*.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| Shoulda::Matchers.configure do |config|
config.integrate do |with| config.integrate do |with|
with.library :rails with.library :rails