diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-05-07 16:35:37 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-05-07 16:35:37 +0000 |
commit | f50d8079f0080e60a2e2c66f0cc93fc9bd6b1c80 (patch) | |
tree | 6a04d23ec3e93d5a90f401d3f36f216621e57c48 /spec/lib | |
parent | e1f6400f317160c5a1eb7ab792e7e25d1e1bb1e7 (diff) | |
parent | 1019dff2371b30979b33ce823abeadadad9cfab3 (diff) | |
download | gitlab-ce-f50d8079f0080e60a2e2c66f0cc93fc9bd6b1c80.tar.gz |
Merge branch 'ccr/weight_1481' into 'master'
Backport of 1481-changing-weight-values-should-trigger-system-notes
See merge request gitlab-org/gitlab-ce!18699
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/incoming_email_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/incoming_email_spec.rb b/spec/lib/gitlab/incoming_email_spec.rb index c959add7a36..ad087f42e06 100644 --- a/spec/lib/gitlab/incoming_email_spec.rb +++ b/spec/lib/gitlab/incoming_email_spec.rb @@ -24,7 +24,7 @@ describe Gitlab::IncomingEmail do end describe 'self.supports_wildcard?' do - context 'address contains the wildard placeholder' do + context 'address contains the wildcard placeholder' do before do stub_incoming_email_setting(address: 'replies+%{key}@example.com') end @@ -49,7 +49,7 @@ describe Gitlab::IncomingEmail do stub_incoming_email_setting(address: nil) end - it 'returns that wildard is not supported' do + it 'returns that wildcard is not supported' do expect(described_class.supports_wildcard?).to be_falsey end end |