diff options
author | Sean McGivern <sean@gitlab.com> | 2018-02-23 17:25:14 +0300 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2018-02-26 12:08:17 +0300 |
commit | e351f67874fb98d1d40bd32dca8d9a44a4fc8582 (patch) | |
tree | 1974848257aded1276832ee4ba16c329d3c69b45 /spec/lib/gitlab/git | |
parent | bb0fe96f75c6a39e57ac5e9f1895a85f8453e3a5 (diff) |
Suppress whitespace warnings in squash error messages
These are obscuring the real error, which is confusing for everyone.
Diffstat (limited to 'spec/lib/gitlab/git')
-rw-r--r-- | spec/lib/gitlab/git/repository_spec.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb index d601a383a98..13358995383 100644 --- a/spec/lib/gitlab/git/repository_spec.rb +++ b/spec/lib/gitlab/git/repository_spec.rb @@ -2283,6 +2283,20 @@ describe Gitlab::Git::Repository, seed_helper: true do expect(subject).to match(/\h{40}/) end end + + context 'with trailing whitespace in an invalid patch', :skip_gitaly_mock do + let(:diff) { "diff --git a/README.md b/README.md\nindex faaf198..43c5edf 100644\n--- a/README.md\n+++ b/README.md\n@@ -1,4 +1,4 @@\n-testme\n+ \n ====== \n \n Sample repo for testing gitlab features\n" } + + it 'does not include whitespace warnings in the error' do + allow(repository).to receive(:run_git!).and_call_original + allow(repository).to receive(:run_git!).with(%W(diff --binary #{start_sha}...#{end_sha})).and_return(diff.force_encoding('ASCII-8BIT')) + + expect { subject }.to raise_error do |error| + expect(error).to be_a(described_class::GitError) + expect(error.message).not_to include('trailing whitespace') + end + end + end end end |