Skip to content

Commit be2d6a6

Browse files
committed
Adjust review coverage tests
1 parent d81088f commit be2d6a6

File tree

8 files changed

+16
-14
lines changed

8 files changed

+16
-14
lines changed

app/controllers/development_metrics_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def build_overall_calculations(entity_name)
5252
@merge_time_success_rate = merge_time[:success_rate]
5353
@merge_time_avg = merge_time[:avg]
5454
@pull_request_size_avg = @pull_request_size[key].first[:avg]
55-
@review_coverage_avg = @review_coverage[key].first[:avg]
55+
@review_coverage_avg = @review_coverage[key].first[:avg] if @review_coverage.present?
5656
end
5757

5858
def build_metrics(entity_id, entity_name)

app/services/builders/distribution/pull_requests/pull_request_size_repository.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ def pr_sizes
2626
.where.not(
2727
events_pull_requests: { html_url: nil }
2828
)
29+
.where.not(owner: User.ignored_users)
2930
.where.not(size: nil)
3031
.order(:size)
3132
end

app/services/builders/distribution/pull_requests/review_coverage_repository.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ def review_coverages
2424
.joins(pull_request: :repository)
2525
.where(repositories: { name: @repository_name })
2626
.where(pull_request: { merged_at: @from..@to })
27+
.where.not(pull_request: { owner: User.ignored_users })
2728
.order(:coverage_percentage)
2829
end
2930

app/services/builders/distribution/pull_requests/time_to_merge_repository.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ def merge_times
2424
.joins(pull_request: :repository)
2525
.where(repositories: { name: @repository_name })
2626
.where.not(events_pull_requests: { html_url: nil })
27+
.where.not(
28+
events_pull_requests: { owner: User.ignored_users }
29+
)
2730
.includes(:pull_request)
2831
.order(:value)
2932
end

app/services/metrics/review_coverage/per_repository.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def process
1313
end
1414

1515
def query(interval)
16-
Repository.joins(pull_requests: :review_requests)
16+
Repository.joins(pull_requests: :review_coverage)
1717
.where(events_pull_requests: { merged_at: interval })
1818
.where(id: @entity_id)
1919
.group(:id)

app/views/development_metrics/review_coverage/_main_metric.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
metric_name: 'Distribution',
55
suffix: " pull requests",
66
metric: review_coverage[:per_repository_distribution]
7-
} if review_coverage && review_coverage[:per_repository_distribution] %>
7+
} if review_coverage && review_coverage[:per_repository_distribution] %>

app/views/pull_requests/review_coverage_prs_repository/index.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
</div>
1515
</div>
1616
<%= render partial: 'shared/pull_request_list' , locals: { pull_requests: @pull_requests, kpi_label: '%' } %>
17-
</div>
17+
</div>

spec/controllers/development_metrics_controller_spec.rb

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
let!(:pull_request_size_metric_definition) do
1919
create(:metric_definition, code: :pull_request_size)
2020
end
21+
let!(:review_coverage_metric_definition) do
22+
create(:metric_definition, code: :review_coverage)
23+
end
2124

2225
describe '#index' do
2326
context 'when metric params are empty' do
@@ -219,17 +222,11 @@
219222
subject
220223
expect(response.body).to include(pull_request_size_metric_definition.explanation)
221224
end
222-
end
223-
end
224-
225-
context '#departments' do
226-
before { params[:department_name] = repository.language.department.name }
227225

228-
it 'calls CodeClimate summary retriever class' do
229-
expect(CodeClimate::RepositoriesSummaryService)
230-
.to receive(:call).and_return(code_climate_metric)
231-
232-
get :departments, params: params
226+
it 'render review coverage metric tooltip' do
227+
subject
228+
expect(response.body).to include(review_coverage_metric_definition.explanation)
229+
end
233230
end
234231
end
235232
end

0 commit comments

Comments
 (0)