Add latest changes from gitlab-org/gitlab@master

1 files changed, 19 insertions, 0 deletions

diff --git a/spec/features/merge_requests/user_views_diffs_commit_spec.rb b/spec/features/merge_requests/user_views_diffs_commit_spec.rb
new file mode 100644
index 00000000000..590397df73f
--- /dev/null
+++ b/spec/features/merge_requests/user_views_diffs_commit_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'User views diff by commit', :js do
+  let(:merge_request) do
+    create(:merge_request_with_diffs, source_project: project, target_project: project, source_branch: 'merge-test')
+  end
+  let(:project) { create(:project, :public, :repository) }
+
+  before do
+    stub_feature_flags(diffs_batch_load: false)
+    visit(diffs_project_merge_request_path(project, merge_request, commit_id: merge_request.diff_head_sha))
+  end
+
+  it 'shows full commit description by default' do
+    expect(page).to have_selector('.commit-row-description', visible: true)
+  end
+end