Commit 83130ae8 authored by James Lopez's avatar James Lopez

Updated production events with new fields

parent beeb6461
...@@ -17,7 +17,7 @@ module Gitlab ...@@ -17,7 +17,7 @@ module Gitlab
event['total_time'] = distance_of_time_in_words(event['total_time'].to_f) event['total_time'] = distance_of_time_in_words(event['total_time'].to_f)
commit = first_time_reference_commit(event.delete('commits'), event) commit = first_time_reference_commit(event.delete('commits'), event)
event['title'] = commit.title event['title'] = commit.title
event['url'] = Gitlab::LightUrlBuilder.build(entity: :commit_url, project: @project, id: commit.id) event['url'] = Gitlab::LightUrlBuilder.build(entity: :commit_url, project: @project, id: commit.id)
event['sha'] = commit.short_id event['sha'] = commit.short_id
event['author_name'] = commit.author.name event['author_name'] = commit.author.name
event['author_profile_url'] = Gitlab::LightUrlBuilder.build(entity: :user, id: commit.author.username) event['author_profile_url'] = Gitlab::LightUrlBuilder.build(entity: :user, id: commit.author.username)
......
...@@ -87,9 +87,11 @@ module Gitlab ...@@ -87,9 +87,11 @@ module Gitlab
end_time_attrs: mr_metrics_table[:first_deployed_to_production_at], end_time_attrs: mr_metrics_table[:first_deployed_to_production_at],
projections: [issue_table[:title], projections: [issue_table[:title],
issue_table[:iid], issue_table[:iid],
issue_table[:id],
issue_table[:created_at], issue_table[:created_at],
user_table[:name], user_table[:name].as('author_name'),
user_table[:email]] user_table[:username].as('author_username'),
user_table[:id].as('author_id')]
} }
end end
end end
......
...@@ -21,6 +21,10 @@ describe Gitlab::CycleAnalytics::Events do ...@@ -21,6 +21,10 @@ describe Gitlab::CycleAnalytics::Events do
expect(subject.issue_events.first['title']).to eq(context.title) expect(subject.issue_events.first['title']).to eq(context.title)
end end
it 'has the URL' do
expect(subject.issue_events.first['url']).not_to be_nil
end
it 'has an iid' do it 'has an iid' do
expect(subject.issue_events.first['iid']).to eq(context.iid.to_s) expect(subject.issue_events.first['iid']).to eq(context.iid.to_s)
end end
...@@ -216,7 +220,6 @@ describe Gitlab::CycleAnalytics::Events do ...@@ -216,7 +220,6 @@ describe Gitlab::CycleAnalytics::Events do
deploy_master deploy_master
end end
it 'has the name' do it 'has the name' do
expect(subject.staging_events.first['name']).not_to be_nil expect(subject.staging_events.first['name']).not_to be_nil
end end
...@@ -274,6 +277,10 @@ describe Gitlab::CycleAnalytics::Events do ...@@ -274,6 +277,10 @@ describe Gitlab::CycleAnalytics::Events do
expect(subject.production_events.first['title']).to eq(context.title) expect(subject.production_events.first['title']).to eq(context.title)
end end
it 'has the URL' do
expect(subject.production_events.first['url']).not_to be_nil
end
it 'has an iid' do it 'has an iid' do
expect(subject.production_events.first['iid']).to eq(context.iid.to_s) expect(subject.production_events.first['iid']).to eq(context.iid.to_s)
end end
...@@ -282,12 +289,16 @@ describe Gitlab::CycleAnalytics::Events do ...@@ -282,12 +289,16 @@ describe Gitlab::CycleAnalytics::Events do
expect(subject.production_events.first['created_at']).to end_with('ago') expect(subject.production_events.first['created_at']).to end_with('ago')
end end
it "has the author's email" do it "has the author's URL" do
expect(subject.production_events.first['email']).to eq(context.author.email) expect(subject.production_events.first['author_profile_url']).not_to be_nil
end
it "has the author's avatar URL" do
expect(subject.production_events.first['author_avatar_url']).not_to be_nil
end end
it "has the author's name" do it "has the author's name" do
expect(subject.production_events.first['name']).to eq(context.author.name) expect(subject.production_events.first['author_name']).to eq(context.author.name)
end end
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