summaryrefslogtreecommitdiff
path: root/spec/requests
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-03-29 15:46:11 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-03-29 15:46:11 +0000
commit4d9cc9417039f93e4d90f5905a29b594648317b0 (patch)
tree4b088fecacc7b7a749403657778c6cf2a28578f6 /spec/requests
parent76a15db45f4911542241ae62fe871101f1f79a78 (diff)
parent340a6f8668b7d2ff997beef254896c43d8ab9c08 (diff)
downloadgitlab-ce-4d9cc9417039f93e4d90f5905a29b594648317b0.tar.gz
Merge branch 'gitaly-socket-per-shard' into 'master'
One Gitaly connection per storage shard See merge request !10150
Diffstat (limited to 'spec/requests')
-rw-r--r--spec/requests/api/internal_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb
index 63ec00cdf04..eed45d37444 100644
--- a/spec/requests/api/internal_spec.rb
+++ b/spec/requests/api/internal_spec.rb
@@ -424,12 +424,12 @@ describe API::Internal, api: true do
end
before do
- allow(Gitlab.config.gitaly).to receive(:socket_path).and_return('path/to/gitaly.socket')
+ allow(Gitlab.config.gitaly).to receive(:enabled).and_return(true)
end
it "calls the Gitaly client if it's enabled" do
expect_any_instance_of(Gitlab::GitalyClient::Notifications).
- to receive(:post_receive).with(project.repository.path)
+ to receive(:post_receive)
post api("/internal/notify_post_receive"), valid_params
@@ -438,7 +438,7 @@ describe API::Internal, api: true do
it "returns 500 if the gitaly call fails" do
expect_any_instance_of(Gitlab::GitalyClient::Notifications).
- to receive(:post_receive).with(project.repository.path).and_raise(GRPC::Unavailable)
+ to receive(:post_receive).and_raise(GRPC::Unavailable)
post api("/internal/notify_post_receive"), valid_params