Skip to content
Snippets Groups Projects
Verified Commit d3c19f6c authored by Heinrich Lee Yu's avatar Heinrich Lee Yu Committed by GitLab
Browse files

Merge branch '446093-fix-flaky-spec' into 'master'

Group label events in deterministic order

See merge request !164502



Merged-by: Heinrich Lee Yu's avatarHeinrich Lee Yu <heinrich@gitlab.com>
Approved-by: default avatarAdie (she/her) <avpfestin@gitlab.com>
Approved-by: Kassio Borges's avatarKassio Borges <kborges@gitlab.com>
Approved-by: Pavel Shutsin's avatarPavel Shutsin <pshutsin@gitlab.com>
parents 814f93d9 c1aeaa1f
No related branches found
No related tags found
1 merge request!164502Group label events in deterministic order
Pipeline #1437662759 passed with warnings
Pipeline: [sidekiq gem] Ruby 3.1.5 pipeline

#1438035062

    Pipeline: E2E Omnibus GitLab EE

    #1437722481

      Pipeline: E2E CNG

      #1437722451

        +31
        ......@@ -18,7 +18,7 @@ def synthetic_notes
        def label_events_by_discussion_id
        return [] unless resource.respond_to?(:resource_label_events)
        events = resource.resource_label_events.includes(:label, user: :status) # rubocop: disable CodeReuse/ActiveRecord
        events = resource.resource_label_events.includes(:label, user: :status).order(:id) # rubocop: disable CodeReuse/ActiveRecord
        events = apply_common_filters(events)
        events.group_by { |event| event.discussion_id }
        ......
        ......@@ -17,9 +17,7 @@
        describe 'fetching notes for incidents' do
        let_it_be(:issuable) { create(:incident, project: project) }
        context 'when quarantined shared example', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/446093' do
        it_behaves_like 'listing issuable discussions', user_role: :guest, internal_discussions: 1, total_discussions: 7
        end
        it_behaves_like 'listing issuable discussions', user_role: :guest, internal_discussions: 1, total_discussions: 7
        end
        describe 'fetching notes for epics' do
        ......@@ -38,9 +36,7 @@
        expect(epic_discussions.count).to eq(work_item_discussions.count)
        end
        context 'when quarantined shared example', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/446093' do
        it_behaves_like 'listing issuable discussions', user_role: :guest, internal_discussions: 1, total_discussions: 5
        end
        it_behaves_like 'listing issuable discussions', user_role: :guest, internal_discussions: 1, total_discussions: 5
        describe 'fetching notes for epic work item' do
        let_it_be(:epic) { create(:epic, group: group) }
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment