summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMałgorzata Ksionek <mksionek@gitlab.com>2019-07-15 10:14:00 +0200
committerMałgorzata Ksionek <mksionek@gitlab.com>2019-07-15 11:12:18 +0200
commitc7006b186f339bdf7a4dfb8213ffae3629f9a4ac (patch)
tree4d941c47f894a5c60b8e74ff74a14575100455ef
parent081dab2d85d4e999e1b6a8c3e188866982c662c3 (diff)
downloadgitlab-ce-c7006b186f339bdf7a4dfb8213ffae3629f9a4ac.tar.gz
Add code review remarks regarding module
Add proper module name
-rw-r--r--app/models/cycle_analytics/base_methods.rb (renamed from app/models/cycle_analytics/base.rb)2
-rw-r--r--app/models/cycle_analytics/group_level.rb6
-rw-r--r--app/models/cycle_analytics/project_level.rb3
-rw-r--r--lib/gitlab/cycle_analytics/permissions.rb2
-rw-r--r--spec/lib/gitlab/cycle_analytics/usage_data_spec.rb2
-rw-r--r--spec/models/cycle_analytics/group_level_spec.rb2
6 files changed, 9 insertions, 8 deletions
diff --git a/app/models/cycle_analytics/base.rb b/app/models/cycle_analytics/base_methods.rb
index 3748063bbd0..1c2a0854769 100644
--- a/app/models/cycle_analytics/base.rb
+++ b/app/models/cycle_analytics/base_methods.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module CycleAnalytics
- class Base
+ module BaseMethods
STAGES = %i[issue plan code test review staging production].freeze
def all_medians_by_stage
diff --git a/app/models/cycle_analytics/group_level.rb b/app/models/cycle_analytics/group_level.rb
index d9dd52dbe1b..58bd2eb0d9a 100644
--- a/app/models/cycle_analytics/group_level.rb
+++ b/app/models/cycle_analytics/group_level.rb
@@ -1,11 +1,11 @@
# frozen_string_literal: true
module CycleAnalytics
- class GroupLevel < Base
+ class GroupLevel
+ include BaseMethods
attr_reader :options
- def initialize(project: nil, options:)
- @project = project
+ def initialize(options:)
@options = options
end
diff --git a/app/models/cycle_analytics/project_level.rb b/app/models/cycle_analytics/project_level.rb
index 475307a7c98..abe1be11eae 100644
--- a/app/models/cycle_analytics/project_level.rb
+++ b/app/models/cycle_analytics/project_level.rb
@@ -1,7 +1,8 @@
# frozen_string_literal: true
module CycleAnalytics
- class ProjectLevel < Base
+ class ProjectLevel
+ include BaseMethods
attr_reader :project, :options
def initialize(project, options:)
diff --git a/lib/gitlab/cycle_analytics/permissions.rb b/lib/gitlab/cycle_analytics/permissions.rb
index 03ba98b4dfb..0da041f8950 100644
--- a/lib/gitlab/cycle_analytics/permissions.rb
+++ b/lib/gitlab/cycle_analytics/permissions.rb
@@ -23,7 +23,7 @@ module Gitlab
end
def get
- ::CycleAnalytics::Base::STAGES.each do |stage|
+ ::CycleAnalytics::BaseMethods::STAGES.each do |stage|
@stage_permission_hash[stage] = authorized_stage?(stage)
end
diff --git a/spec/lib/gitlab/cycle_analytics/usage_data_spec.rb b/spec/lib/gitlab/cycle_analytics/usage_data_spec.rb
index 8122e85a981..4ef33ff6e2b 100644
--- a/spec/lib/gitlab/cycle_analytics/usage_data_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/usage_data_spec.rb
@@ -34,7 +34,7 @@ describe Gitlab::CycleAnalytics::UsageData do
expect(result).to have_key(:avg_cycle_analytics)
- CycleAnalytics::Base::STAGES.each do |stage|
+ CycleAnalytics::BaseMethods::STAGES.each do |stage|
expect(result[:avg_cycle_analytics]).to have_key(stage)
stage_values = result[:avg_cycle_analytics][stage]
diff --git a/spec/models/cycle_analytics/group_level_spec.rb b/spec/models/cycle_analytics/group_level_spec.rb
index 4d72c46f93c..70c370bc39d 100644
--- a/spec/models/cycle_analytics/group_level_spec.rb
+++ b/spec/models/cycle_analytics/group_level_spec.rb
@@ -12,7 +12,7 @@ describe CycleAnalytics::GroupLevel do
let(:mr) { create_merge_request_closing_issue(user, project, issue, commit_message: "References #{issue.to_reference}") }
let(:pipeline) { create(:ci_empty_pipeline, status: 'created', project: project, ref: mr.source_branch, sha: mr.source_branch_sha, head_pipeline_of: mr) }
- subject { described_class.new(project: nil, options: { from: from_date, group: group, current_user: user }) }
+ subject { described_class.new(options: { from: from_date, group: group, current_user: user }) }
describe '#permissions' do
it 'returns permissions' do