diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-07 17:40:46 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-07 17:40:46 -0600 |
| commit | c1c74e608625eab143f44ef6940e64cca6af0a0c (patch) | |
| tree | c5ca4a8a39946f54878a3ecde6b4adcda11d2d9b /spec/support/stub_env.rb | |
| parent | cecea7529fb37893af6bf514a53e239a3be1eea6 (diff) | |
| parent | 8900b23eab6abd5a6c01278fa0da18d5bed98491 (diff) | |
| download | gitlab-ce-c1c74e608625eab143f44ef6940e64cca6af0a0c.tar.gz | |
Merge branch 'master' into fix-no-template
Diffstat (limited to 'spec/support/stub_env.rb')
| -rw-r--r-- | spec/support/stub_env.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/support/stub_env.rb b/spec/support/stub_env.rb index f621463e621..36b90fc68d6 100644 --- a/spec/support/stub_env.rb +++ b/spec/support/stub_env.rb @@ -1,9 +1,8 @@ # Inspired by https://github.com/ljkbennett/stub_env/blob/master/lib/stub_env/helpers.rb module StubENV - include Gitlab::CurrentSettings - def stub_env(key_or_hash, value = nil) init_stub unless env_stubbed? + if key_or_hash.is_a? Hash key_or_hash.each { |k, v| add_stubbed_value(k, v) } else |