diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 21:09:09 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 21:09:09 +0000 |
commit | 167894d0e7c98aae1c6d4f5a060ad6d58ea3f382 (patch) | |
tree | dd0ce964cf0db395b0b143a079c58bb4aabae591 /spec | |
parent | 411cc77938f99b495e0fe802705d275a28e939ef (diff) | |
download | gitlab-ce-167894d0e7c98aae1c6d4f5a060ad6d58ea3f382.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
16 files changed, 82 insertions, 18 deletions
diff --git a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb index 7d3df711555..a3742af31de 100644 --- a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb +++ b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb @@ -11,7 +11,7 @@ describe 'Resolving all open threads in a merge request from an issue', :js do def resolve_all_discussions_link_selector text = "Resolve all threads in new issue" url = new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid) - %Q{a[data-original-title="#{text}"][href="#{url}"]} + %Q{a[title="#{text}"][href="#{url}"]} end describe 'as a user with access to the project' do diff --git a/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb b/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb index 8f4083533b3..1c17b39c03a 100644 --- a/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb +++ b/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb @@ -11,7 +11,7 @@ describe 'Resolve an open thread in a merge request by creating an issue', :js d def resolve_discussion_selector title = 'Resolve this thread in a new issue' url = new_project_issue_path(project, discussion_to_resolve: discussion.id, merge_request_to_resolve_discussions_of: merge_request.iid) - "a[data-original-title=\"#{title}\"][href=\"#{url}\"]" + "a[title=\"#{title}\"][href=\"#{url}\"]" end describe 'As a user with access to the project' do diff --git a/spec/features/merge_request/user_edits_assignees_sidebar_spec.rb b/spec/features/merge_request/user_edits_assignees_sidebar_spec.rb index 59c20f4ec6b..e6b77e28281 100644 --- a/spec/features/merge_request/user_edits_assignees_sidebar_spec.rb +++ b/spec/features/merge_request/user_edits_assignees_sidebar_spec.rb @@ -16,7 +16,7 @@ describe 'Merge request > User edits assignees sidebar', :js do # DOM finders to simplify and improve readability let(:sidebar_assignee_block) { page.find('.js-issuable-sidebar .assignee') } let(:sidebar_assignee_avatar_link) { sidebar_assignee_block.find_all('a').find { |a| a['href'].include? assignee.username } } - let(:sidebar_assignee_tooltip) { sidebar_assignee_avatar_link['data-original-title'] || '' } + let(:sidebar_assignee_tooltip) { sidebar_assignee_avatar_link['title'] || '' } let(:sidebar_assignee_dropdown_item) { sidebar_assignee_block.find(".dropdown-menu li[data-user-id=\"#{assignee.id}\"]") } let(:sidebar_assignee_dropdown_tooltip) { sidebar_assignee_dropdown_item.find('a')['data-title'] || '' } diff --git a/spec/features/merge_request/user_sees_deployment_widget_spec.rb b/spec/features/merge_request/user_sees_deployment_widget_spec.rb index 3b599fcacb1..9670bd798bf 100644 --- a/spec/features/merge_request/user_sees_deployment_widget_spec.rb +++ b/spec/features/merge_request/user_sees_deployment_widget_spec.rb @@ -29,7 +29,7 @@ describe 'Merge request > User sees deployment widget', :js do wait_for_requests expect(page).to have_content("Deployed to #{environment.name}") - expect(find('.js-deploy-time')['data-original-title']).to eq(deployment.created_at.to_time.in_time_zone.to_s(:medium)) + expect(find('.js-deploy-time')['title']).to eq(deployment.created_at.to_time.in_time_zone.to_s(:medium)) end context 'when a user created a new merge request with the same SHA' do diff --git a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb index 95cb0a2dee3..62e0e4d76ed 100644 --- a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb +++ b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb @@ -112,7 +112,7 @@ describe 'User comments on a diff', :js do changes = sample_compare(expanded_changes).changes.last(expanded_changes.size) page.within("[id='#{hash}']") do - find("button[data-original-title='Show full file']").click + find("button[title='Show full file']").click wait_for_requests click_diff_line(find("[id='#{changes.first[:line_code]}']")) diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb index 01687674309..12412e87a7b 100644 --- a/spec/features/projects/environments/environments_spec.rb +++ b/spec/features/projects/environments/environments_spec.rb @@ -13,7 +13,7 @@ describe 'Environments page', :js do end def stop_button_selector - %q{button[data-original-title="Stop environment"]} + %q{button[title="Stop environment"]} end describe 'page tabs' do diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb index 198af65c361..cb0acc55e06 100644 --- a/spec/features/projects/pipelines/pipeline_spec.rb +++ b/spec/features/projects/pipelines/pipeline_spec.rb @@ -217,7 +217,7 @@ describe 'Pipeline', :js do it 'includes the failure reason' do page.within('#ci-badge-test') do build_link = page.find('.js-pipeline-graph-job-link') - expect(build_link['data-original-title']).to eq('test - failed - (unknown failure)') + expect(build_link['title']).to eq('test - failed - (unknown failure)') end end end diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb index b4c9eb7ebec..7634100347e 100644 --- a/spec/features/projects/pipelines/pipelines_spec.rb +++ b/spec/features/projects/pipelines/pipelines_spec.rb @@ -270,7 +270,7 @@ describe 'Pipelines', :js do it 'contains badge with tooltip which contains error' do expect(pipeline).to have_yaml_errors expect(page).to have_selector( - %Q{span[data-original-title="#{pipeline.yaml_errors}"]}) + %Q{span[title="#{pipeline.yaml_errors}"]}) end it 'contains badge that indicates failure reason' do @@ -280,7 +280,7 @@ describe 'Pipelines', :js do it 'contains badge with tooltip which contains failure reason' do expect(pipeline.failure_reason?).to eq true expect(page).to have_selector( - %Q{span[data-original-title="#{pipeline.present.failure_reason}"]}) + %Q{span[title="#{pipeline.present.failure_reason}"]}) end end @@ -569,7 +569,7 @@ describe 'Pipelines', :js do within('.js-builds-dropdown-list') do build_element = page.find('.mini-pipeline-graph-dropdown-item') - expect(build_element['data-original-title']).to eq('build - failed - (unknown failure)') + expect(build_element['title']).to eq('build - failed - (unknown failure)') end end end diff --git a/spec/features/projects/view_on_env_spec.rb b/spec/features/projects/view_on_env_spec.rb index 8b25565c08a..845c7b89a71 100644 --- a/spec/features/projects/view_on_env_spec.rb +++ b/spec/features/projects/view_on_env_spec.rb @@ -65,7 +65,7 @@ describe 'View on environment', :js do within '.diffs' do text = 'View on feature.review.example.com' url = 'http://feature.review.example.com/ruby/feature' - expect(page).to have_selector("a[data-original-title='#{text}'][href='#{url}']") + expect(page).to have_selector("a[title='#{text}'][href='#{url}']") end end end diff --git a/spec/frontend/clusters/components/__snapshots__/remove_cluster_confirmation_spec.js.snap b/spec/frontend/clusters/components/__snapshots__/remove_cluster_confirmation_spec.js.snap index 8f406c62824..a35348d86ea 100644 --- a/spec/frontend/clusters/components/__snapshots__/remove_cluster_confirmation_spec.js.snap +++ b/spec/frontend/clusters/components/__snapshots__/remove_cluster_confirmation_spec.js.snap @@ -3,7 +3,7 @@ exports[`Remove cluster confirmation modal renders splitbutton with modal included 1`] = ` <div> <div - class="dropdown btn-group b-dropdown gl-dropdown" + class="dropdown b-dropdown gl-dropdown btn-group" > <button class="btn btn-danger" @@ -31,7 +31,9 @@ exports[`Remove cluster confirmation modal renders splitbutton with modal includ role="menu" tabindex="-1" > - <li> + <li + role="presentation" + > <button class="dropdown-item is-active" role="menuitem" @@ -47,14 +49,18 @@ exports[`Remove cluster confirmation modal renders splitbutton with modal includ </button> </li> - <li> + <li + role="presentation" + > <hr aria-orientation="horizontal" class="dropdown-divider" role="separator" /> </li> - <li> + <li + role="presentation" + > <button class="dropdown-item" role="menuitem" diff --git a/spec/lib/gitlab/tcp_checker_spec.rb b/spec/lib/gitlab/tcp_checker_spec.rb index 49f04f269ae..9474e79cc5d 100644 --- a/spec/lib/gitlab/tcp_checker_spec.rb +++ b/spec/lib/gitlab/tcp_checker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::TcpChecker do +describe Gitlab::TcpChecker, :permit_dns do before do @server = TCPServer.new('localhost', 0) _, @port, _, @ip = @server.addr diff --git a/spec/lib/gitlab/url_blocker_spec.rb b/spec/lib/gitlab/url_blocker_spec.rb index a68ba489986..97859c82e9e 100644 --- a/spec/lib/gitlab/url_blocker_spec.rb +++ b/spec/lib/gitlab/url_blocker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::UrlBlocker do +describe Gitlab::UrlBlocker, :stub_invalid_dns_only do include StubRequests describe '#validate!' do diff --git a/spec/support/dns.rb b/spec/support/dns.rb new file mode 100644 index 00000000000..3e5c8e698e1 --- /dev/null +++ b/spec/support/dns.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +require Rails.root.join("spec/support/helpers/dns_helpers") + +RSpec.configure do |config| + config.include DnsHelpers + + config.before do + block_dns! + end + + config.before(:each, :permit_dns) do + permit_dns! + end + + config.before(:each, :stub_invalid_dns_only) do + permit_dns! + stub_invalid_dns! + end +end diff --git a/spec/support/helpers/dns_helpers.rb b/spec/support/helpers/dns_helpers.rb new file mode 100644 index 00000000000..941b57c2c97 --- /dev/null +++ b/spec/support/helpers/dns_helpers.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +module DnsHelpers + def block_dns! + stub_all_dns! + stub_invalid_dns! + permit_local_dns! + end + + def permit_dns! + allow(Addrinfo).to receive(:getaddrinfo).and_call_original + end + + def stub_all_dns! + allow(Addrinfo).to receive(:getaddrinfo).with(anything, anything, nil, :STREAM).and_return([]) + allow(Addrinfo).to receive(:getaddrinfo).with(anything, anything, nil, :STREAM, anything, anything).and_return([]) + end + + def stub_invalid_dns! + allow(Addrinfo).to receive(:getaddrinfo).with(/foobar\.\w|(\d{1,3}\.){4,}\d{1,3}/i, anything, nil, :STREAM) do + raise SocketError.new("getaddrinfo: Name or service not known") + end + end + + def permit_local_dns! + local_addresses = /(127|10)\.0\.0\.\d{1,3}|(192\.168|172\.16)\.\d{1,3}\.\d{1,3}|0\.0\.0\.0|localhost/i + allow(Addrinfo).to receive(:getaddrinfo).with(local_addresses, anything, nil, :STREAM).and_call_original + allow(Addrinfo).to receive(:getaddrinfo).with(local_addresses, anything, nil, :STREAM, anything, anything).and_call_original + end +end diff --git a/spec/support/shared_examples/features/error_tracking_shared_example.rb b/spec/support/shared_examples/features/error_tracking_shared_example.rb index f53adece864..4d913215f20 100644 --- a/spec/support/shared_examples/features/error_tracking_shared_example.rb +++ b/spec/support/shared_examples/features/error_tracking_shared_example.rb @@ -8,7 +8,7 @@ shared_examples 'error tracking index page' do end within('div.error-list') do - expect(page).to have_content('Error') + expect(page).to have_content('Open errors') expect(page).to have_content('Events') expect(page).to have_content('Users') expect(page).to have_content('Last Seen') diff --git a/spec/support/shared_examples/requests/api/notes_shared_examples.rb b/spec/support/shared_examples/requests/api/notes_shared_examples.rb index bd38417a5db..43bfeca93a2 100644 --- a/spec/support/shared_examples/requests/api/notes_shared_examples.rb +++ b/spec/support/shared_examples/requests/api/notes_shared_examples.rb @@ -20,6 +20,14 @@ RSpec.shared_examples 'noteable API' do |parent_type, noteable_type, id_name| expect(response_dates).to eq(response_dates.sort.reverse) end + it 'fetches notes using parent path as id paremeter' do + parent_id = CGI.escape(parent.full_path) + + get api("/#{parent_type}/#{parent_id}/#{noteable_type}/#{noteable[id_name]}/notes", user) + + expect(response.status).to eq(200) + end + context '2 notes with equal created_at' do before do @first_note = Note.first |