Merge branch 'split-long-fixture-generation-file' into 'master'

test: Split long fixtures generation file

See merge request gitlab-org/gitlab!66940

.gitlab/ci/frontend.gitlab-ci.yml

@@ -143,7 +143,7 @@ rspec-ee frontend_fixture:
   extends:
     - .frontend-fixtures-base
     - .frontend:rules:default-frontend-jobs-ee
-  parallel: 2
+  parallel: 3
 
 graphql-schema-dump:
   variables:

ee/spec/frontend/analytics/cycle_analytics/__snapshots__/utils_spec.js.snap

@@ -2,31 +2,13 @@
 
 exports[`Value Stream Analytics utils transformRawStages retains all the stage properties 1`] = `
 Array [
-  Object {
-    "custom": false,
-    "description": "Time before an issue gets scheduled",
-    "endEvent": Object {
-      "htmlDescription": "<p data-sourcepos=\\"1:1-1:71\\" dir=\\"auto\\">Issue first associated with a milestone or issue first added to a board</p>",
-    },
-    "endEventHtmlDescription": "<p data-sourcepos=\\"1:1-1:71\\" dir=\\"auto\\">Issue first associated with a milestone or issue first added to a board</p>",
-    "hidden": false,
-    "id": 1,
-    "legend": "",
-    "name": "Issue",
-    "slug": 1,
-    "startEvent": Object {
-      "htmlDescription": "<p data-sourcepos=\\"1:1-1:13\\" dir=\\"auto\\">Issue created</p>",
-    },
-    "startEventHtmlDescription": "<p data-sourcepos=\\"1:1-1:13\\" dir=\\"auto\\">Issue created</p>",
-    "title": "Issue",
-  },
   Object {
     "custom": true,
-    "description": "",
+    "description": "Time before an issue gets scheduled",
     "endEventIdentifier": "issue_first_added_to_board",
     "hidden": false,
     "id": 18,
-    "legend": "",
+    "legend": "Cool legend",
     "name": "Coolest beans stage",
     "slug": 18,
     "startEventIdentifier": "issue_first_mentioned_in_commit",

ee/spec/frontend/analytics/cycle_analytics/mock_data.js

@@ -140,17 +140,15 @@ export const stageCounts = rawStageCounts.reduce((acc, { id: name, count }) => {
 }, {});
 
 export const issueEvents = deepCamelCase(stageFixtures.issue);
-export const planEvents = deepCamelCase(stageFixtures.plan);
 export const reviewEvents = deepCamelCase(stageFixtures.review);
-export const codeEvents = deepCamelCase(stageFixtures.code);
 export const testEvents = deepCamelCase(stageFixtures.test);
 export const stagingEvents = deepCamelCase(stageFixtures.staging);
 export const rawCustomStage = {
   name: 'Coolest beans stage',
   title: 'Coolest beans stage',
   hidden: false,
-  legend: '',
-  description: '',
+  legend: 'Cool legend',
+  description: 'Time before an issue gets scheduled',
   id: 18,
   custom: true,
   start_event_identifier: 'issue_first_mentioned_in_commit',

ee/spec/frontend/analytics/cycle_analytics/utils_spec.js

@@ -151,7 +151,7 @@ describe('Value Stream Analytics utils', () => {
 
   describe('transformRawStages', () => {
     it('retains all the stage properties', () => {
-      const transformed = transformRawStages([issueStage, rawCustomStage]);
+      const transformed = transformRawStages([rawCustomStage]);
       expect(transformed).toMatchSnapshot();
     });
 

ee/spec/frontend/fixtures/analytics/value_streams.rb

@@ -2,136 +2,10 @@
 require 'spec_helper'
 
 RSpec.describe 'Analytics (JavaScript fixtures)', :sidekiq_inline do
-  include JavaScriptFixturesHelpers
-
-  let_it_be(:group) { create(:group) }
-  let_it_be(:value_stream) { create(:cycle_analytics_group_value_stream, group: group) }
-  let_it_be(:project) { create(:project, :repository, namespace: group) }
-  let_it_be(:user) { create(:user, :admin) }
-  let_it_be(:milestone) { create(:milestone, project: project) }
-
-  let(:issue) { create(:issue, project: project, created_at: 4.days.ago) }
-  let(:issue_1) { create(:issue, project: project, created_at: 5.days.ago) }
-  let(:issue_2) { create(:issue, project: project, created_at: 4.days.ago) }
-  let(:issue_3) { create(:issue, project: project, created_at: 3.days.ago) }
-
-  let(:label) { create(:group_label, name: 'in-code-review', group: group) }
-
-  let(:mr_1) { create(:merge_request, source_project: project, allow_broken: true, created_at: 20.days.ago) }
-  let(:mr_2) { create(:merge_request, source_project: project, allow_broken: true, created_at: 19.days.ago) }
-
-  let(:pipeline_1) { create(:ci_empty_pipeline, status: 'created', project: project, ref: mr_1.source_branch, sha: mr_1.source_branch_sha, head_pipeline_of: mr_1) }
-  let(:pipeline_2) { create(:ci_empty_pipeline, status: 'created', project: project, ref: mr_2.source_branch, sha: mr_2.source_branch_sha, head_pipeline_of: mr_2) }
-
-  let(:build_1) { create(:ci_build, :success, pipeline: pipeline_1, author: user) }
-  let(:build_2) { create(:ci_build, :success, pipeline: pipeline_2, author: user) }
-
-  let(:label_based_stage) do
-    create(:cycle_analytics_group_stage, {
-      name: 'label-based-stage',
-      parent: group,
-      value_stream: value_stream,
-      start_event_identifier: :issue_label_added,
-      start_event_label_id: label.id,
-      end_event_identifier: :issue_label_removed,
-      end_event_label_id: label.id
-    })
-  end
-
-  def prepare_cycle_analytics_data
-    group.add_maintainer(user)
-    project.add_maintainer(user)
-
-    create_commit_referencing_issue(issue_1)
-    create_commit_referencing_issue(issue_2)
-
-    create_merge_request_closing_issue(user, project, issue_1)
-    create_merge_request_closing_issue(user, project, issue_2)
-    merge_merge_requests_closing_issue(user, project, issue_3)
-  end
-
-  def create_deployment
-    deploy_master(user, project, environment: 'staging')
-    deploy_master(user, project)
-  end
-
-  def update_metrics
-    issue_1.metrics.update!(first_added_to_board_at: 3.days.ago, first_mentioned_in_commit_at: 2.days.ago)
-    issue_2.metrics.update!(first_added_to_board_at: 2.days.ago, first_mentioned_in_commit_at: 1.day.ago)
-
-    mr_1.metrics.update!({
-      merged_at: 5.days.ago,
-      first_deployed_to_production_at: 1.day.ago,
-      latest_build_started_at: 5.days.ago,
-      latest_build_finished_at: 1.day.ago,
-      pipeline: build_1.pipeline
-    })
-
-    mr_2.metrics.update!({
-      merged_at: 10.days.ago,
-      first_deployed_to_production_at: 5.days.ago,
-      latest_build_started_at: 9.days.ago,
-      latest_build_finished_at: 7.days.ago,
-      pipeline: build_2.pipeline
-    })
-  end
-
-  def additional_cycle_analytics_metrics
-    create(:cycle_analytics_group_stage, parent: group, value_stream: value_stream)
-
-    update_metrics
-
-    deploy_master(user, project, environment: 'staging')
-  end
-
-  def create_label_based_cycle_analytics_stage
-    label_based_stage
-
-    issue = create(:issue, project: project, created_at: 20.days.ago, author: user)
-
-    travel_to(5.days.ago) do
-      Issues::UpdateService.new(
-        project: project,
-        current_user: user,
-        params: { label_ids: [label.id] }
-      ).execute(issue)
-    end
-
-    travel_to(2.days.ago) do
-      Issues::UpdateService.new(
-        project: project,
-        current_user: user,
-        params: { label_ids: [] }
-      ).execute(issue)
-    end
-  end
-
-  before(:all) do
-    clean_frontend_fixtures('analytics/value_stream_analytics/')
-  end
-
   describe Groups::Analytics::CycleAnalytics::StagesController, type: :controller do
-    render_views
-
-    let(:params) { { created_after: 3.months.ago, created_before: Time.now, group_id: group.full_path } }
-
-    before do
-      stub_licensed_features(cycle_analytics_for_groups: true)
-
-      # Persist the default stages
-      Gitlab::Analytics::CycleAnalytics::DefaultStages.all.map do |params|
-        group.cycle_analytics_stages.build(params.merge(value_stream: value_stream)).save!
-      end
+    include_context '[EE] Analytics fixtures shared context'
 
-      create_label_based_cycle_analytics_stage
-
-      prepare_cycle_analytics_data
-      create_deployment
-
-      additional_cycle_analytics_metrics
-
-      sign_in(user)
-    end
+    render_views
 
     it 'analytics/value_stream_analytics/stages.json' do
       get(:index, params: { group_id: group.name, value_stream_id: value_stream.id }, format: :json)
@@ -139,29 +13,6 @@ RSpec.describe 'Analytics (JavaScript fixtures)', :sidekiq_inline do
       expect(response).to be_successful
     end
 
-    Gitlab::Analytics::CycleAnalytics::DefaultStages.all.each do |stage|
-      it "analytics/value_stream_analytics/stages/#{stage[:name]}/records.json" do
-        stage_id = group.cycle_analytics_stages.find_by(name: stage[:name]).id
-        get(:records, params: params.merge({ id: stage_id }), format: :json)
-
-        expect(response).to be_successful
-      end
-
-      it "analytics/value_stream_analytics/stages/#{stage[:name]}/median.json" do
-        stage_id = group.cycle_analytics_stages.find_by(name: stage[:name]).id
-        get(:median, params: params.merge({ id: stage_id }), format: :json)
-
-        expect(response).to be_successful
-      end
-
-      it "analytics/value_stream_analytics/stages/#{stage[:name]}/count.json" do
-        stage_id = group.cycle_analytics_stages.find_by(name: stage[:name]).id
-        get(:count, params: params.merge({ id: stage_id }), format: :json)
-
-        expect(response).to be_successful
-      end
-    end
-
     it "analytics/value_stream_analytics/stages/label-based-stage/records.json" do
       get(:records, params: params.merge({ id: label_based_stage.id }), format: :json)
 

ee/spec/frontend/fixtures/analytics/value_streams_code_stage.rb

+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe 'Analytics, Value streams: code stage (JavaScript fixtures)', :sidekiq_inline do
+  describe Groups::Analytics::CycleAnalytics::StagesController, type: :controller do
+    include_context '[EE] Analytics fixtures shared context'
+
+    render_views
+
+    include_examples 'Analytics > Value stream fixtures', 'code'
+  end
+end

ee/spec/frontend/fixtures/analytics/value_streams_issue_stage.rb

+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe 'Analytics, Value streams: issue stage (JavaScript fixtures)', :sidekiq_inline do
+  describe Groups::Analytics::CycleAnalytics::StagesController, type: :controller do
+    include_context '[EE] Analytics fixtures shared context'
+
+    render_views
+
+    include_examples 'Analytics > Value stream fixtures', 'issue'
+  end
+end

ee/spec/frontend/fixtures/analytics/value_streams_plan_stage.rb

+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe 'Analytics, Value streams: plan stage (JavaScript fixtures)', :sidekiq_inline do
+  describe Groups::Analytics::CycleAnalytics::StagesController, type: :controller do
+    include_context '[EE] Analytics fixtures shared context'
+
+    render_views
+
+    include_examples 'Analytics > Value stream fixtures', 'plan'
+  end
+end

ee/spec/frontend/fixtures/analytics/value_streams_review_stage.rb

+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe 'Analytics, Value streams: review stage (JavaScript fixtures)', :sidekiq_inline do
+  describe Groups::Analytics::CycleAnalytics::StagesController, type: :controller do
+    include_context '[EE] Analytics fixtures shared context'
+
+    render_views
+
+    include_examples 'Analytics > Value stream fixtures', 'review'
+  end
+end

ee/spec/frontend/fixtures/analytics/value_streams_staging_stage.rb

+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe 'Analytics, Value streams: staging stage (JavaScript fixtures)', :sidekiq_inline do
+  describe Groups::Analytics::CycleAnalytics::StagesController, type: :controller do
+    include_context '[EE] Analytics fixtures shared context'
+
+    render_views
+
+    include_examples 'Analytics > Value stream fixtures', 'staging'
+  end
+end

ee/spec/frontend/fixtures/analytics/value_streams_test_stage.rb

+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe 'Analytics, Value streams: test stage (JavaScript fixtures)', :sidekiq_inline do
+  describe Groups::Analytics::CycleAnalytics::StagesController, type: :controller do
+    include_context '[EE] Analytics fixtures shared context'
+
+    render_views
+
+    include_examples 'Analytics > Value stream fixtures', 'test'
+  end
+end

ee/spec/support/shared_contexts/fixtures/analytics_shared_context.rb

+# frozen_string_literal: true
+
+RSpec.shared_context '[EE] Analytics fixtures shared context' do
+  include_context 'Analytics fixtures shared context'
+
+  let_it_be(:value_stream) { create(:cycle_analytics_group_value_stream, group: group) }
+
+  let(:label) { create(:group_label, name: 'in-code-review', group: group) }
+  let(:label_based_stage) do
+    create(:cycle_analytics_group_stage, {
+      name: 'label-based-stage',
+      parent: group,
+      value_stream: value_stream,
+      start_event_identifier: :issue_label_added,
+      start_event_label_id: label.id,
+      end_event_identifier: :issue_label_removed,
+      end_event_label_id: label.id
+    })
+  end
+
+  let(:params) { { created_after: 3.months.ago, created_before: Time.now, group_id: group.full_path } }
+
+  def additional_cycle_analytics_metrics
+    create(:cycle_analytics_group_stage, parent: group, value_stream: value_stream)
+
+    update_metrics
+
+    deploy_master(user, project, environment: 'staging')
+  end
+
+  def create_label_based_cycle_analytics_stage
+    label_based_stage
+
+    issue = create(:issue, project: project, created_at: 20.days.ago, author: user)
+
+    travel_to(5.days.ago) do
+      Issues::UpdateService.new(
+        project: project,
+        current_user: user,
+        params: { label_ids: [label.id] }
+      ).execute(issue)
+    end
+
+    travel_to(2.days.ago) do
+      Issues::UpdateService.new(
+        project: project,
+        current_user: user,
+        params: { label_ids: [] }
+      ).execute(issue)
+    end
+  end
+
+  before do
+    # Persist the default stages
+    Gitlab::Analytics::CycleAnalytics::DefaultStages.all.map do |params|
+      group.cycle_analytics_stages.build(params.merge(value_stream: value_stream)).save!
+    end
+
+    create_label_based_cycle_analytics_stage
+
+    create_deployment
+
+    additional_cycle_analytics_metrics
+
+    sign_in(user)
+  end
+end

ee/spec/support/shared_examples/fixtures/analytics_value_streams_shared_examples.rb

+# frozen_string_literal: true
+
+RSpec.shared_examples 'Analytics > Value stream fixtures' do |stage|
+  it "analytics/value_stream_analytics/stages/#{stage}/records.json" do
+    stage_id = group.cycle_analytics_stages.find_by(name: stage).id
+    get(:records, params: params.merge({ id: stage_id }), format: :json)
+
+    expect(response).to be_successful
+  end
+
+  it "analytics/value_stream_analytics/stages/#{stage}/median.json" do
+    stage_id = group.cycle_analytics_stages.find_by(name: stage).id
+    get(:median, params: params.merge({ id: stage_id }), format: :json)
+
+    expect(response).to be_successful
+  end
+
+  it "analytics/value_stream_analytics/stages/#{stage}/count.json" do
+    stage_id = group.cycle_analytics_stages.find_by(name: stage).id
+    get(:count, params: params.merge({ id: stage_id }), format: :json)
+
+    expect(response).to be_successful
+  end
+end

spec/frontend/cycle_analytics/mock_data.js

@@ -131,9 +131,7 @@ export const convertedData = {
 
 export const rawIssueEvents = stageFixtures.issue;
 export const issueEvents = deepCamelCase(rawIssueEvents);
-export const planEvents = deepCamelCase(stageFixtures.plan);
 export const reviewEvents = deepCamelCase(stageFixtures.review);
-export const codeEvents = deepCamelCase(stageFixtures.code);
 export const testEvents = deepCamelCase(stageFixtures.test);
 export const stagingEvents = deepCamelCase(stageFixtures.staging);
 

spec/frontend/fixtures/analytics.rb

@@ -2,74 +2,15 @@
 require 'spec_helper'
 
 RSpec.describe 'Analytics (JavaScript fixtures)', :sidekiq_inline do
-  include JavaScriptFixturesHelpers
+  include_context 'Analytics fixtures shared context'
 
   let_it_be(:value_stream_id) { 'default' }
-  let_it_be(:group) { create(:group) }
-  let_it_be(:project) { create(:project, :repository, namespace: group) }
-  let_it_be(:user) { create(:user, :admin) }
-  let_it_be(:milestone) { create(:milestone, project: project) }
-
-  let(:issue) { create(:issue, project: project, created_at: 4.days.ago) }
-  let(:issue_1) { create(:issue, project: project, created_at: 5.days.ago) }
-  let(:issue_2) { create(:issue, project: project, created_at: 4.days.ago, milestone: milestone) }
-  let(:issue_3) { create(:issue, project: project, created_at: 3.days.ago, milestone: milestone) }
-
-  let(:mr_1) { create(:merge_request, source_project: project, allow_broken: true, created_at: 5.days.ago) }
-  let(:mr_2) { create(:merge_request, source_project: project, allow_broken: true, created_at: 4.days.ago) }
-
-  let(:pipeline_1) { create(:ci_empty_pipeline, status: 'created', project: project, ref: mr_1.source_branch, sha: mr_1.source_branch_sha, head_pipeline_of: mr_1) }
-  let(:pipeline_2) { create(:ci_empty_pipeline, status: 'created', project: project, ref: mr_2.source_branch, sha: mr_2.source_branch_sha, head_pipeline_of: mr_2) }
-
-  let(:build_1) { create(:ci_build, :success, pipeline: pipeline_1, author: user) }
-  let(:build_2) { create(:ci_build, :success, pipeline: pipeline_2, author: user) }
-
-  def prepare_cycle_analytics_data
-    group.add_maintainer(user)
-    project.add_maintainer(user)
-
-    create_commit_referencing_issue(issue_1)
-    create_commit_referencing_issue(issue_2)
-
-    create_merge_request_closing_issue(user, project, issue_1)
-    create_merge_request_closing_issue(user, project, issue_2)
-    merge_merge_requests_closing_issue(user, project, issue_3)
-  end
-
-  def create_deployment
-    deploy_master(user, project, environment: 'staging')
-    deploy_master(user, project)
-  end
-
-  def update_metrics
-    issue_1.metrics.update!(first_added_to_board_at: 3.days.ago, first_mentioned_in_commit_at: 2.days.ago)
-    issue_2.metrics.update!(first_added_to_board_at: 2.days.ago, first_mentioned_in_commit_at: 1.day.ago)
-
-    mr_1.metrics.update!({
-      merged_at: 5.days.ago,
-      first_deployed_to_production_at: 1.day.ago,
-      latest_build_started_at: 5.days.ago,
-      latest_build_finished_at: 1.day.ago,
-      pipeline: build_1.pipeline
-    })
-
-    mr_2.metrics.update!({
-      merged_at: 10.days.ago,
-      first_deployed_to_production_at: 5.days.ago,
-      latest_build_started_at: 9.days.ago,
-      latest_build_finished_at: 7.days.ago,
-      pipeline: build_2.pipeline
-    })
-  end
 
   before(:all) do
     clean_frontend_fixtures('projects/analytics/value_stream_analytics/')
   end
 
   before do
-    stub_licensed_features(cycle_analytics_for_groups: true)
-
-    prepare_cycle_analytics_data
     update_metrics
     create_deployment
   end

spec/support/shared_contexts/fixtures/analytics_shared_context.rb

+# frozen_string_literal: true
+
+RSpec.shared_context 'Analytics fixtures shared context' do
+  include JavaScriptFixturesHelpers
+
+  let_it_be(:group) { create(:group) }
+  let_it_be(:project) { create(:project, :repository, namespace: group) }
+  let_it_be(:user) { create(:user, :admin) }
+  let_it_be(:milestone) { create(:milestone, project: project) }
+
+  let(:issue) { create(:issue, project: project, created_at: 4.days.ago) }
+  let(:issue_1) { create(:issue, project: project, created_at: 5.days.ago) }
+  let(:issue_2) { create(:issue, project: project, created_at: 4.days.ago, milestone: milestone) }
+  let(:issue_3) { create(:issue, project: project, created_at: 3.days.ago, milestone: milestone) }
+
+  let(:mr_1) { create(:merge_request, source_project: project, allow_broken: true, created_at: 20.days.ago) }
+  let(:mr_2) { create(:merge_request, source_project: project, allow_broken: true, created_at: 19.days.ago) }
+
+  let(:pipeline_1) { create(:ci_empty_pipeline, status: 'created', project: project, ref: mr_1.source_branch, sha: mr_1.source_branch_sha, head_pipeline_of: mr_1) }
+  let(:pipeline_2) { create(:ci_empty_pipeline, status: 'created', project: project, ref: mr_2.source_branch, sha: mr_2.source_branch_sha, head_pipeline_of: mr_2) }
+
+  let(:build_1) { create(:ci_build, :success, pipeline: pipeline_1, author: user) }
+  let(:build_2) { create(:ci_build, :success, pipeline: pipeline_2, author: user) }
+
+  let(:params) { { created_after: 3.months.ago, created_before: Time.now, group_id: group.full_path } }
+
+  def prepare_cycle_analytics_data
+    group.add_maintainer(user)
+    project.add_maintainer(user)
+
+    create_commit_referencing_issue(issue_1)
+    create_commit_referencing_issue(issue_2)
+
+    create_merge_request_closing_issue(user, project, issue_1)
+    create_merge_request_closing_issue(user, project, issue_2)
+    merge_merge_requests_closing_issue(user, project, issue_3)
+  end
+
+  def create_deployment
+    deploy_master(user, project, environment: 'staging')
+    deploy_master(user, project)
+  end
+
+  def update_metrics
+    issue_1.metrics.update!(first_added_to_board_at: 3.days.ago, first_mentioned_in_commit_at: 2.days.ago)
+    issue_2.metrics.update!(first_added_to_board_at: 2.days.ago, first_mentioned_in_commit_at: 1.day.ago)
+
+    mr_1.metrics.update!({
+      merged_at: 5.days.ago,
+      first_deployed_to_production_at: 1.day.ago,
+      latest_build_started_at: 5.days.ago,
+      latest_build_finished_at: 1.day.ago,
+      pipeline: build_1.pipeline
+    })
+
+    mr_2.metrics.update!({
+      merged_at: 10.days.ago,
+      first_deployed_to_production_at: 5.days.ago,
+      latest_build_started_at: 9.days.ago,
+      latest_build_finished_at: 7.days.ago,
+      pipeline: build_2.pipeline
+    })
+  end
+
+  before do
+    stub_licensed_features(cycle_analytics_for_groups: true)
+
+    prepare_cycle_analytics_data
+  end
+end