Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6e6efdb2
Commit
6e6efdb2
authored
Dec 08, 2021
by
Evan Read
Committed by
Aleksei Lipniagov
Dec 08, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update name sequences to use entry from Technical Writer style guide
parent
c89e1075
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
10 additions
and
10 deletions
+10
-10
ee/spec/features/groups/members/override_ldap_memberships_spec.rb
...features/groups/members/override_ldap_memberships_spec.rb
+1
-1
ee/spec/lib/gitlab/elastic/search_results_spec.rb
ee/spec/lib/gitlab/elastic/search_results_spec.rb
+1
-1
ee/spec/models/concerns/elastic/project_spec.rb
ee/spec/models/concerns/elastic/project_spec.rb
+1
-1
spec/factories/sequences.rb
spec/factories/sequences.rb
+1
-1
spec/features/alert_management/alert_details_spec.rb
spec/features/alert_management/alert_details_spec.rb
+1
-1
spec/features/issues/gfm_autocomplete_spec.rb
spec/features/issues/gfm_autocomplete_spec.rb
+1
-1
spec/features/projects/pipeline_schedules_spec.rb
spec/features/projects/pipeline_schedules_spec.rb
+1
-1
spec/support/shared_examples/features/wiki/user_views_wiki_page_shared_examples.rb
...les/features/wiki/user_views_wiki_page_shared_examples.rb
+3
-3
No files found.
ee/spec/features/groups/members/override_ldap_memberships_spec.rb
View file @
6e6efdb2
...
@@ -89,7 +89,7 @@ RSpec.describe 'Groups > Members > Maintainer/Owner can override LDAP access lev
...
@@ -89,7 +89,7 @@ RSpec.describe 'Groups > Members > Maintainer/Owner can override LDAP access lev
expect
(
page
).
to
have_button
'Edit permissions'
expect
(
page
).
to
have_button
'Edit permissions'
end
end
within
thir
d_row
do
within
secon
d_row
do
expect
(
page
).
not_to
have_content
'LDAP'
expect
(
page
).
not_to
have_content
'LDAP'
expect
(
page
).
not_to
have_button
'Edit permissions'
expect
(
page
).
not_to
have_button
'Edit permissions'
expect
(
page
).
to
have_button
'Guest'
,
disabled:
false
expect
(
page
).
to
have_button
'Guest'
,
disabled:
false
...
...
ee/spec/lib/gitlab/elastic/search_results_spec.rb
View file @
6e6efdb2
...
@@ -1311,7 +1311,7 @@ RSpec.describe Gitlab::Elastic::SearchResults, :elastic, :clean_gitlab_redis_sha
...
@@ -1311,7 +1311,7 @@ RSpec.describe Gitlab::Elastic::SearchResults, :elastic, :clean_gitlab_redis_sha
ensure_elasticsearch_index!
ensure_elasticsearch_index!
results
=
described_class
.
new
(
user
,
'
noresults
'
)
results
=
described_class
.
new
(
user
,
'
"noresults"
'
)
count
=
results
.
formatted_count
(
'projects'
)
count
=
results
.
formatted_count
(
'projects'
)
expect
(
count
).
to
eq
(
'0'
)
expect
(
count
).
to
eq
(
'0'
)
end
end
...
...
ee/spec/models/concerns/elastic/project_spec.rb
View file @
6e6efdb2
...
@@ -54,7 +54,7 @@ RSpec.describe Project, :elastic, :clean_gitlab_redis_shared_state do
...
@@ -54,7 +54,7 @@ RSpec.describe Project, :elastic, :clean_gitlab_redis_shared_state do
end
end
expect
(
described_class
.
elastic_search
(
'main_pro*'
,
options:
{
project_ids: :any
}).
total_count
).
to
eq
(
1
)
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
end
end
...
...
spec/factories/sequences.rb
View file @
6e6efdb2
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
FactoryBot
.
define
do
FactoryBot
.
define
do
sequence
(
:username
)
{
|
n
|
"user
#{
n
}
"
}
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
)
{
|
n
|
"user
#{
n
}
@example.org"
}
sequence
(
:email_alias
)
{
|
n
|
"user.alias
#{
n
}
@example.org"
}
sequence
(
:email_alias
)
{
|
n
|
"user.alias
#{
n
}
@example.org"
}
sequence
(
:title
)
{
|
n
|
"My title
#{
n
}
"
}
sequence
(
:title
)
{
|
n
|
"My title
#{
n
}
"
}
...
...
spec/features/alert_management/alert_details_spec.rb
View file @
6e6efdb2
...
@@ -79,7 +79,7 @@ RSpec.describe 'Alert details', :js do
...
@@ -79,7 +79,7 @@ RSpec.describe 'Alert details', :js do
wait_for_requests
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
end
end
end
...
...
spec/features/issues/gfm_autocomplete_spec.rb
View file @
6e6efdb2
...
@@ -180,7 +180,7 @@ RSpec.describe 'GFM autocomplete', :js do
...
@@ -180,7 +180,7 @@ RSpec.describe 'GFM autocomplete', :js do
describe
'assignees'
do
describe
'assignees'
do
it
'does not wrap with quotes for assignee values'
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
find_highlighted_autocomplete_item
.
click
...
...
spec/features/projects/pipeline_schedules_spec.rb
View file @
6e6efdb2
...
@@ -42,7 +42,7 @@ RSpec.describe 'Pipeline Schedules', :js do
...
@@ -42,7 +42,7 @@ RSpec.describe 'Pipeline Schedules', :js do
click_link
'Take ownership'
click_link
'Take ownership'
page
.
within
(
'.pipeline-schedule-table-row'
)
do
page
.
within
(
'.pipeline-schedule-table-row'
)
do
expect
(
page
).
not_to
have_content
(
'No owner'
)
expect
(
page
).
not_to
have_content
(
'No owner'
)
expect
(
page
).
to
have_link
(
'
John Doe
'
)
expect
(
page
).
to
have_link
(
'
Sidney Jones
'
)
end
end
end
end
...
...
spec/support/shared_examples/features/wiki/user_views_wiki_page_shared_examples.rb
View file @
6e6efdb2
...
@@ -161,7 +161,7 @@ RSpec.shared_examples 'User views a wiki page' do
...
@@ -161,7 +161,7 @@ RSpec.shared_examples 'User views a wiki page' do
commit
=
wiki
.
commit
commit
=
wiki
.
commit
visit
wiki_page_path
(
wiki
,
wiki_page
,
version_id:
commit
,
action: :diff
)
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
(
'updated home'
)
expect
(
page
).
to
have_content
(
'Showing 1 changed file with 1 addition and 3 deletions'
)
expect
(
page
).
to
have_content
(
'Showing 1 changed file with 1 addition and 3 deletions'
)
expect
(
page
).
to
have_content
(
'some link'
)
expect
(
page
).
to
have_content
(
'some link'
)
...
@@ -174,7 +174,7 @@ RSpec.shared_examples 'User views a wiki page' do
...
@@ -174,7 +174,7 @@ RSpec.shared_examples 'User views a wiki page' do
commit
=
wiki
.
commit
(
'HEAD^'
)
commit
=
wiki
.
commit
(
'HEAD^'
)
visit
wiki_page_path
(
wiki
,
wiki_page
,
version_id:
commit
,
action: :diff
)
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
(
'updated home'
)
expect
(
page
).
to
have_content
(
'Showing 1 changed file with 1 addition and 3 deletions'
)
expect
(
page
).
to
have_content
(
'Showing 1 changed file with 1 addition and 3 deletions'
)
expect
(
page
).
to
have_content
(
'some link'
)
expect
(
page
).
to
have_content
(
'some link'
)
...
@@ -188,7 +188,7 @@ RSpec.shared_examples 'User views a wiki page' do
...
@@ -188,7 +188,7 @@ RSpec.shared_examples 'User views a wiki page' do
commit
=
wiki
.
commit
(
'HEAD^'
)
commit
=
wiki
.
commit
(
'HEAD^'
)
visit
wiki_page_path
(
wiki
,
wiki_page
,
version_id:
commit
,
action: :diff
)
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
(
'created page: home'
)
expect
(
page
).
to
have_content
(
'Showing 1 changed file with 4 additions and 0 deletions'
)
expect
(
page
).
to
have_content
(
'Showing 1 changed file with 4 additions and 0 deletions'
)
expect
(
page
).
to
have_content
(
'Look at this'
)
expect
(
page
).
to
have_content
(
'Look at this'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment