diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 21:08:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 21:08:54 +0300 |
commit | 0d6fa033121a9bef708b8f2de186c4034c61d4a3 (patch) | |
tree | 851d65a09efbffa114c9a273e590d55cfb1436ab /spec/features | |
parent | 0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
4 files changed, 5 insertions, 5 deletions
diff --git a/spec/features/issues/user_creates_branch_and_merge_request_spec.rb b/spec/features/issues/user_creates_branch_and_merge_request_spec.rb index 8322a6afa04..45da4f30e4f 100644 --- a/spec/features/issues/user_creates_branch_and_merge_request_spec.rb +++ b/spec/features/issues/user_creates_branch_and_merge_request_spec.rb @@ -187,7 +187,7 @@ describe 'User creates branch and merge request on issue page', :js do let(:branch_name) { "#{issue.iid}-foo" } before do - project.repository.create_branch(branch_name, 'master') + project.repository.create_branch(branch_name) visit project_issue_path(project, issue) end 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) diff --git a/spec/features/projects/graph_spec.rb b/spec/features/projects/graph_spec.rb index 7b5c731c34b..562dbeb816a 100644 --- a/spec/features/projects/graph_spec.rb +++ b/spec/features/projects/graph_spec.rb @@ -60,7 +60,7 @@ describe 'Project Graph', :js do let(:branch_name) { '<h1>evil</h1>' } before do - project.repository.create_branch(branch_name, 'master') + project.repository.create_branch(branch_name) visit charts_project_graph_path(project, branch_name) end |