diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-20 12:11:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-20 12:11:11 +0300 |
commit | 9fa24e4f9c5440e2ddc27cd787df5f5e669bed25 (patch) | |
tree | 6e0d1985050d6ef76ff1e451dce0eebcabc1e43e /spec/tooling/danger | |
parent | fe9e084c1de1c8bb98172b7bf7a61ca044878173 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/tooling/danger')
-rw-r--r-- | spec/tooling/danger/rubocop_inline_disable_suggestion_spec.rb | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/spec/tooling/danger/rubocop_inline_disable_suggestion_spec.rb b/spec/tooling/danger/rubocop_inline_disable_suggestion_spec.rb index 94dd5192d74..7af5df1e3bd 100644 --- a/spec/tooling/danger/rubocop_inline_disable_suggestion_spec.rb +++ b/spec/tooling/danger/rubocop_inline_disable_suggestion_spec.rb @@ -73,6 +73,20 @@ RSpec.describe Tooling::Danger::RubocopInlineDisableSuggestion, feature_category show_out_of_pipeline_minutes_notification?(project, namespace) end + + def show_my_new_dot?(project, namespace) + return false unless ::Gitlab.com? # rubocop: todo Gitlab/AvoidGitlabInstanceChecks -- Reason for disabling + return false if notification_dot_acknowledged? + + show_out_of_pipeline_minutes_notification?(project, namespace) + end + + def show_my_bad_dot?(project, namespace) + return false unless ::Gitlab.com? # rubocop: todo Gitlab/AvoidGitlabInstanceChecks -- + return false if notification_dot_acknowledged? + + show_out_of_pipeline_minutes_notification?(project, namespace) + end RUBY end @@ -86,6 +100,8 @@ RSpec.describe Tooling::Danger::RubocopInlineDisableSuggestion, feature_category + return false unless ::Gitlab.com? # rubocop: disable Gitlab/AvoidGitlabInstanceChecks + return false unless ::Gitlab.com? # rubocop:todo Gitlab/AvoidGitlabInstanceChecks + return false unless ::Gitlab.com? # rubocop: todo Gitlab/AvoidGitlabInstanceChecks + + return false unless ::Gitlab.com? # rubocop: todo Gitlab/AvoidGitlabInstanceChecks -- Reason for disabling + + return false unless ::Gitlab.com? # rubocop: todo Gitlab/AvoidGitlabInstanceChecks -- DIFF end @@ -102,7 +118,7 @@ RSpec.describe Tooling::Danger::RubocopInlineDisableSuggestion, feature_category end it 'adds comments at the correct lines', :aggregate_failures do - [3, 7, 13, 20, 27, 34, 41].each do |line_number| + [3, 7, 13, 20, 27, 34, 41, 55].each do |line_number| expect(rubocop).to receive(:markdown).with(template, file: filename, line: line_number) end |