diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-09 21:08:33 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-09 21:08:33 +0000 |
commit | b296ffa543e23f57fa2692539e6f0028c59e2203 (patch) | |
tree | f5224a37cac088506d1c8fd53925ee1d9fd2a02c /spec/workers/post_receive_spec.rb | |
parent | c172bb9967f280e05bd904188d60a959dff10f00 (diff) | |
download | gitlab-ce-b296ffa543e23f57fa2692539e6f0028c59e2203.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers/post_receive_spec.rb')
-rw-r--r-- | spec/workers/post_receive_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb index f64ee4aa2f7..50d164d1705 100644 --- a/spec/workers/post_receive_spec.rb +++ b/spec/workers/post_receive_spec.rb @@ -27,7 +27,7 @@ RSpec.describe PostReceive do context 'with a non-existing project' do let(:gl_repository) { "project-123456789" } let(:error_message) do - "Triggered hook for non-existing project with gl_repository \"#{gl_repository}\"" + "Triggered hook for non-existing gl_repository \"#{gl_repository}\"" end it "returns false and logs an error" do @@ -314,7 +314,7 @@ RSpec.describe PostReceive do it 'processes the changes on the master branch' do expect_next_instance_of(Git::WikiPushService) do |service| - expect(service).to receive(:process_changes).and_call_original + expect(service).to receive(:execute).and_call_original end expect(project.wiki).to receive(:default_branch).twice.and_return(default_branch) expect(project.wiki.repository).to receive(:raw).and_return(raw_repo) @@ -334,7 +334,7 @@ RSpec.describe PostReceive do before do allow_next_instance_of(Git::WikiPushService) do |service| - allow(service).to receive(:process_changes) + allow(service).to receive(:execute) end end |