Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 2 deletions

diff --git a/spec/lib/gitlab/gitaly_client/operation_service_spec.rb b/spec/lib/gitlab/gitaly_client/operation_service_spec.rb
index f741a91b660..d4337c51279 100644
--- a/spec/lib/gitlab/gitaly_client/operation_service_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/operation_service_spec.rb
@@ -211,10 +211,12 @@ describe Gitlab::GitalyClient::OperationService do
     end
 
     context 'when a create_tree_error is present' do
-      let(:response) { response_class.new(create_tree_error: "something failed") }
+      let(:response) { response_class.new(create_tree_error: "something failed", create_tree_error_code: 'EMPTY') }
 
       it 'raises a CreateTreeError' do
-        expect { subject }.to raise_error(Gitlab::Git::Repository::CreateTreeError, "something failed")
+        expect { subject }.to raise_error(Gitlab::Git::Repository::CreateTreeError) do |error|
+          expect(error.error_code).to eq(:empty)
+        end
       end
     end