Merge branch...

Merge branch 'ee-innerwhisper/gitlab-ce-31362_decrease_cyclomatic_complexity_threshold_step3' into 'master'

[EE] Port changes from gitlab-org/gitlab-ce!13972 to EE

See merge request !2843

.rubocop.yml

@@ -645,7 +645,7 @@ Metrics/ClassLength:
 # of test cases needed to validate a method.
 Metrics/CyclomaticComplexity:
   Enabled: true
-  Max: 15
+  Max: 14
 
 # Limit lines to 80 characters.
 Metrics/LineLength:

app/helpers/projects_helper.rb

@@ -15,9 +15,13 @@ module ProjectsHelper
   end
 
   def link_to_member_avatar(author, opts = {})
-    default_opts = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name" }
+    default_opts = { size: 16 }
     opts = default_opts.merge(opts)
-    image_tag(avatar_icon(author, opts[:size]), width: opts[:size], class: "avatar avatar-inline #{"s#{opts[:size]}" if opts[:size]}", alt: '') if opts[:avatar]
+
+    classes = %W[avatar avatar-inline s#{opts[:size]}]
+    classes << opts[:avatar_class] if opts[:avatar_class]
+
+    image_tag(avatar_icon(author, opts[:size]), width: opts[:size], class: classes, alt: '')
   end
 
   def link_to_member(project, author, opts = {}, &block)
@@ -29,7 +33,7 @@ module ProjectsHelper
     author_html = ""
 
     # Build avatar image tag
-    author_html << image_tag(avatar_icon(author, opts[:size]), width: opts[:size], class: "avatar avatar-inline #{"s#{opts[:size]}" if opts[:size]} #{opts[:avatar_class] if opts[:avatar_class]}", alt: '') if opts[:avatar]
+    author_html << link_to_member_avatar(author, opts) if opts[:avatar]
 
     # Build name span tag
     if opts[:by_username]

app/services/ci/create_pipeline_service.rb

@@ -16,10 +16,9 @@ module Ci
         protected: project.protected_for?(ref)
       )
 
-      result = validate(current_user,
-                        ignore_skip_ci: ignore_skip_ci,
-                        save_on_errors: save_on_errors,
-                        mirror_update: mirror_update)
+      result = validate_project_and_git_items(mirror_update: mirror_update) ||
+        validate_pipeline(ignore_skip_ci: ignore_skip_ci,
+                          save_on_errors: save_on_errors)
 
       return result if result
 
@@ -48,17 +47,17 @@ module Ci
 
     private
 
-    def validate(triggering_user, ignore_skip_ci:, save_on_errors:, mirror_update:)
+    def validate_project_and_git_items(mirror_update: false)
       unless project.builds_enabled?
         return error('Pipeline is disabled')
       end
 
-      unless project.mirror_trigger_builds?
-        return error('Pipeline is disabled for mirror updates') if mirror_update
+      if mirror_update && !project.mirror_trigger_builds?
+        return error('Pipeline is disabled for mirror updates')
       end
 
-      unless allowed_to_trigger_pipeline?(triggering_user)
-        if can?(triggering_user, :create_pipeline, project)
+      unless allowed_to_trigger_pipeline?
+        if can?(current_user, :create_pipeline, project)
           return error("Insufficient permissions for protected ref '#{ref}'")
         else
           return error('Insufficient permissions to create a new pipeline')
@@ -72,7 +71,9 @@ module Ci
       unless commit
         return error('Commit not found')
       end
+    end
 
+    def validate_pipeline(ignore_skip_ci:, save_on_errors:)
       unless pipeline.config_processor
         unless pipeline.ci_yaml_file
           return error("Missing #{pipeline.ci_yaml_file_path} file")
@@ -90,25 +91,25 @@ module Ci
       end
     end
 
-    def allowed_to_trigger_pipeline?(triggering_user)
-      if triggering_user
-        allowed_to_create?(triggering_user)
+    def allowed_to_trigger_pipeline?
+      if current_user
+        allowed_to_create?
       else # legacy triggers don't have a corresponding user
         !project.protected_for?(ref)
       end
     end
 
-    def allowed_to_create?(triggering_user)
-      access = Gitlab::UserAccess.new(triggering_user, project: project)
+    def allowed_to_create?
+      return unless can?(current_user, :create_pipeline, project)
 
-      can?(triggering_user, :create_pipeline, project) &&
-        if branch?
-          access.can_update_branch?(ref)
-        elsif tag?
-          access.can_create_tag?(ref)
-        else
-          true # Allow it for now and we'll reject when we check ref existence
-        end
+      access = Gitlab::UserAccess.new(current_user, project: project)
+      if branch?
+        access.can_update_branch?(ref)
+      elsif tag?
+        access.can_create_tag?(ref)
+      else
+        true # Allow it for now and we'll reject when we check ref existence
+      end
     end
 
     def update_merge_requests_head_pipeline

changelogs/unreleased/31362_decrease_cyclomatic_complexity_threshold_step3.yml

+---
+title: Decrease Cyclomatic Complexity threshold to 14
+merge_request: 13972
+author: Maxim Rydkin
+type: other

spec/helpers/projects_helper_spec.rb

@@ -191,10 +191,31 @@ describe ProjectsHelper do
     end
   end
 
-  describe 'link_to_member' do
-    let(:group)   { create(:group) }
-    let(:project) { create(:project, group: group) }
-    let(:user)    { create(:user) }
+  describe '#link_to_member_avatar' do
+    let(:user) { build_stubbed(:user) }
+    let(:expected) { double }
+
+    before do
+      expect(helper).to receive(:avatar_icon).with(user, 16).and_return(expected)
+    end
+
+    it 'returns image tag for member avatar' do
+      expect(helper).to receive(:image_tag).with(expected, { width: 16, class: ["avatar", "avatar-inline", "s16"], alt: "" })
+
+      helper.link_to_member_avatar(user)
+    end
+
+    it 'returns image tag with avatar class' do
+      expect(helper).to receive(:image_tag).with(expected, { width: 16, class: ["avatar", "avatar-inline", "s16", "any-avatar-class"], alt: "" })
+
+      helper.link_to_member_avatar(user, avatar_class: "any-avatar-class")
+    end
+  end
+
+  describe '#link_to_member' do
+    let(:group)   { build_stubbed(:group) }
+    let(:project) { build_stubbed(:project, group: group) }
+    let(:user)    { build_stubbed(:user) }
 
     describe 'using the default options' do
       it 'returns an HTML link to the user' do

spec/services/ci/create_pipeline_service_spec.rb

@@ -489,7 +489,7 @@ describe Ci::CreatePipelineService do
 
     subject do
       described_class.new(project, user, ref: ref)
-        .send(:allowed_to_create?, user)
+        .send(:allowed_to_create?)
     end
 
     context 'when user is a developer' do