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
31b27ade
Commit
31b27ade
authored
Apr 02, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix milestones tab active state and tests
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
84794051
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
6 deletions
+8
-6
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+1
-1
features/steps/group/milestones.rb
features/steps/group/milestones.rb
+2
-2
features/steps/project/active_tab.rb
features/steps/project/active_tab.rb
+1
-1
features/steps/project/fork.rb
features/steps/project/fork.rb
+1
-1
features/steps/project/project.rb
features/steps/project/project.rb
+3
-1
No files found.
app/views/layouts/nav/_dashboard.html.haml
View file @
31b27ade
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
=
icon
(
'group fw'
)
=
icon
(
'group fw'
)
%span
%span
Groups
Groups
=
nav_link
(
controller: :milestones
)
do
=
nav_link
(
path:
'dashboard#milestones'
)
do
=
link_to
dashboard_milestones_path
,
title:
'Milestones'
do
=
link_to
dashboard_milestones_path
,
title:
'Milestones'
do
=
icon
(
'clock-o fw'
)
=
icon
(
'clock-o fw'
)
%span
%span
...
...
features/steps/group/milestones.rb
View file @
31b27ade
...
@@ -5,8 +5,8 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
...
@@ -5,8 +5,8 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
include
SharedUser
include
SharedUser
step
'I click on group milestones'
do
step
'I click on group milestones'
do
within
'.nav-secondary'
do
page
.
within
'.nav-secondary'
do
click_link
'Milestones'
click_link
(
"Milestones"
)
end
end
end
end
...
...
features/steps/project/active_tab.rb
View file @
31b27ade
...
@@ -82,7 +82,7 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
...
@@ -82,7 +82,7 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
# Sub Tabs: Issues
# Sub Tabs: Issues
step
'I click the "Milestones" tab'
do
step
'I click the "Milestones" tab'
do
within
'.nav-secondary'
do
page
.
within
'.nav-secondary'
do
click_link
(
'Milestones'
)
click_link
(
'Milestones'
)
end
end
end
end
...
...
features/steps/project/fork.rb
View file @
31b27ade
...
@@ -36,7 +36,7 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
...
@@ -36,7 +36,7 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
end
end
step
'I goto the Merge Requests page'
do
step
'I goto the Merge Requests page'
do
page
.
within
'.
page-sidebar-expanded
'
do
page
.
within
'.
nav-secondary
'
do
click_link
"Merge Requests"
click_link
"Merge Requests"
end
end
end
end
...
...
features/steps/project/project.rb
View file @
31b27ade
...
@@ -114,7 +114,9 @@ class Spinach::Features::Project < Spinach::FeatureSteps
...
@@ -114,7 +114,9 @@ class Spinach::Features::Project < Spinach::FeatureSteps
end
end
step
'I should not see "Snippets" button'
do
step
'I should not see "Snippets" button'
do
expect
(
page
).
not_to
have_link
'Snippets'
page
.
within
'.nav-secondary'
do
expect
(
page
).
not_to
have_link
'Snippets'
end
end
end
step
'project "Shop" belongs to group'
do
step
'project "Shop" belongs to group'
do
...
...
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