Commit 3ec6eb7f authored by Aleksei Lipniagov's avatar Aleksei Lipniagov

Merge branch 'eread/update-name-sequences' into 'master'

Update name sequences to use entry from Technical Writer style guide

See merge request gitlab-org/gitlab!74468
parents 57f4a543 6e6efdb2
......@@ -89,7 +89,7 @@ RSpec.describe 'Groups > Members > Maintainer/Owner can override LDAP access lev
expect(page).to have_button 'Edit permissions'
end
within third_row do
within second_row do
expect(page).not_to have_content 'LDAP'
expect(page).not_to have_button 'Edit permissions'
expect(page).to have_button 'Guest', disabled: false
......
......@@ -1311,7 +1311,7 @@ RSpec.describe Gitlab::Elastic::SearchResults, :elastic, :clean_gitlab_redis_sha
ensure_elasticsearch_index!
results = described_class.new(user, 'noresults')
results = described_class.new(user, '"noresults"')
count = results.formatted_count('projects')
expect(count).to eq('0')
end
......
......@@ -54,7 +54,7 @@ RSpec.describe Project, :elastic, :clean_gitlab_redis_shared_state do
end
expect(described_class.elastic_search('main_pro*', options: { project_ids: :any }).total_count).to eq(1)
expect(described_class.elastic_search('test_two', options: { project_ids: :any }).total_count).to eq(0)
expect(described_class.elastic_search('"test_two"', options: { project_ids: :any }).total_count).to eq(0)
end
end
......
......@@ -2,7 +2,7 @@
FactoryBot.define do
sequence(:username) { |n| "user#{n}" }
sequence(:name) { |n| "John Doe#{n}" }
sequence(:name) { |n| "Sidney Jones#{n}" }
sequence(:email) { |n| "user#{n}@example.org" }
sequence(:email_alias) { |n| "user.alias#{n}@example.org" }
sequence(:title) { |n| "My title #{n}" }
......
......@@ -79,7 +79,7 @@ RSpec.describe 'Alert details', :js do
wait_for_requests
expect(alert_assignee).to have_content('Assignee Edit John Doe')
expect(alert_assignee).to have_content('Assignee Edit Sidney Jones')
end
end
end
......
......@@ -180,7 +180,7 @@ RSpec.describe 'GFM autocomplete', :js do
describe 'assignees' do
it 'does not wrap with quotes for assignee values' do
fill_in 'Comment', with: "@#{user.username[0]}"
fill_in 'Comment', with: "@#{user.username}"
find_highlighted_autocomplete_item.click
......
......@@ -42,7 +42,7 @@ RSpec.describe 'Pipeline Schedules', :js do
click_link 'Take ownership'
page.within('.pipeline-schedule-table-row') do
expect(page).not_to have_content('No owner')
expect(page).to have_link('John Doe')
expect(page).to have_link('Sidney Jones')
end
end
......
......@@ -161,7 +161,7 @@ RSpec.shared_examples 'User views a wiki page' do
commit = wiki.commit
visit wiki_page_path(wiki, wiki_page, version_id: commit, action: :diff)
expect(page).to have_content('by John Doe')
expect(page).to have_content('by Sidney Jones')
expect(page).to have_content('updated home')
expect(page).to have_content('Showing 1 changed file with 1 addition and 3 deletions')
expect(page).to have_content('some link')
......@@ -174,7 +174,7 @@ RSpec.shared_examples 'User views a wiki page' do
commit = wiki.commit('HEAD^')
visit wiki_page_path(wiki, wiki_page, version_id: commit, action: :diff)
expect(page).to have_content('by John Doe')
expect(page).to have_content('by Sidney Jones')
expect(page).to have_content('updated home')
expect(page).to have_content('Showing 1 changed file with 1 addition and 3 deletions')
expect(page).to have_content('some link')
......@@ -188,7 +188,7 @@ RSpec.shared_examples 'User views a wiki page' do
commit = wiki.commit('HEAD^')
visit wiki_page_path(wiki, wiki_page, version_id: commit, action: :diff)
expect(page).to have_content('by John Doe')
expect(page).to have_content('by Sidney Jones')
expect(page).to have_content('created page: home')
expect(page).to have_content('Showing 1 changed file with 4 additions and 0 deletions')
expect(page).to have_content('Look at this')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment