Commit bdf4da81 authored by Gosia Ksionek's avatar Gosia Ksionek Committed by Mayra Cabrera

Add review remarks

Add cr remarks

Add cr remarks
parent fecafd82
...@@ -23,7 +23,7 @@ module Projects ...@@ -23,7 +23,7 @@ module Projects
end end
def test def test
options(events_params)[:branch] = events_params[:branch_name] options(cycle_analytics_params)[:branch] = cycle_analytics_params[:branch_name]
render_events(cycle_analytics[:test].events) render_events(cycle_analytics[:test].events)
end end
...@@ -50,13 +50,13 @@ module Projects ...@@ -50,13 +50,13 @@ module Projects
end end
def cycle_analytics def cycle_analytics
@cycle_analytics ||= ::CycleAnalytics::ProjectLevel.new(project, options: options(events_params)) @cycle_analytics ||= ::CycleAnalytics::ProjectLevel.new(project, options: options(cycle_analytics_params))
end end
def events_params def cycle_analytics_params
return {} unless params[:events].present? return {} unless params[:cycle_analytics].present?
params[:events].permit(:start_date, :branch_name) params[:cycle_analytics].permit(:start_date, :branch_name)
end end
end end
end end
......
# frozen_string_literal: true
require 'spec_helper'
describe Projects::CycleAnalytics::EventsController do
let(:project) { create(:project, :repository) }
let(:user) { create(:user) }
before do
sign_in(user)
project.add_maintainer(user)
end
describe 'cycle analytics not set up flag' do
context 'with no data' do
it 'is empty' do
get_issue
expect(response).to be_success
expect(JSON.parse(response.body)['events']).to be_empty
end
end
context 'with data' do
let(:milestone) { create(:milestone, project: project, created_at: 10.days.ago) }
let(:issue) { create(:issue, project: project, created_at: 9.days.ago) }
before do
issue.update(milestone: milestone)
end
it 'is not empty' do
get_issue
expect(response).to be_success
end
it 'contains event detais' do
get_issue
events = JSON.parse(response.body)['events']
expect(events).not_to be_empty
expect(events.first).to include('title', 'author', 'iid', 'total_time', 'created_at', 'url')
expect(events.first['title']).to eq(issue.title)
end
context 'with data older than start date' do
it 'is empty' do
get_issue(additional_params: { cycle_analytics: { start_date: 7 } })
expect(response).to be_success
expect(JSON.parse(response.body)['events']).to be_empty
end
end
end
end
def get_issue(additional_params: {})
params = additional_params.merge(namespace_id: project.namespace, project_id: project)
get(:issue, params: params, format: :json)
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment