diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-15 10:12:06 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-15 10:12:06 +0000 |
| commit | 659ec83b845e85c27acf70764f95203aff2075ab (patch) | |
| tree | 535e0078ebd8697838d82347d822aaaa0c532554 /spec/support | |
| parent | 2b3313697f370d31abdda4177701ba20b66ba3e6 (diff) | |
| parent | d73458bbc51acf98bc2a2d4d86e10136ab75ca31 (diff) | |
| download | gitlab-ce-659ec83b845e85c27acf70764f95203aff2075ab.tar.gz | |
Merge branch 'ce-rc/move-more-ee-only-spec-files' into 'master'
Port some changes from gitlab-ee!4532 back to CE
See merge request gitlab-org/gitlab-ce!17120
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/factory_bot.rb (renamed from spec/support/factory_girl.rb) | 0 | ||||
| -rw-r--r-- | spec/support/fixture_helpers.rb | 8 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/support/factory_girl.rb b/spec/support/factory_bot.rb index c7890e49c66..c7890e49c66 100644 --- a/spec/support/factory_girl.rb +++ b/spec/support/factory_bot.rb diff --git a/spec/support/fixture_helpers.rb b/spec/support/fixture_helpers.rb index 128aaaf25fe..8854382dc6b 100644 --- a/spec/support/fixture_helpers.rb +++ b/spec/support/fixture_helpers.rb @@ -1,12 +1,12 @@ module FixtureHelpers - def fixture_file(filename) + def fixture_file(filename, dir: '') return '' if filename.blank? - File.read(expand_fixture_path(filename)) + File.read(expand_fixture_path(filename, dir: dir)) end - def expand_fixture_path(filename) - File.expand_path(Rails.root.join('spec/fixtures/', filename)) + def expand_fixture_path(filename, dir: '') + File.expand_path(Rails.root.join(dir, 'spec', 'fixtures', filename)) end end |