diff options
Diffstat (limited to 'spec/lib/gitlab/git')
| -rw-r--r-- | spec/lib/gitlab/git/repository_spec.rb | 3 | ||||
| -rw-r--r-- | spec/lib/gitlab/git/wraps_gitaly_errors_spec.rb | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb index 9ecd281cce0..c7b68ff3e28 100644 --- a/spec/lib/gitlab/git/repository_spec.rb +++ b/spec/lib/gitlab/git/repository_spec.rb @@ -2238,7 +2238,6 @@ RSpec.describe Gitlab::Git::Repository, :seed_helper do end describe '#squash' do - let(:squash_id) { '1' } let(:branch_name) { 'fix' } let(:start_sha) { '4b4918a572fa86f9771e5ba40fbd48e1eb03e2c6' } let(:end_sha) { '12d65c8dd2b2676fa3ac47d955accc085a37a9c1' } @@ -2252,7 +2251,7 @@ RSpec.describe Gitlab::Git::Repository, :seed_helper do message: 'Squash commit message' } - repository.squash(user, squash_id, opts) + repository.squash(user, opts) end # Should be ported to gitaly-ruby rspec suite https://gitlab.com/gitlab-org/gitaly/issues/1234 diff --git a/spec/lib/gitlab/git/wraps_gitaly_errors_spec.rb b/spec/lib/gitlab/git/wraps_gitaly_errors_spec.rb index 2c9da0f6606..e551dfaa1c5 100644 --- a/spec/lib/gitlab/git/wraps_gitaly_errors_spec.rb +++ b/spec/lib/gitlab/git/wraps_gitaly_errors_spec.rb @@ -12,6 +12,7 @@ RSpec.describe Gitlab::Git::WrapsGitalyErrors do mapping = { GRPC::NotFound => Gitlab::Git::Repository::NoRepository, GRPC::InvalidArgument => ArgumentError, + GRPC::DeadlineExceeded => Gitlab::Git::CommandTimedOut, GRPC::BadStatus => Gitlab::Git::CommandError } |