From 0d6fa033121a9bef708b8f2de186c4034c61d4a3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 6 Feb 2020 18:08:54 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/features/merge_request/user_posts_diff_notes_spec.rb | 2 +- spec/features/merge_request/user_resolves_conflicts_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'spec/features/merge_request') diff --git a/spec/features/merge_request/user_posts_diff_notes_spec.rb b/spec/features/merge_request/user_posts_diff_notes_spec.rb index a76e40da9e5..103d126891e 100644 --- a/spec/features/merge_request/user_posts_diff_notes_spec.rb +++ b/spec/features/merge_request/user_posts_diff_notes_spec.rb @@ -46,7 +46,7 @@ describe 'Merge request > User posts diff notes', :js do end context 'with an old line on the left and a new line on the right' do - it 'allows commenting on the left side' do + it 'allows commenting on the left side', quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/199050' do should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_9_9"]').find(:xpath, '..'), 'left') end diff --git a/spec/features/merge_request/user_resolves_conflicts_spec.rb b/spec/features/merge_request/user_resolves_conflicts_spec.rb index ce85e81868d..5fc65f020d3 100644 --- a/spec/features/merge_request/user_resolves_conflicts_spec.rb +++ b/spec/features/merge_request/user_resolves_conflicts_spec.rb @@ -169,8 +169,8 @@ describe 'Merge request > User resolves conflicts', :js do context "with malicious branch name" do let(:bad_branch_name) { "malicious-branch-{{toString.constructor('alert(/xss/)')()}}" } - let(:branch) { project.repository.create_branch(bad_branch_name, 'conflict-resolvable') } - let(:merge_request) { create_merge_request(branch.name) } + let!(:branch) { project.repository.create_branch(bad_branch_name, 'conflict-resolvable') } + let(:merge_request) { create_merge_request(bad_branch_name) } before do visit project_merge_request_path(project, merge_request) -- cgit v1.2.3