From 991a295378736c60d419c794f0accbf0336987fc Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 11 Nov 2019 00:06:26 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../merge_request/user_sees_mr_with_deleted_source_branch_spec.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb') diff --git a/spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb b/spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb index db0d632cdf2..3d25611e1ea 100644 --- a/spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb +++ b/spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb @@ -11,11 +11,14 @@ describe 'Merge request > User sees MR with deleted source branch', :js do let(:user) { project.creator } before do + stub_feature_flags(single_mr_diff_view: false) merge_request.update!(source_branch: 'this-branch-does-not-exist') sign_in(user) visit project_merge_request_path(project, merge_request) end + it_behaves_like 'rendering a single diff version' + it 'shows a message about missing source branch' do expect(page).to have_content('Source branch does not exist.') end -- cgit v1.2.1