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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
f4a694ef
Commit
f4a694ef
authored
Jan 10, 2018
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix using wrong `Your projects` link in QA tests
parent
a9ace7bf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
app/views/dashboard/_projects_head.html.haml
app/views/dashboard/_projects_head.html.haml
+1
-1
app/views/layouts/nav/projects_dropdown/_show.html.haml
app/views/layouts/nav/projects_dropdown/_show.html.haml
+2
-2
qa/qa/page/menu/main.rb
qa/qa/page/menu/main.rb
+5
-1
No files found.
app/views/dashboard/_projects_head.html.haml
View file @
f4a694ef
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
.fade-right
=
icon
(
'angle-right'
)
.fade-right
=
icon
(
'angle-right'
)
%ul
.nav-links.scrolling-tabs
%ul
.nav-links.scrolling-tabs
=
nav_link
(
page:
[
dashboard_projects_path
,
root_path
])
do
=
nav_link
(
page:
[
dashboard_projects_path
,
root_path
])
do
=
link_to
dashboard_projects_path
,
class:
'shortcuts-activity
qa-your-projects-link
'
,
data:
{
placement:
'right'
}
do
=
link_to
dashboard_projects_path
,
class:
'shortcuts-activity'
,
data:
{
placement:
'right'
}
do
Your projects
Your projects
=
nav_link
(
page:
starred_dashboard_projects_path
)
do
=
nav_link
(
page:
starred_dashboard_projects_path
)
do
=
link_to
starred_dashboard_projects_path
,
data:
{
placement:
'right'
}
do
=
link_to
starred_dashboard_projects_path
,
data:
{
placement:
'right'
}
do
...
...
app/views/layouts/nav/projects_dropdown/_show.html.haml
View file @
f4a694ef
-
project_meta
=
{
id:
@project
.
id
,
name:
@project
.
name
,
namespace:
@project
.
name_with_namespace
,
web_url:
project_path
(
@project
),
avatar_url:
@project
.
avatar_url
}
if
@project
&
.
persisted?
-
project_meta
=
{
id:
@project
.
id
,
name:
@project
.
name
,
namespace:
@project
.
name_with_namespace
,
web_url:
project_path
(
@project
),
avatar_url:
@project
.
avatar_url
}
if
@project
&
.
persisted?
.projects-dropdown-container
.projects-dropdown-container
.project-dropdown-sidebar
.project-dropdown-sidebar
.qa-projects-dropdown-sidebar
%ul
%ul
=
nav_link
(
path:
'dashboard/projects#index'
)
do
=
nav_link
(
path:
'dashboard/projects#index'
)
do
=
link_to
dashboard_projects_path
do
=
link_to
dashboard_projects_path
,
class:
'qa-your-projects-link'
do
=
_
(
'Your projects'
)
=
_
(
'Your projects'
)
=
nav_link
(
path:
'projects#starred'
)
do
=
nav_link
(
path:
'projects#starred'
)
do
=
link_to
starred_dashboard_projects_path
do
=
link_to
starred_dashboard_projects_path
do
...
...
qa/qa/page/menu/main.rb
View file @
f4a694ef
...
@@ -15,7 +15,8 @@ module QA
...
@@ -15,7 +15,8 @@ module QA
element
:groups_link
element
:groups_link
end
end
view
'app/views/dashboard/_projects_head.html.haml'
do
view
'app/views/layouts/nav/projects_dropdown/_show.html.haml'
do
element
:projects_dropdown_sidebar
element
:your_projects_link
element
:your_projects_link
end
end
...
@@ -26,6 +27,9 @@ module QA
...
@@ -26,6 +27,9 @@ module QA
def
go_to_projects
def
go_to_projects
within_top_menu
do
within_top_menu
do
click_element
:projects_dropdown
click_element
:projects_dropdown
end
page
.
within
(
'.qa-projects-dropdown-sidebar'
)
do
click_element
:your_projects_link
click_element
:your_projects_link
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