diff options
| author | Phil Hughes <me@iamphill.com> | 2017-04-13 20:08:47 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-04-13 20:08:47 +0100 |
| commit | 1d99c7755ce337a715847344f4f20df23b29bfc7 (patch) | |
| tree | d18b0951f07332939c873e300a4b4079e422ad3c /spec/support | |
| parent | a8b7a4b71760932341b3a58542b5702495d65ba9 (diff) | |
| parent | 7d7dfee48b3455eec07968e7517f9d843a04da66 (diff) | |
| download | gitlab-ce-1d99c7755ce337a715847344f4f20df23b29bfc7.tar.gz | |
Merge branch 'master' into notebooklab-in-reponotebooklab-in-repo
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/fixture_helpers.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/support/fixture_helpers.rb b/spec/support/fixture_helpers.rb index a05c9d18002..5515c355cea 100644 --- a/spec/support/fixture_helpers.rb +++ b/spec/support/fixture_helpers.rb @@ -1,8 +1,11 @@ module FixtureHelpers def fixture_file(filename) return '' if filename.blank? - file_path = File.expand_path(Rails.root.join('spec/fixtures/', filename)) - File.read(file_path) + File.read(expand_fixture_path(filename)) + end + + def expand_fixture_path(filename) + File.expand_path(Rails.root.join('spec/fixtures/', filename)) end end |