diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 18:08:10 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 18:08:10 +0000 |
| commit | 175b4fa261259ab0d033482d10bb4159fee8e538 (patch) | |
| tree | e1f1dba5e41177f11ffded5a505e0e7f692b8df5 /spec/lib/gitlab/highlight_spec.rb | |
| parent | 4eea104c69e59f6fa53c7bc15b986c69f29b60c8 (diff) | |
| download | gitlab-ce-175b4fa261259ab0d033482d10bb4159fee8e538.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/highlight_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/highlight_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/highlight_spec.rb b/spec/lib/gitlab/highlight_spec.rb index 5a45d724b83..2140cbae488 100644 --- a/spec/lib/gitlab/highlight_spec.rb +++ b/spec/lib/gitlab/highlight_spec.rb @@ -111,7 +111,7 @@ describe Gitlab::Highlight do end it 'utilizes longer timeout for sidekiq' do - allow(Sidekiq).to receive(:server?).and_return(true) + allow(Gitlab::Runtime).to receive(:sidekiq?).and_return(true) expect(Timeout).to receive(:timeout).with(described_class::TIMEOUT_BACKGROUND).and_call_original subject.highlight("Content") |