diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-02 00:11:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-02 00:11:09 +0300 |
commit | 11b7785066d3e81916cbf653f4eb6568148f7e01 (patch) | |
tree | d4e66091e1cbef57db10d2c9c16cd98106e9a633 /spec/helpers | |
parent | 69f0d90aad454a2b8f3c4e2f2ca31886a14a8642 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/helpers')
-rw-r--r-- | spec/helpers/ci/pipeline_editor_helper_spec.rb | 7 | ||||
-rw-r--r-- | spec/helpers/notifications_helper_spec.rb | 16 |
2 files changed, 0 insertions, 23 deletions
diff --git a/spec/helpers/ci/pipeline_editor_helper_spec.rb b/spec/helpers/ci/pipeline_editor_helper_spec.rb index 8f38d3b1439..7686983eb0f 100644 --- a/spec/helpers/ci/pipeline_editor_helper_spec.rb +++ b/spec/helpers/ci/pipeline_editor_helper_spec.rb @@ -19,12 +19,5 @@ RSpec.describe Ci::PipelineEditorHelper do expect(subject).to be false end - - it 'user can not view editor if feature is disabled' do - allow(helper).to receive(:can_collaborate_with_project?).and_return(true) - stub_feature_flags(ci_pipeline_editor_page: false) - - expect(subject).to be false - end end end diff --git a/spec/helpers/notifications_helper_spec.rb b/spec/helpers/notifications_helper_spec.rb index 555cffba614..a5338659659 100644 --- a/spec/helpers/notifications_helper_spec.rb +++ b/spec/helpers/notifications_helper_spec.rb @@ -19,22 +19,6 @@ RSpec.describe NotificationsHelper do it { expect(notification_title(:global)).to match('Global') } end - describe '#notification_event_name' do - context 'for success_pipeline' do - it 'returns the custom name' do - expect(FastGettext).to receive(:cached_find).with('NotificationEvent|Successful pipeline') - expect(notification_event_name(:success_pipeline)).to eq('Successful pipeline') - end - end - - context 'for everything else' do - it 'returns a humanized name' do - expect(FastGettext).to receive(:cached_find).with('NotificationEvent|Failed pipeline') - expect(notification_event_name(:failed_pipeline)).to eq('Failed pipeline') - end - end - end - describe '#notification_icon_level' do let(:user) { create(:user) } let(:global_setting) { user.global_notification_setting } |