diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-09 12:11:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-09 12:11:14 +0200 |
| commit | 4134a10549a833ad5ab18b3c579304919d594ce1 (patch) | |
| tree | 696f4b453ad029ffda3d0925c484c11b27b95cc6 /spec/rails_helper.rb | |
| parent | d0b1369a853dc2e5b7934c148547f71f8d103859 (diff) | |
| parent | b368d3c15ddfca983e89ff2858f7f03eb7147d83 (diff) | |
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/rails_helper.rb')
| -rw-r--r-- | spec/rails_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 79e80220c..1ded751ab 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -72,11 +72,11 @@ RSpec::Sidekiq.configure do |config| end def request_fixture(name) - File.read(File.join(Rails.root, 'spec', 'fixtures', 'requests', name)) + File.read(Rails.root.join('spec', 'fixtures', 'requests', name)) end def attachment_fixture(name) - File.open(File.join(Rails.root, 'spec', 'fixtures', 'files', name)) + File.open(Rails.root.join('spec', 'fixtures', 'files', name)) end def stub_jsonld_contexts! |