Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-12-12 09:10:45 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-12-12 09:10:45 +0300
commitd89147da045b9d00c4e35de3c7b39ed2b02ef7a6 (patch)
treee5adaeb09829e7109ccabc97fc5d395c75e47027 /spec/features
parentfdc2b6184d20e767f089557f3cdc68837a6aacfb (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/merge_request/user_sees_versions_spec.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_sees_versions_spec.rb b/spec/features/merge_request/user_sees_versions_spec.rb
index 715cc2f73be..2df9d91c8ee 100644
--- a/spec/features/merge_request/user_sees_versions_spec.rb
+++ b/spec/features/merge_request/user_sees_versions_spec.rb
@@ -56,6 +56,10 @@ RSpec.describe 'Merge request > User sees versions', :js, feature_category: :cod
expect(page).to have_content '8 files'
end
+ it 'has the correct count for changes' do
+ expect(page).to have_content 'Changes 8'
+ end
+
it_behaves_like 'allows commenting',
file_name: '.gitmodules',
line_text: '[submodule "six"]',
@@ -123,6 +127,10 @@ RSpec.describe 'Merge request > User sees versions', :js, feature_category: :cod
end
end
+ it 'has the correct count for changes' do
+ expect(page).to have_content 'Changes 4'
+ end
+
it 'has a path with comparison context and shows comments that were last relevant at that version' do
expect(page).to have_current_path diffs_project_merge_request_path(
project,