about summary refs log tree commit diff
path: root/spec/rails_helper.rb
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-10-08 13:51:33 +0200
committerThibaut Girka <thib@sitedethib.com>2018-10-08 13:51:33 +0200
commitd17844e6d1ad700df0f704972e2ce16e8693d33b (patch)
treeada49442558fb14c6cf97e79fb6e2dcaa237c7a6 /spec/rails_helper.rb
parent96c3d26870d4c8db1978c86b259e85d060d6f271 (diff)
parent4c4ff05a461eddafbf38c603b1bf2029be36a0b9 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'spec/rails_helper.rb')
-rw-r--r--spec/rails_helper.rb4
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!