diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-04-11 00:55:02 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-04-11 00:55:02 +0100 |
| commit | 3f73bdd837f9803b75eca484a0a0615db6c58c80 (patch) | |
| tree | 0bd2c99d9198bfa22e7a29f375131f940033da7b /spec/spec_helper.rb | |
| parent | b594ab949d1a2ceb9d949ff2641679fbdf273452 (diff) | |
| parent | 37a5632483b67ddcfa4c535cc911319b25f01fb5 (diff) | |
| download | gitlab-ce-xterm-npm.tar.gz | |
Merge branch 'master' into xterm-npmxterm-npm
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e8cecf361ff..83664bae046 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -66,6 +66,7 @@ RSpec.configure do |config| config.include MigrationsHelpers, :migration config.include StubFeatureFlags config.include StubENV + config.include ExpectOffense config.infer_spec_type_from_file_location! @@ -108,7 +109,8 @@ RSpec.configure do |config| allow_any_instance_of(Gitlab::Git::GitlabProjects).to receive(:fork_repository).and_wrap_original do |m, *args| m.call(*args) - shard_path, repository_relative_path = args + shard_name, repository_relative_path = args + shard_path = Gitlab.config.repositories.storages.fetch(shard_name).legacy_disk_path # We can't leave the hooks in place after a fork, as those would fail in tests # The "internal" API is not available FileUtils.rm_rf(File.join(shard_path, repository_relative_path, 'hooks')) |