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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
bcc04adb
Commit
bcc04adb
authored
Dec 21, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Css/views cleanup after layout restyle
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
abd83bae
Changes
25
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
60 additions
and
274 deletions
+60
-274
app/assets/stylesheets/sections/header.scss
app/assets/stylesheets/sections/header.scss
+5
-15
app/assets/stylesheets/sections/nav.scss
app/assets/stylesheets/sections/nav.scss
+0
-96
app/assets/stylesheets/sections/sidebar.scss
app/assets/stylesheets/sections/sidebar.scss
+0
-48
app/assets/stylesheets/themes/ui_basic.scss
app/assets/stylesheets/themes/ui_basic.scss
+5
-7
app/assets/stylesheets/themes/ui_color.scss
app/assets/stylesheets/themes/ui_color.scss
+2
-3
app/assets/stylesheets/themes/ui_gray.scss
app/assets/stylesheets/themes/ui_gray.scss
+2
-3
app/assets/stylesheets/themes/ui_mars.scss
app/assets/stylesheets/themes/ui_mars.scss
+2
-3
app/assets/stylesheets/themes/ui_modern.scss
app/assets/stylesheets/themes/ui_modern.scss
+2
-3
app/views/layouts/_head_panel.html.haml
app/views/layouts/_head_panel.html.haml
+0
-2
app/views/layouts/_page.html.haml
app/views/layouts/_page.html.haml
+16
-0
app/views/layouts/admin.html.haml
app/views/layouts/admin.html.haml
+2
-11
app/views/layouts/application.html.haml
app/views/layouts/application.html.haml
+2
-11
app/views/layouts/explore.html.haml
app/views/layouts/explore.html.haml
+1
-1
app/views/layouts/group.html.haml
app/views/layouts/group.html.haml
+1
-10
app/views/layouts/nav/_project.html.haml
app/views/layouts/nav/_project.html.haml
+2
-1
app/views/layouts/navless.html.haml
app/views/layouts/navless.html.haml
+1
-1
app/views/layouts/profile.html.haml
app/views/layouts/profile.html.haml
+2
-11
app/views/layouts/project_settings.html.haml
app/views/layouts/project_settings.html.haml
+3
-10
app/views/layouts/projects.html.haml
app/views/layouts/projects.html.haml
+2
-11
app/views/layouts/public_group.html.haml
app/views/layouts/public_group.html.haml
+2
-11
app/views/layouts/public_projects.html.haml
app/views/layouts/public_projects.html.haml
+2
-10
app/views/layouts/public_users.html.haml
app/views/layouts/public_users.html.haml
+2
-3
config/initializers/6_rack_profiler.rb
config/initializers/6_rack_profiler.rb
+1
-0
features/steps/shared/active_tab.rb
features/steps/shared/active_tab.rb
+2
-2
spec/features/admin/admin_hooks_spec.rb
spec/features/admin/admin_hooks_spec.rb
+1
-1
No files found.
app/assets/stylesheets/sections/header.scss
View file @
bcc04adb
...
@@ -84,6 +84,11 @@ header {
...
@@ -84,6 +84,11 @@ header {
z-index
:
10
;
z-index
:
10
;
.container
{
width
:
100%
!
important
;
padding-left
:
0px
;
}
/**
/**
*
*
* Logo holder
* Logo holder
...
@@ -230,21 +235,6 @@ header {
...
@@ -230,21 +235,6 @@ header {
color
:
#fff
;
color
:
#fff
;
}
}
}
}
.app_logo
{
.separator
{
margin-left
:
0
;
margin-right
:
0
;
}
}
.separator
{
float
:
left
;
height
:
46px
;
width
:
2px
;
margin-left
:
10px
;
margin-right
:
10px
;
}
}
}
.search
.search-input
{
.search
.search-input
{
...
...
app/assets/stylesheets/sections/nav.scss
deleted
100644 → 0
View file @
abd83bae
.main-nav
{
background
:
#f5f5f5
;
margin
:
20px
0
;
margin-top
:
0
;
padding-top
:
4px
;
border-bottom
:
1px
solid
#E9E9E9
;
ul
{
padding
:
0
;
margin
:
auto
;
.count
{
font-weight
:
normal
;
display
:
inline-block
;
height
:
15px
;
padding
:
1px
6px
;
height
:
auto
;
font-size
:
0
.82em
;
line-height
:
14px
;
text-align
:
center
;
color
:
#777
;
background
:
#eee
;
@include
border-radius
(
8px
);
}
.label
{
background
:
$hover
;
text-shadow
:
none
;
color
:
$style_color
;
}
li
{
list-style-type
:
none
;
margin
:
0
;
display
:
table-cell
;
width
:
1%
;
&
.active
{
a
{
color
:
$link_color
;
font-weight
:
bold
;
border-bottom
:
3px
solid
$link_color
;
}
}
&
:hover
{
a
{
color
:
$link_hover_color
;
border-bottom
:
3px
solid
$link_hover_color
;
}
}
}
a
{
display
:
block
;
text-align
:
center
;
font-weight
:
bold
;
height
:
42px
;
line-height
:
39px
;
color
:
#777
;
text-shadow
:
0
1px
1px
white
;
text-decoration
:
none
;
overflow
:
hidden
;
margin-bottom
:
-1px
;
}
}
@media
(
max-width
:
$screen-xs-max
)
{
font-size
:
18px
;
margin
:
0
;
max-height
:
none
;
&
,
.container
{
padding
:
0
;
border-top
:
0
;
}
ul
{
height
:
auto
;
li
{
display
:
list-item
;
width
:
auto
;
padding
:
5px
0
;
&
.active
{
background-color
:
$link_hover_color
;
a
{
color
:
#fff
;
font-weight
:
normal
;
text-shadow
:
none
;
border
:
none
;
&
:after
{
display
:
none
;
}
}
}
}
}
}
}
app/assets/stylesheets/sections/sidebar.scss
View file @
bcc04adb
body
.sidenav
{
padding
:
0
;
&
.ui_mars
{
.app_logo
{
background-color
:
#24272D
;
}
}
&
.ui_color
{
.app_logo
{
background-color
:
#325
;
}
}
&
.ui_basic
{
.app_logo
{
background-color
:
#DDD
;
}
}
&
.ui_modern
{
.app_logo
{
background-color
:
#017855
;
}
}
&
.ui_gray
{
.app_logo
{
background-color
:
#222
;
}
}
header
.container
{
width
:
100%
!
important
;
padding-left
:
0px
;
.separator
{
display
:
none
;
}
}
}
.page-with-sidebar
{
.page-with-sidebar
{
background
:
#F5F5F5
;
background
:
#F5F5F5
;
}
}
...
@@ -165,8 +122,3 @@ body.sidenav {
...
@@ -165,8 +122,3 @@ body.sidenav {
border-left
:
1px
solid
#EAEAEA
;
border-left
:
1px
solid
#EAEAEA
;
}
}
}
}
/** TODO: REMOVE **/
.profiler-results
{
display
:
none
;
}
app/assets/stylesheets/themes/ui_basic.scss
View file @
bcc04adb
...
@@ -9,17 +9,15 @@
...
@@ -9,17 +9,15 @@
.navbar-inner
{
.navbar-inner
{
background
:
#F1F1F1
;
background
:
#F1F1F1
;
border-bottom
:
1px
solid
#DDD
;
border-bottom
:
1px
solid
#DDD
;
.app_logo
{
background-color
:
#DDD
;
}
.nav
>
li
>
a
{
.nav
>
li
>
a
{
color
:
$style_color
;
color
:
$style_color
;
}
}
.separator
{
background
:
#F9F9F9
;
border-left
:
1px
solid
#DDD
;
}
}
}
}
}
}
}
.main-nav
{
background
:
#FFF
;
}
}
}
app/assets/stylesheets/themes/ui_color.scss
View file @
bcc04adb
...
@@ -23,9 +23,8 @@
...
@@ -23,9 +23,8 @@
background-color
:
#436
;
background-color
:
#436
;
}
}
}
}
.separator
{
.app_logo
{
background
:
#436
;
background-color
:
#325
;
border-left
:
1px
solid
#659
;
}
}
.nav
>
li
>
a
{
.nav
>
li
>
a
{
color
:
#98C
;
color
:
#98C
;
...
...
app/assets/stylesheets/themes/ui_gray.scss
View file @
bcc04adb
...
@@ -23,9 +23,8 @@
...
@@ -23,9 +23,8 @@
background-color
:
#272727
;
background-color
:
#272727
;
}
}
}
}
.separator
{
.app_logo
{
background
:
#272727
;
background-color
:
#222
;
border-left
:
1px
solid
#474747
;
}
}
}
}
}
}
...
...
app/assets/stylesheets/themes/ui_mars.scss
View file @
bcc04adb
...
@@ -23,9 +23,8 @@
...
@@ -23,9 +23,8 @@
background-color
:
#373D47
;
background-color
:
#373D47
;
}
}
}
}
.separator
{
.app_logo
{
background
:
#373D47
;
background-color
:
#24272D
;
border-left
:
1px
solid
#575D67
;
}
}
.nav
>
li
>
a
{
.nav
>
li
>
a
{
color
:
#979DA7
;
color
:
#979DA7
;
...
...
app/assets/stylesheets/themes/ui_modern.scss
View file @
bcc04adb
...
@@ -23,9 +23,8 @@
...
@@ -23,9 +23,8 @@
background-color
:
#018865
;
background-color
:
#018865
;
}
}
}
}
.separator
{
.app_logo
{
background
:
#018865
;
background-color
:
#017855
;
border-left
:
1px
solid
#11A885
;
}
}
.nav
>
li
>
a
{
.nav
>
li
>
a
{
color
:
#ADC
;
color
:
#ADC
;
...
...
app/views/layouts/_head_panel.html.haml
View file @
bcc04adb
...
@@ -2,10 +2,8 @@
...
@@ -2,10 +2,8 @@
.navbar-inner
.navbar-inner
.container
.container
%div
.app_logo
%div
.app_logo
%span
.separator
=
link_to
root_path
,
class:
"home has_bottom_tooltip"
,
title:
"Dashboard"
do
=
link_to
root_path
,
class:
"home has_bottom_tooltip"
,
title:
"Dashboard"
do
%h1
GITLAB
%h1
GITLAB
%span
.separator
%h1
.title
=
title
%h1
.title
=
title
%button
.navbar-toggle
{
"data-target"
=>
".navbar-collapse"
,
"data-toggle"
=>
"collapse"
,
type:
"button"
}
%button
.navbar-toggle
{
"data-target"
=>
".navbar-collapse"
,
"data-toggle"
=>
"collapse"
,
type:
"button"
}
...
...
app/views/layouts/_page.html.haml
0 → 100644
View file @
bcc04adb
-
if
defined?
(
sidebar
)
.page-with-sidebar
.sidebar-wrapper
=
render
(
sidebar
)
.content-wrapper
.container-fluid
.content
=
render
"layouts/flash"
.clearfix
=
yield
-
else
.container.navless-container
.content
=
yield
=
yield
:embedded_scripts
app/views/layouts/admin.html.haml
View file @
bcc04adb
!!! 5
!!! 5
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Admin area"
=
render
"layouts/head"
,
title:
"Admin area"
%body
{
class:
"#{app_theme}
sidenav
admin"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} admin"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
"Admin area"
=
render
"layouts/head_panel"
,
title:
"Admin area"
.page-with-sidebar
=
render
'layouts/page'
,
sidebar:
'layouts/nav/admin'
.sidebar-wrapper
=
render
'layouts/nav/admin'
.content-wrapper
.container-fluid
.content
=
render
"layouts/flash"
.clearfix
=
yield
=
yield
:embedded_scripts
app/views/layouts/application.html.haml
View file @
bcc04adb
!!! 5
!!! 5
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Dashboard"
=
render
"layouts/head"
,
title:
"Dashboard"
%body
{
class:
"#{app_theme}
sidenav
application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
"Dashboard"
=
render
"layouts/head_panel"
,
title:
"Dashboard"
.page-with-sidebar
=
render
'layouts/page'
,
sidebar:
'layouts/nav/dashboard'
.sidebar-wrapper
=
render
'layouts/nav/dashboard'
.content-wrapper
.container-fluid
.content
=
render
"layouts/flash"
.clearfix
=
yield
=
yield
:embedded_scripts
app/views/layouts/explore.html.haml
View file @
bcc04adb
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
!!! 5
!!! 5
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
page_title
=
render
"layouts/head"
,
title:
page_title
%body
{
class:
"#{app_theme}
sidenav
application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/broadcast"
-
if
current_user
-
if
current_user
=
render
"layouts/head_panel"
,
title:
page_title
=
render
"layouts/head_panel"
,
title:
page_title
...
...
app/views/layouts/group.html.haml
View file @
bcc04adb
...
@@ -4,13 +4,4 @@
...
@@ -4,13 +4,4 @@
%body
{
class:
"#{app_theme} application sidenav"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} application sidenav"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
@group
.
name
=
render
"layouts/head_panel"
,
title:
@group
.
name
.page-with-sidebar
=
render
'layouts/page'
,
sidebar:
'layouts/nav/group'
.sidebar-wrapper
=
render
'layouts/nav/group'
.content-wrapper
.container-fluid
.content
=
render
"layouts/flash"
.clearfix
=
yield
=
yield
:embedded_scripts
app/views/layouts/nav/_project.html.haml
View file @
bcc04adb
...
@@ -61,5 +61,6 @@
...
@@ -61,5 +61,6 @@
%i
.fa.fa-cogs
%i
.fa.fa-cogs
Settings
Settings
%i
.fa.fa-angle-down
%i
.fa.fa-angle-down
-
if
defined?
(
settings
)
&&
settings
-
if
@project_settings_nav
=
render
'projects/settings_nav'
=
render
'projects/settings_nav'
app/views/layouts/navless.html.haml
View file @
bcc04adb
!!! 5
!!! 5
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
@title
=
render
"layouts/head"
,
title:
@title
%body
{
class:
"#{app_theme}
sidenav
application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
@title
=
render
"layouts/head_panel"
,
title:
@title
.container.navless-container
.container.navless-container
...
...
app/views/layouts/profile.html.haml
View file @
bcc04adb
!!! 5
!!! 5
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Profile"
=
render
"layouts/head"
,
title:
"Profile"
%body
{
class:
"#{app_theme}
sidenav
profile"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} profile"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
"Profile"
=
render
"layouts/head_panel"
,
title:
"Profile"
.page-with-sidebar
=
render
'layouts/page'
,
sidebar:
'layouts/nav/profile'
.sidebar-wrapper
=
render
'layouts/nav/profile'
.content-wrapper
.container-fluid
.content
=
render
"layouts/flash"
.clearfix
=
yield
=
yield
:embedded_scripts
app/views/layouts/project_settings.html.haml
View file @
bcc04adb
!!! 5
!!! 5
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
@project
.
name_with_namespace
=
render
"layouts/head"
,
title:
@project
.
name_with_namespace
%body
{
class:
"#{app_theme}
sidenav
project"
,
:'data-page'
=>
body_data_page
,
:'data-project-id'
=>
@project
.
id
}
%body
{
class:
"#{app_theme} project"
,
:'data-page'
=>
body_data_page
,
:'data-project-id'
=>
@project
.
id
}
=
render
"layouts/broadcast"
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/init_auto_complete"
=
render
"layouts/init_auto_complete"
-
if
can?
(
current_user
,
:download_code
,
@project
)
-
if
can?
(
current_user
,
:download_code
,
@project
)
=
render
'shared/no_ssh'
=
render
'shared/no_ssh'
.page-with-sidebar
-
@project_settings_nav
=
true
.sidebar-wrapper
=
render
'layouts/page'
,
sidebar:
'layouts/nav/project'
=
render
'layouts/nav/project'
,
settings:
true
.content-wrapper
.container-fluid
.content
=
render
"layouts/flash"
=
yield
=
yield
:embedded_scripts
app/views/layouts/projects.html.haml
View file @
bcc04adb
!!! 5
!!! 5
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
project_head_title
=
render
"layouts/head"
,
title:
project_head_title
%body
{
class:
"#{app_theme}
sidenav
project"
,
:'data-page'
=>
body_data_page
,
:'data-project-id'
=>
@project
.
id
}
%body
{
class:
"#{app_theme} project"
,
:'data-page'
=>
body_data_page
,
:'data-project-id'
=>
@project
.
id
}
=
render
"layouts/broadcast"
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/init_auto_complete"
=
render
"layouts/init_auto_complete"
-
if
can?
(
current_user
,
:download_code
,
@project
)
-
if
can?
(
current_user
,
:download_code
,
@project
)
=
render
'shared/no_ssh'
=
render
'shared/no_ssh'
=
render
'layouts/page'
,
sidebar:
'layouts/nav/project'
.page-with-sidebar
.sidebar-wrapper
=
render
'layouts/nav/project'
.content-wrapper
.container-fluid
.content
=
render
"layouts/flash"
=
yield
=
yield
:embedded_scripts
app/views/layouts/public_group.html.haml
View file @
bcc04adb
!!! 5
!!! 5
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
group_head_title
=
render
"layouts/head"
,
title:
group_head_title
%body
{
class:
"#{app_theme}
sidenav
application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/broadcast"
=
render
"layouts/public_head_panel"
,
title:
"group:
#{
@group
.
name
}
"
=
render
"layouts/public_head_panel"
,
title:
"group:
#{
@group
.
name
}
"
.page-with-sidebar
=
render
'layouts/page'
,
sidebar:
'layouts/nav/group'
.sidebar-wrapper
=
render
'layouts/nav/group'
.content-wrapper
.container-fluid
.content
=
render
"layouts/flash"
.clearfix
=
yield
=
yield
:embedded_scripts
app/views/layouts/public_projects.html.haml
View file @
bcc04adb
!!! 5
!!! 5
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
@project
.
name_with_namespace
=
render
"layouts/head"
,
title:
@project
.
name_with_namespace
%body
{
class:
"#{app_theme}
sidenav
application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/broadcast"
=
render
"layouts/public_head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/public_head_panel"
,
title:
project_title
(
@project
)
.page-with-sidebar
=
render
'layouts/page'
,
sidebar:
'layouts/nav/project'
.sidebar-wrapper
=
render
'layouts/nav/project'
.content-wrapper
.container-fluid
.content
=
render
"layouts/flash"
=
yield
=
yield
:embedded_scripts
app/views/layouts/public_users.html.haml
View file @
bcc04adb
!!! 5
!!! 5
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
@title
=
render
"layouts/head"
,
title:
@title
%body
{
class:
"#{app_theme}
sidenav
application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/broadcast"
=
render
"layouts/public_head_panel"
,
title:
@title
=
render
"layouts/public_head_panel"
,
title:
@title
.container.navless-container
=
render
'layouts/page'
.content
=
yield
config/initializers/6_rack_profiler.rb
View file @
bcc04adb
...
@@ -3,4 +3,5 @@ if Rails.env == 'development'
...
@@ -3,4 +3,5 @@ if Rails.env == 'development'
# initialization is skipped so trigger it
# initialization is skipped so trigger it
Rack
::
MiniProfilerRails
.
initialize!
(
Rails
.
application
)
Rack
::
MiniProfilerRails
.
initialize!
(
Rails
.
application
)
Rack
::
MiniProfiler
.
config
.
position
=
'right'
end
end
features/steps/shared/active_tab.rb
View file @
bcc04adb
...
@@ -2,7 +2,7 @@ module SharedActiveTab
...
@@ -2,7 +2,7 @@ module SharedActiveTab
include
Spinach
::
DSL
include
Spinach
::
DSL
def
ensure_active_main_tab
(
content
)
def
ensure_active_main_tab
(
content
)
find
(
'.
main-nav
li.active'
).
should
have_content
(
content
)
find
(
'.
sidebar-wrapper
li.active'
).
should
have_content
(
content
)
end
end
def
ensure_active_sub_tab
(
content
)
def
ensure_active_sub_tab
(
content
)
...
@@ -14,7 +14,7 @@ module SharedActiveTab
...
@@ -14,7 +14,7 @@ module SharedActiveTab
end
end
step
'no other main tabs should be active'
do
step
'no other main tabs should be active'
do
page
.
should
have_selector
(
'.
main-nav
li.active'
,
count:
1
)
page
.
should
have_selector
(
'.
sidebar-wrapper
li.active'
,
count:
1
)
end
end
step
'no other sub tabs should be active'
do
step
'no other sub tabs should be active'
do
...
...
spec/features/admin/admin_hooks_spec.rb
View file @
bcc04adb
...
@@ -12,7 +12,7 @@ describe "Admin::Hooks", feature: true do
...
@@ -12,7 +12,7 @@ describe "Admin::Hooks", feature: true do
describe
"GET /admin/hooks"
do
describe
"GET /admin/hooks"
do
it
"should be ok"
do
it
"should be ok"
do
visit
admin_root_path
visit
admin_root_path
within
".
main-nav
"
do
within
".
sidebar-wrapper
"
do
click_on
"Hooks"
click_on
"Hooks"
end
end
current_path
.
should
==
admin_hooks_path
current_path
.
should
==
admin_hooks_path
...
...
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