Merge branch...

Merge branch '209776-transient-failure-diffs-components-commit_item-in-jest-as-if-foss-find-did-not-return-pre' into 'master'

More stable fixture for commit_with_diff

Closes #209776

See merge request gitlab-org/gitlab!29021

spec/frontend/diffs/components/commit_item_spec.js

@@ -59,9 +59,7 @@ describe('diffs/components/commit_item', () => {
       expect(titleElement.text()).toBe(commit.title_html);
     });
 
-    // https://gitlab.com/gitlab-org/gitlab/-/issues/209776
-    // eslint-disable-next-line jest/no-disabled-tests
-    it.skip('renders commit description', () => {
+    it('renders commit description', () => {
       const descElement = getDescElement();
       const descExpandElement = getDescExpandElement();
 

spec/frontend/fixtures/merge_requests_diffs.rb

@@ -10,7 +10,6 @@ describe Projects::MergeRequests::DiffsController, '(JavaScript fixtures)', type
   let(:project) { create(:project, :repository, namespace: namespace, path: 'merge-requests-project') }
   let(:merge_request) { create(:merge_request, :with_diffs, source_project: project, target_project: project, description: '- [ ] Task List Item') }
   let(:path) { "files/ruby/popen.rb" }
-  let(:selected_commit) { merge_request.all_commits[0] }
   let(:position) do
     build(:text_diff_position, :added,
       file: path,
@@ -34,11 +33,11 @@ describe Projects::MergeRequests::DiffsController, '(JavaScript fixtures)', type
   end
 
   it 'merge_request_diffs/with_commit.json' do
-    # Create a user that matches the selected commit author
+    # Create a user that matches the project.commit author
     # This is so that the "author" information will be populated
-    create(:user, email: selected_commit.author_email, name: selected_commit.author_name)
+    create(:user, email: project.commit.author_email, name: project.commit.author_name)
 
-    render_merge_request(merge_request, commit_id: selected_commit.sha)
+    render_merge_request(merge_request, commit_id: project.commit.sha)
   end
 
   it 'merge_request_diffs/inline_changes_tab_with_comments.json' do