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
aed848cc
Commit
aed848cc
authored
Jul 12, 2021
by
Angelo Gulina
Committed by
Jonas Wälter
Oct 12, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply 3 suggestion(s) to 3 file(s)
parent
1c4a0e09
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
56 additions
and
10 deletions
+56
-10
app/views/dashboard/_projects_nav.html.haml
app/views/dashboard/_projects_nav.html.haml
+1
-1
app/views/shared/empty_states/_topics.html.haml
app/views/shared/empty_states/_topics.html.haml
+3
-3
locale/gitlab.pot
locale/gitlab.pot
+3
-3
spec/features/explore/topics_spec.rb
spec/features/explore/topics_spec.rb
+1
-1
spec/features/explore/user_explores_projects_spec.rb
spec/features/explore/user_explores_projects_spec.rb
+48
-2
No files found.
app/views/dashboard/_projects_nav.html.haml
View file @
aed848cc
-
feature_project_list_filter_bar
=
Feature
.
enabled?
(
:project_list_filter_bar
)
%ul
.nav-links.scrolling-tabs.mobile-separator.nav.nav-tabs
{
class:
(
'
border-0
'
if
feature_project_list_filter_bar
)
}
%ul
.nav-links.scrolling-tabs.mobile-separator.nav.nav-tabs
{
class:
(
'
gl-border-0!
'
if
feature_project_list_filter_bar
)
}
=
nav_link
(
page:
[
dashboard_projects_path
,
root_path
])
do
=
link_to
dashboard_projects_path
,
class:
'shortcuts-activity'
,
data:
{
placement:
'right'
}
do
=
_
(
"Your projects"
)
...
...
app/views/shared/empty_states/_topics.html.haml
View file @
aed848cc
...
...
@@ -2,6 +2,6 @@
.col-12
.svg-content
=
image_tag
'illustrations/labels.svg'
,
data:
{
qa_selector:
'svg_content'
}
.text-content.
text-center.pt-0
%h4
.text-center
=
s_
(
'TopicsEmptyState|
There are no topics to show.'
)
%p
=
_
(
"You can apply topics to projects to categorize them."
)
.text-content.
gl-text-center.gl-pt-0
!
%h4
=
_
(
'
There are no topics to show.'
)
%p
=
_
(
'You can apply topics to projects to categorize them.'
)
locale/gitlab.pot
View file @
aed848cc
...
...
@@ -34332,6 +34332,9 @@ msgstr ""
msgid "There are no projects shared with this group yet"
msgstr ""
msgid "There are no topics to show."
msgstr ""
msgid "There are no variables yet."
msgstr ""
...
...
@@ -35830,9 +35833,6 @@ msgstr ""
msgid "Topics (optional)"
msgstr ""
msgid "TopicsEmptyState|There are no topics to show."
msgstr ""
msgid "Total"
msgstr ""
...
...
spec/features/explore/topics_spec.rb
View file @
aed848cc
...
...
@@ -14,7 +14,7 @@ RSpec.describe 'Explore Topics' do
visit
topics_explore_projects_path
expect
(
current_path
).
to
eq
topics_explore_projects_path
expect
(
page
).
to
have_content
(
'There are no topics to show'
)
expect
(
page
).
to
have_content
(
'There are no topics to show
.
'
)
end
end
...
...
spec/features/explore/user_explores_projects_spec.rb
View file @
aed848cc
...
...
@@ -5,9 +5,9 @@ require 'spec_helper'
RSpec
.
describe
'User explores projects'
do
context
'when some projects exist'
do
let_it_be
(
:archived_project
)
{
create
(
:project
,
:archived
)
}
let_it_be
(
:internal_project
)
{
create
(
:project
,
:internal
)
}
let_it_be
(
:internal_project
)
{
create
(
:project
,
:internal
,
topic_list:
'topic1'
)
}
let_it_be
(
:private_project
)
{
create
(
:project
,
:private
)
}
let_it_be
(
:public_project
)
{
create
(
:project
,
:public
)
}
let_it_be
(
:public_project
)
{
create
(
:project
,
:public
,
topic_list:
'topic1'
)
}
context
'when not signed in'
do
context
'when viewing public projects'
do
...
...
@@ -28,6 +28,29 @@ RSpec.describe 'User explores projects' do
expect
(
page
).
to
have_current_path
(
new_user_session_path
)
end
end
context
'when filtering for existing topic'
do
before
do
visit
(
explore_projects_path
(
topic:
'topic1'
))
end
it
'shows correct projects'
do
expect
(
page
).
to
have_content
(
public_project
.
title
)
expect
(
page
).
not_to
have_content
(
internal_project
.
title
)
expect
(
page
).
not_to
have_content
(
private_project
.
title
)
expect
(
page
).
not_to
have_content
(
archived_project
.
title
)
end
end
context
'when filtering for non-existing topic'
do
before
do
visit
(
explore_projects_path
(
topic:
'topic2'
))
end
it
'shows correct empty state message'
do
expect
(
page
).
to
have_content
(
'Explore public groups to find projects to contribute to.'
)
end
end
end
context
'when signed in'
do
...
...
@@ -88,6 +111,29 @@ RSpec.describe 'User explores projects' do
include_examples
'empty search results'
include_examples
'minimum search length'
end
context
'when filtering for existing topic'
do
before
do
visit
(
explore_projects_path
(
topic:
'topic1'
))
end
it
'shows correct projects'
do
expect
(
page
).
to
have_content
(
public_project
.
title
)
expect
(
page
).
to
have_content
(
internal_project
.
title
)
expect
(
page
).
not_to
have_content
(
private_project
.
title
)
expect
(
page
).
not_to
have_content
(
archived_project
.
title
)
end
end
context
'when filtering for non-existing topic'
do
before
do
visit
(
explore_projects_path
(
topic:
'topic2'
))
end
it
'shows correct empty state message'
do
expect
(
page
).
to
have_content
(
'Explore public groups to find projects to contribute to.'
)
end
end
end
end
...
...
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