diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2017-08-01 13:05:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-01 13:05:23 -0500 |
| commit | d66fadeb676eec32670b944cdf9fb273deba31aa (patch) | |
| tree | 459a9238f6dbca2611def41c2f1c172abba7bf70 /activestorage/test | |
| parent | 7f54123f988167134248152badc4525625b3e3f9 (diff) | |
| parent | 8b20789cfcc1f3e99742fd20f2e6079b231a9eae (diff) | |
| download | rails-d66fadeb676eec32670b944cdf9fb273deba31aa.tar.gz rails-d66fadeb676eec32670b944cdf9fb273deba31aa.tar.bz2 rails-d66fadeb676eec32670b944cdf9fb273deba31aa.zip | |
Merge pull request #30030 from claudiob/only-disk
Let ActiveStorage tests pass only for Disk
Diffstat (limited to 'activestorage/test')
| -rw-r--r-- | activestorage/test/test_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activestorage/test/test_helper.rb b/activestorage/test/test_helper.rb index 7826c1aeba..5b6d3b64c2 100644 --- a/activestorage/test/test_helper.rb +++ b/activestorage/test/test_helper.rb @@ -14,7 +14,9 @@ require "active_storage" require "yaml" SERVICE_CONFIGURATIONS = begin - YAML.load(ERB.new(Pathname.new(File.expand_path("../service/configurations.yml", __FILE__)).read).result).deep_symbolize_keys + erb = ERB.new(Pathname.new(File.expand_path("../service/configurations.yml", __FILE__)).read) + configuration = YAML.load(erb.result) || {} + configuration.deep_symbolize_keys rescue Errno::ENOENT puts "Missing service configuration file in test/service/configurations.yml" {} |