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
Jérome Perrin
gitlab-ce
Commits
441948f4
Commit
441948f4
authored
Oct 28, 2016
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spinach tests
parent
4281daf3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
13 deletions
+8
-13
features/dashboard/active_tab.feature
features/dashboard/active_tab.feature
+3
-3
features/dashboard/dashboard.feature
features/dashboard/dashboard.feature
+0
-1
features/steps/shared/sidebar_active_tab.rb
features/steps/shared/sidebar_active_tab.rb
+5
-9
No files found.
features/dashboard/active_tab.feature
View file @
441948f4
...
@@ -18,7 +18,7 @@ Feature: Dashboard Active Tab
...
@@ -18,7 +18,7 @@ Feature: Dashboard Active Tab
Then
the active main tab should be Merge Requests
Then
the active main tab should be Merge Requests
And
no other main tabs should be active
And
no other main tabs should be active
Scenario
:
On Dashboard
Help
Scenario
:
On Dashboard
Groups
Given
I visit dashboard
help
page
Given
I visit dashboard
groups
page
Then
the active main tab should be
Help
Then
the active main tab should be
Groups
And
no other main tabs should be active
And
no other main tabs should be active
features/dashboard/dashboard.feature
View file @
441948f4
...
@@ -11,7 +11,6 @@ Feature: Dashboard
...
@@ -11,7 +11,6 @@ Feature: Dashboard
And
I visit dashboard page
And
I visit dashboard page
Scenario
:
I
should see projects list
Scenario
:
I
should see projects list
Then
I should see
"New Project"
link
Then
I should see
"Shop"
project link
Then
I should see
"Shop"
project link
Then
I should see
"Shop"
project CI status
Then
I should see
"Shop"
project CI status
...
...
features/steps/shared/sidebar_active_tab.rb
View file @
441948f4
module
SharedSidebarActiveTab
module
SharedSidebarActiveTab
include
Spinach
::
DSL
include
Spinach
::
DSL
step
'the active main tab should be Help'
do
ensure_active_main_tab
(
'Help'
)
end
step
'no other main tabs should be active'
do
step
'no other main tabs should be active'
do
expect
(
page
).
to
have_selector
(
'.nav-sidebar
>
li.active'
,
count:
1
)
expect
(
page
).
to
have_selector
(
'.nav-sidebar li.active'
,
count:
1
)
end
end
def
ensure_active_main_tab
(
content
)
def
ensure_active_main_tab
(
content
)
...
@@ -17,6 +13,10 @@ module SharedSidebarActiveTab
...
@@ -17,6 +13,10 @@ module SharedSidebarActiveTab
ensure_active_main_tab
(
'Projects'
)
ensure_active_main_tab
(
'Projects'
)
end
end
step
'the active main tab should be Groups'
do
ensure_active_main_tab
(
'Groups'
)
end
step
'the active main tab should be Projects'
do
step
'the active main tab should be Projects'
do
ensure_active_main_tab
(
'Projects'
)
ensure_active_main_tab
(
'Projects'
)
end
end
...
@@ -28,8 +28,4 @@ module SharedSidebarActiveTab
...
@@ -28,8 +28,4 @@ module SharedSidebarActiveTab
step
'the active main tab should be Merge Requests'
do
step
'the active main tab should be Merge Requests'
do
ensure_active_main_tab
(
'Merge Requests'
)
ensure_active_main_tab
(
'Merge Requests'
)
end
end
step
'the active main tab should be Help'
do
ensure_active_main_tab
(
'Help'
)
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