diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-19 03:07:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-19 03:07:58 +0300 |
commit | 41456efd551f45f569a8c9e70734c88efbbbf0ec (patch) | |
tree | 4ac9d0f1773a8786ba263e88e3d472afcff3d3c1 /spec/models/remote_mirror_spec.rb | |
parent | fe289cff8b1b94020d22f7b3ff1c385a05086b9e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/remote_mirror_spec.rb')
-rw-r--r-- | spec/models/remote_mirror_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/remote_mirror_spec.rb b/spec/models/remote_mirror_spec.rb index 356b0e18559..a87cdcf9344 100644 --- a/spec/models/remote_mirror_spec.rb +++ b/spec/models/remote_mirror_spec.rb @@ -147,13 +147,13 @@ describe RemoteMirror, :mailer do git_remote_mirror = stub_const('Gitlab::Git::RemoteMirror', spy) mirror = build(:remote_mirror) - expect(mirror).to receive(:options_for_update).and_return(options: true) + expect(mirror).to receive(:options_for_update).and_return(keep_divergent_refs: true) mirror.update_repository expect(git_remote_mirror).to have_received(:new).with( mirror.project.repository.raw, mirror.remote_name, - options: true + keep_divergent_refs: true ) expect(git_remote_mirror).to have_received(:update) end |