summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-10-10 17:25:05 +0200
committerWinnie Hellmann <winnie@gitlab.com>2017-10-21 23:32:05 +0300
commit19e70e3f9ed5f5be38eb0bbbb46c3506c1da9a39 (patch)
tree9eef4eedcc321c93369931afdb2a0d09d746d6f5
parent567baf0e88594a8ff1ce4e818e2eedd8e6d47f01 (diff)
downloadgitlab-ce-19e70e3f9ed5f5be38eb0bbbb46c3506c1da9a39.tar.gz
Stub ENV in the Gitaly task spec file
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--spec/tasks/gitlab/gitaly_rake_spec.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/spec/tasks/gitlab/gitaly_rake_spec.rb b/spec/tasks/gitlab/gitaly_rake_spec.rb
index 1e9b20435ec..5dd8fe8eaa5 100644
--- a/spec/tasks/gitlab/gitaly_rake_spec.rb
+++ b/spec/tasks/gitlab/gitaly_rake_spec.rb
@@ -43,15 +43,8 @@ describe 'gitlab:gitaly namespace rake task' do
describe 'gmake/make' do
let(:command_preamble) { %w[/usr/bin/env -u RUBYOPT -u BUNDLE_GEMFILE] }
- before(:all) do
- @old_env_ci = ENV.delete('CI')
- end
-
- after(:all) do
- ENV['CI'] = @old_env_ci if @old_env_ci
- end
-
before do
+ stub_env('CI', false)
FileUtils.mkdir_p(clone_path)
expect(Dir).to receive(:chdir).with(clone_path).and_call_original
allow(Bundler).to receive(:bundle_path).and_return('/fake/bundle_path')