Skip to content
Snippets Groups Projects
Commit 34db6e61 authored by Piotr Skorupa's avatar Piotr Skorupa
Browse files

Merge branch 'kerrizor/refactor-finder-spec' into 'master'

Refactor OldestPerCommitFinder spec

See merge request !131941



Merged-by: default avatarPiotr Skorupa <pskorupa@gitlab.com>
Approved-by: default avatarDavid Dieulivol <ddieulivol@gitlab.com>
Approved-by: default avatarPiotr Skorupa <pskorupa@gitlab.com>
Co-authored-by: default avatarKerri Miller <kerrizor@kerrizor.com>
parents 3446da4d e3bbc68b
No related branches found
No related tags found
1 merge request!131941Refactor OldestPerCommitFinder spec
Pipeline #1011461902 failed
Pipeline: E2E Omnibus GitLab EE

#1011530884

    Pipeline: GitLab

    #1011465756

      Pipeline: E2E GDK

      #1011465081

        +21
        ......@@ -2,7 +2,7 @@
        require 'spec_helper'
        RSpec.describe MergeRequests::OldestPerCommitFinder do
        RSpec.describe MergeRequests::OldestPerCommitFinder, feature_category: :code_review_workflow do
        describe '#execute' do
        it 'returns a Hash mapping commit SHAs to their oldest merge requests' do
        project = create(:project)
        ......@@ -18,8 +18,8 @@
        merge_commit_sha: sha3
        )
        mr1_diff = create(:merge_request_diff, merge_request: mr1)
        mr2_diff = create(:merge_request_diff, merge_request: mr2)
        mr1_diff = mr1.merge_request_diff
        mr2_diff = mr2.merge_request_diff
        create(:merge_request_diff_commit, merge_request_diff: mr1_diff, sha: sha1)
        create(:merge_request_diff_commit, merge_request_diff: mr2_diff, sha: sha1)
        ......@@ -71,6 +71,7 @@
        # This expectation is set so we're certain that the merge commit SHAs (if
        # a matching merge request is found) aren't also used for finding MRs
        # according to diffs.
        #
        expect(MergeRequestDiffCommit)
        .not_to receive(:oldest_merge_request_id_per_commit)
        ......@@ -126,9 +127,12 @@
        )
        mr2 = create(:merge_request, :merged, target_project: project)
        mr_diff = create(:merge_request_diff, merge_request: mr2)
        create(:merge_request_diff_commit, merge_request_diff: mr_diff, sha: sha)
        create(
        :merge_request_diff_commit,
        merge_request_diff: mr2.merge_request_diff,
        sha: sha
        )
        commits = [double(:commit, id: sha)]
        ......
        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