Merge remote-tracking branch 'upstream/master' into show-commit-status-from-latest-pipeline

* upstream/master: (754 commits)
  Add documentation about todos and failed builds
  Add Changelog entry for failed builds todos fix
  Do not create TODO when build is allowed to fail
  Fix 404 on some group pages when name contains dot
  Grapify the users API
  Remove duplicate sidekiq throttling parameters
  Fix regression in Merge request form
  Fix wrong link
  Fix test
  Fix broken test
  Changes for stop url to path
  fix typo in gitlab_flow.md ('munch'->'much')
  Fix spec
  Backport some changes done from Time Tracking feature in EE.
  Use build instead create in BroadcastMessage model spec
  Try to fix tests
  Remove unnecessary self from user model
  Expose stop_path for environment to not construct that in frontend
  Bring back the `commit_url` as it's used by CycleAnalytics
  Add api endpoint for creating a pipeline
  ...

1 files changed, 326 insertions, 0 deletions

diff --git a/spec/lib/gitlab/cycle_analytics/events_spec.rb b/spec/lib/gitlab/cycle_analytics/events_spec.rb
new file mode 100644
index 00000000000..9aeaa6b3ee8
--- /dev/null
+++ b/spec/lib/gitlab/cycle_analytics/events_spec.rb
@@ -0,0 +1,326 @@
+require 'spec_helper'
+
+describe Gitlab::CycleAnalytics::Events do
+  let(:project) { create(:project) }
+  let(:from_date) { 10.days.ago }
+  let(:user) { create(:user, :admin) }
+  let!(:context) { create(:issue, project: project, created_at: 2.days.ago) }
+
+  subject { described_class.new(project: project, options: { from: from_date, current_user: user }) }
+
+  before do
+    allow_any_instance_of(Gitlab::ReferenceExtractor).to receive(:issues).and_return([context])
+
+    setup(context)
+  end
+
+  describe '#issue_events' do
+    it 'has the total time' do
+      expect(subject.issue_events.first[:total_time]).not_to be_empty
+    end
+
+    it 'has a title' do
+      expect(subject.issue_events.first[:title]).to eq(context.title)
+    end
+
+    it 'has the URL' do
+      expect(subject.issue_events.first[:url]).not_to be_nil
+    end
+
+    it 'has an iid' do
+      expect(subject.issue_events.first[:iid]).to eq(context.iid.to_s)
+    end
+
+    it 'has a created_at timestamp' do
+      expect(subject.issue_events.first[:created_at]).to end_with('ago')
+    end
+
+    it "has the author's URL" do
+      expect(subject.issue_events.first[:author][:web_url]).not_to be_nil
+    end
+
+    it "has the author's avatar URL" do
+      expect(subject.issue_events.first[:author][:avatar_url]).not_to be_nil
+    end
+
+    it "has the author's name" do
+      expect(subject.issue_events.first[:author][:name]).to eq(context.author.name)
+    end
+  end
+
+  describe '#plan_events' do
+    it 'has a title' do
+      expect(subject.plan_events.first[:title]).not_to be_nil
+    end
+
+    it 'has a sha short ID' do
+      expect(subject.plan_events.first[:short_sha]).not_to be_nil
+    end
+
+    it 'has the URL' do
+      expect(subject.plan_events.first[:commit_url]).not_to be_nil
+    end
+
+    it 'has the total time' do
+      expect(subject.plan_events.first[:total_time]).not_to be_empty
+    end
+
+    it "has the author's URL" do
+      expect(subject.plan_events.first[:author][:web_url]).not_to be_nil
+    end
+
+    it "has the author's avatar URL" do
+      expect(subject.plan_events.first[:author][:avatar_url]).not_to be_nil
+    end
+
+    it "has the author's name" do
+      expect(subject.plan_events.first[:author][:name]).not_to be_nil
+    end
+  end
+
+  describe '#code_events' do
+    before do
+      create_commit_referencing_issue(context)
+    end
+
+    it 'has the total time' do
+      expect(subject.code_events.first[:total_time]).not_to be_empty
+    end
+
+    it 'has a title' do
+      expect(subject.code_events.first[:title]).to eq('Awesome merge_request')
+    end
+
+    it 'has an iid' do
+      expect(subject.code_events.first[:iid]).to eq(context.iid.to_s)
+    end
+
+    it 'has a created_at timestamp' do
+      expect(subject.code_events.first[:created_at]).to end_with('ago')
+    end
+
+    it "has the author's URL" do
+      expect(subject.code_events.first[:author][:web_url]).not_to be_nil
+    end
+
+    it "has the author's avatar URL" do
+      expect(subject.code_events.first[:author][:avatar_url]).not_to be_nil
+    end
+
+    it "has the author's name" do
+      expect(subject.code_events.first[:author][:name]).to eq(MergeRequest.first.author.name)
+    end
+  end
+
+  describe '#test_events' do
+    let(:merge_request) { MergeRequest.first }
+    let!(:pipeline) do
+      create(:ci_pipeline,
+             ref: merge_request.source_branch,
+             sha: merge_request.diff_head_sha,
+             project: context.project)
+    end
+
+    before do
+      create(:ci_build, pipeline: pipeline, status: :success, author: user)
+      create(:ci_build, pipeline: pipeline, status: :success, author: user)
+
+      pipeline.run!
+      pipeline.succeed!
+    end
+
+    it 'has the name' do
+      expect(subject.test_events.first[:name]).not_to be_nil
+    end
+
+    it 'has the ID' do
+      expect(subject.test_events.first[:id]).not_to be_nil
+    end
+
+    it 'has the URL' do
+      expect(subject.test_events.first[:url]).not_to be_nil
+    end
+
+    it 'has the branch name' do
+      expect(subject.test_events.first[:branch]).not_to be_nil
+    end
+
+    it 'has the branch URL' do
+      expect(subject.test_events.first[:branch][:url]).not_to be_nil
+    end
+
+    it 'has the short SHA' do
+      expect(subject.test_events.first[:short_sha]).not_to be_nil
+    end
+
+    it 'has the commit URL' do
+      expect(subject.test_events.first[:commit_url]).not_to be_nil
+    end
+
+    it 'has the date' do
+      expect(subject.test_events.first[:date]).not_to be_nil
+    end
+
+    it 'has the total time' do
+      expect(subject.test_events.first[:total_time]).not_to be_empty
+    end
+  end
+
+  describe '#review_events' do
+    let!(:context) { create(:issue, project: project, created_at: 2.days.ago) }
+
+    it 'has the total time' do
+      expect(subject.review_events.first[:total_time]).not_to be_empty
+    end
+
+    it 'has a title' do
+      expect(subject.review_events.first[:title]).to eq('Awesome merge_request')
+    end
+
+    it 'has an iid' do
+      expect(subject.review_events.first[:iid]).to eq(context.iid.to_s)
+    end
+
+    it 'has the URL' do
+      expect(subject.review_events.first[:url]).not_to be_nil
+    end
+
+    it 'has a state' do
+      expect(subject.review_events.first[:state]).not_to be_nil
+    end
+
+    it 'has a created_at timestamp' do
+      expect(subject.review_events.first[:created_at]).not_to be_nil
+    end
+
+    it "has the author's URL" do
+      expect(subject.review_events.first[:author][:web_url]).not_to be_nil
+    end
+
+    it "has the author's avatar URL" do
+      expect(subject.review_events.first[:author][:avatar_url]).not_to be_nil
+    end
+
+    it "has the author's name" do
+      expect(subject.review_events.first[:author][:name]).to eq(MergeRequest.first.author.name)
+    end
+  end
+
+  describe '#staging_events' do
+    let(:merge_request) { MergeRequest.first }
+    let!(:pipeline) do
+      create(:ci_pipeline,
+             ref: merge_request.source_branch,
+             sha: merge_request.diff_head_sha,
+             project: context.project)
+    end
+
+    before do
+      create(:ci_build, pipeline: pipeline, status: :success, author: user)
+      create(:ci_build, pipeline: pipeline, status: :success, author: user)
+
+      pipeline.run!
+      pipeline.succeed!
+
+      merge_merge_requests_closing_issue(context)
+      deploy_master
+    end
+
+    it 'has the name' do
+      expect(subject.staging_events.first[:name]).not_to be_nil
+    end
+
+    it 'has the ID' do
+      expect(subject.staging_events.first[:id]).not_to be_nil
+    end
+
+    it 'has the URL' do
+      expect(subject.staging_events.first[:url]).not_to be_nil
+    end
+
+    it 'has the branch name' do
+      expect(subject.staging_events.first[:branch]).not_to be_nil
+    end
+
+    it 'has the branch URL' do
+      expect(subject.staging_events.first[:branch][:url]).not_to be_nil
+    end
+
+    it 'has the short SHA' do
+      expect(subject.staging_events.first[:short_sha]).not_to be_nil
+    end
+
+    it 'has the commit URL' do
+      expect(subject.staging_events.first[:commit_url]).not_to be_nil
+    end
+
+    it 'has the date' do
+      expect(subject.staging_events.first[:date]).not_to be_nil
+    end
+
+    it 'has the total time' do
+      expect(subject.staging_events.first[:total_time]).not_to be_empty
+    end
+
+    it "has the author's URL" do
+      expect(subject.staging_events.first[:author][:web_url]).not_to be_nil
+    end
+
+    it "has the author's avatar URL" do
+      expect(subject.staging_events.first[:author][:avatar_url]).not_to be_nil
+    end
+
+    it "has the author's name" do
+      expect(subject.staging_events.first[:author][:name]).to eq(MergeRequest.first.author.name)
+    end
+  end
+
+  describe '#production_events' do
+    let!(:context) { create(:issue, project: project, created_at: 2.days.ago) }
+
+    before do
+      merge_merge_requests_closing_issue(context)
+      deploy_master
+    end
+
+    it 'has the total time' do
+      expect(subject.production_events.first[:total_time]).not_to be_empty
+    end
+
+    it 'has a title' do
+      expect(subject.production_events.first[:title]).to eq(context.title)
+    end
+
+    it 'has the URL' do
+      expect(subject.production_events.first[:url]).not_to be_nil
+    end
+
+    it 'has an iid' do
+      expect(subject.production_events.first[:iid]).to eq(context.iid.to_s)
+    end
+
+    it 'has a created_at timestamp' do
+      expect(subject.production_events.first[:created_at]).to end_with('ago')
+    end
+
+    it "has the author's URL" do
+      expect(subject.production_events.first[:author][:web_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
+
+    it "has the author's name" do
+      expect(subject.production_events.first[:author][:name]).to eq(context.author.name)
+    end
+  end
+
+  def setup(context)
+    milestone = create(:milestone, project: project)
+    context.update(milestone: milestone)
+    mr = create_merge_request_closing_issue(context)
+
+    ProcessCommitWorker.new.perform(project.id, user.id, mr.commits.last.sha)
+  end
+end