diff options
author | Rémy Coutable <remy@rymai.me> | 2018-12-18 08:59:21 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-12-18 08:59:21 +0000 |
commit | aa343d546c529c571e6c156366b62d2f721fe92e (patch) | |
tree | fb9588aadff4515dab5a7e4d2d842f246ef478a7 /spec/lib | |
parent | 651d12645b28a05a5a20734c5b3019b71eaa3dd2 (diff) | |
parent | 236876f27823953138bb212db284782032d117d4 (diff) | |
download | gitlab-ce-aa343d546c529c571e6c156366b62d2f721fe92e.tar.gz |
Merge branch 'blackst0ne-improve-encoding-helper-spec' into 'master'
Update specs to exclude possible false positive pass
Closes #55403
See merge request gitlab-org/gitlab-ce!23893
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/encoding_helper_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/gpg_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/encoding_helper_spec.rb b/spec/lib/gitlab/encoding_helper_spec.rb index a5bf2f2b3df..429816efec3 100644 --- a/spec/lib/gitlab/encoding_helper_spec.rb +++ b/spec/lib/gitlab/encoding_helper_spec.rb @@ -124,7 +124,7 @@ describe Gitlab::EncodingHelper do end it 'returns empty string on conversion errors' do - expect { ext_class.encode_utf8('') }.not_to raise_error(ArgumentError) + expect { ext_class.encode_utf8('') }.not_to raise_error end context 'with strings that can be forcefully encoded into utf8' do diff --git a/spec/lib/gitlab/gpg_spec.rb b/spec/lib/gitlab/gpg_spec.rb index 39d09c49989..48bbd7f854c 100644 --- a/spec/lib/gitlab/gpg_spec.rb +++ b/spec/lib/gitlab/gpg_spec.rb @@ -137,7 +137,7 @@ describe Gitlab::Gpg do described_class.using_tmp_keychain do end end - end.not_to raise_error(ThreadError) + end.not_to raise_error end end end |