Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2017-06-13 00:37:43 +0300
committerAlejandro Rodríguez <alejorro70@gmail.com>2017-06-15 02:33:43 +0300
commit58821ebbb4fa1bbd280749ca2f64d7592a852c98 (patch)
tree72e1fad3639d2132e7ef554c67e12f1c848c7453 /spec/support/matchers
parent5468bf7e0b2c6bf39f5a9b43b5b3864e7e57556d (diff)
Stop using deprecated `path` field on Gitaly messages
This revealed an error in our configuration generation in gitlab:gitaly:install rake task. The fix is included
Diffstat (limited to 'spec/support/matchers')
-rw-r--r--spec/support/matchers/gitaly_matchers.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/spec/support/matchers/gitaly_matchers.rb b/spec/support/matchers/gitaly_matchers.rb
index ed14bcec9f2..ebfabcd8f24 100644
--- a/spec/support/matchers/gitaly_matchers.rb
+++ b/spec/support/matchers/gitaly_matchers.rb
@@ -1,5 +1,10 @@
-RSpec::Matchers.define :gitaly_request_with_repo_path do |path|
- match { |actual| actual.repository.path == path }
+RSpec::Matchers.define :gitaly_request_with_path do |storage_name, relative_path|
+ match do |actual|
+ repository = actual.repository
+
+ repository.storage_name == storage_name &&
+ repository.relative_path == relative_path
+ end
end
RSpec::Matchers.define :gitaly_request_with_params do |params|