diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-30 09:09:18 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-30 09:09:18 +0300 |
commit | f38060aeee94f359484c17797881aca4f5f826a9 (patch) | |
tree | 4e4ed5bfccf7b7f33c8c4ae70f7afbd124256a89 /spec/views | |
parent | cef84e8da0fb449df51cec1e76f7c0371be83906 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/views')
-rw-r--r-- | spec/views/notify/user_deactivated_email.html.haml_spec.rb | 12 | ||||
-rw-r--r-- | spec/views/notify/user_deactivated_email.text.erb_spec.rb | 12 |
2 files changed, 0 insertions, 24 deletions
diff --git a/spec/views/notify/user_deactivated_email.html.haml_spec.rb b/spec/views/notify/user_deactivated_email.html.haml_spec.rb index 25d18e37cb9..cc005fc0502 100644 --- a/spec/views/notify/user_deactivated_email.html.haml_spec.rb +++ b/spec/views/notify/user_deactivated_email.html.haml_spec.rb @@ -28,18 +28,6 @@ RSpec.describe 'notify/user_deactivated_email.html.haml', feature_category: :use expect(rendered).to have_content(/So long and thanks for all the fish!$/) end end - - context 'when additional text feature flag is disabled' do - before do - stub_feature_flags(deactivation_email_additional_text: false) - end - - it 'does not display the additional text' do - render - - expect(rendered).to have_content(/Please contact your GitLab administrator if you think this is an error\.$/) - end - end end context 'when additional text setting is not set' do diff --git a/spec/views/notify/user_deactivated_email.text.erb_spec.rb b/spec/views/notify/user_deactivated_email.text.erb_spec.rb index 8cf56816b92..60379714ff2 100644 --- a/spec/views/notify/user_deactivated_email.text.erb_spec.rb +++ b/spec/views/notify/user_deactivated_email.text.erb_spec.rb @@ -30,18 +30,6 @@ RSpec.describe 'notify/user_deactivated_email.text.erb', feature_category: :user expect(rendered).to have_content(/So long and thanks for all the fish!$/) end end - - context 'when additional text feature flag is disabled' do - before do - stub_feature_flags(deactivation_email_additional_text: false) - end - - it 'does not display the additional text' do - render - - expect(rendered).to have_content(/Please contact your GitLab administrator if you think this is an error\.$/) - end - end end context 'when additional text setting is not set' do |