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
669fb299
Commit
669fb299
authored
Aug 14, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed up a bunch of specs
some caused by webkit prefixes
parent
331722c0
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
19 additions
and
12 deletions
+19
-12
app/assets/stylesheets/new_nav.scss
app/assets/stylesheets/new_nav.scss
+7
-0
app/views/layouts/header/_new.html.haml
app/views/layouts/header/_new.html.haml
+2
-2
spec/features/admin/admin_active_tab_spec.rb
spec/features/admin/admin_active_tab_spec.rb
+4
-4
spec/features/admin/admin_hooks_spec.rb
spec/features/admin/admin_hooks_spec.rb
+2
-2
spec/features/dashboard/shortcuts_spec.rb
spec/features/dashboard/shortcuts_spec.rb
+1
-1
spec/features/profiles/account_spec.rb
spec/features/profiles/account_spec.rb
+2
-2
spec/features/search_spec.rb
spec/features/search_spec.rb
+1
-1
No files found.
app/assets/stylesheets/new_nav.scss
View file @
669fb299
...
@@ -8,10 +8,17 @@ header.navbar-gitlab-new {
...
@@ -8,10 +8,17 @@ header.navbar-gitlab-new {
border-bottom
:
0
;
border-bottom
:
0
;
.header-content
{
.header-content
{
display
:
-
webkit-flex
;
display
:
flex
;
padding-left
:
0
;
padding-left
:
0
;
.title-container
{
.title-container
{
display
:
-
webkit-flex
;
display
:
flex
;
-webkit-align-items
:
stretch
;
align-items
:
stretch
;
align-items
:
stretch
;
-webkit-flex
:
1
1
auto
;
flex
:
1
1
auto
;
padding-top
:
0
;
padding-top
:
0
;
overflow
:
visible
;
overflow
:
visible
;
}
}
...
...
app/views/layouts/header/_new.html.haml
View file @
669fb299
...
@@ -37,13 +37,13 @@
...
@@ -37,13 +37,13 @@
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'tachometer fw'
)
=
icon
(
'tachometer fw'
)
%li
%li
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
aria:
{
label:
"Issues"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
class:
'dashboard-shortcuts-issues'
,
aria:
{
label:
"Issues"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
custom_icon
(
'issues'
)
=
custom_icon
(
'issues'
)
-
issues_count
=
assigned_issuables_count
(
:issues
)
-
issues_count
=
assigned_issuables_count
(
:issues
)
%span
.badge.issues-count
{
class:
(
'hidden'
if
issues_count
.
zero?
)
}
%span
.badge.issues-count
{
class:
(
'hidden'
if
issues_count
.
zero?
)
}
=
number_with_delimiter
(
issues_count
)
=
number_with_delimiter
(
issues_count
)
%li
%li
=
link_to
assigned_mrs_dashboard_path
,
title:
'Merge requests'
,
aria:
{
label:
"Merge requests"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
assigned_mrs_dashboard_path
,
title:
'Merge requests'
,
class:
'dashboard-shortcuts-merge_requests'
,
aria:
{
label:
"Merge requests"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
custom_icon
(
'mr_bold'
)
=
custom_icon
(
'mr_bold'
)
-
merge_requests_count
=
assigned_issuables_count
(
:merge_requests
)
-
merge_requests_count
=
assigned_issuables_count
(
:merge_requests
)
%span
.badge.merge-requests-count
{
class:
(
'hidden'
if
merge_requests_count
.
zero?
)
}
%span
.badge.merge-requests-count
{
class:
(
'hidden'
if
merge_requests_count
.
zero?
)
}
...
...
spec/features/admin/admin_active_tab_spec.rb
View file @
669fb299
...
@@ -7,15 +7,15 @@ RSpec.describe 'admin active tab' do
...
@@ -7,15 +7,15 @@ RSpec.describe 'admin active tab' do
shared_examples
'page has active tab'
do
|
title
|
shared_examples
'page has active tab'
do
|
title
|
it
"activates
#{
title
}
tab"
do
it
"activates
#{
title
}
tab"
do
expect
(
page
).
to
have_selector
(
'.
layout-nav .nav-link
s > li.active'
,
count:
1
)
expect
(
page
).
to
have_selector
(
'.
nav-sidebar .sidebar-top-level-item
s > li.active'
,
count:
1
)
expect
(
page
.
find
(
'.
layout-nav
li.active'
)).
to
have_content
(
title
)
expect
(
page
.
find
(
'.
nav-sidebar .sidebar-top-level-items >
li.active'
)).
to
have_content
(
title
)
end
end
end
end
shared_examples
'page has active sub tab'
do
|
title
|
shared_examples
'page has active sub tab'
do
|
title
|
it
"activates
#{
title
}
sub tab"
do
it
"activates
#{
title
}
sub tab"
do
expect
(
page
).
to
have_selector
(
'.s
ub-nav
li.active'
,
count:
1
)
expect
(
page
).
to
have_selector
(
'.s
idebar-sub-level-items
li.active'
,
count:
1
)
expect
(
page
.
find
(
'.s
ub-nav
li.active'
)).
to
have_content
(
title
)
expect
(
page
.
find
(
'.s
idebar-sub-level-items
li.active'
)).
to
have_content
(
title
)
end
end
end
end
...
...
spec/features/admin/admin_hooks_spec.rb
View file @
669fb299
require
'spec_helper'
require
'spec_helper'
describe
'Admin::Hooks'
do
describe
'Admin::Hooks'
,
:js
do
before
do
before
do
@project
=
create
(
:project
)
@project
=
create
(
:project
)
sign_in
(
create
(
:admin
))
sign_in
(
create
(
:admin
))
...
@@ -12,7 +12,7 @@ describe 'Admin::Hooks' do
...
@@ -12,7 +12,7 @@ describe 'Admin::Hooks' do
it
'is ok'
do
it
'is ok'
do
visit
admin_root_path
visit
admin_root_path
page
.
within
'.
layout-nav
'
do
page
.
within
'.
nav-sidebar
'
do
click_on
'Hooks'
click_on
'Hooks'
end
end
...
...
spec/features/dashboard/shortcuts_spec.rb
View file @
669fb299
...
@@ -50,6 +50,6 @@ feature 'Dashboard shortcuts', :js do
...
@@ -50,6 +50,6 @@ feature 'Dashboard shortcuts', :js do
end
end
def
check_page_title
(
title
)
def
check_page_title
(
title
)
expect
(
find
(
'.
header-content .
title'
)).
to
have_content
(
title
)
expect
(
find
(
'.
breadcrumbs-sub-
title'
)).
to
have_content
(
title
)
end
end
end
end
spec/features/profiles/account_spec.rb
View file @
669fb299
...
@@ -43,14 +43,14 @@ feature 'Profile > Account' do
...
@@ -43,14 +43,14 @@ feature 'Profile > Account' do
update_username
(
new_username
)
update_username
(
new_username
)
visit
new_project_path
visit
new_project_path
expect
(
current_path
).
to
eq
(
new_project_path
)
expect
(
current_path
).
to
eq
(
new_project_path
)
expect
(
find
(
'
h1.
title'
)).
to
have_content
(
project
.
path
)
expect
(
find
(
'
.breadcrumbs-sub-
title'
)).
to
have_content
(
project
.
path
)
end
end
scenario
'the old project path redirects to the new path'
do
scenario
'the old project path redirects to the new path'
do
update_username
(
new_username
)
update_username
(
new_username
)
visit
old_project_path
visit
old_project_path
expect
(
current_path
).
to
eq
(
new_project_path
)
expect
(
current_path
).
to
eq
(
new_project_path
)
expect
(
find
(
'
h1.
title'
)).
to
have_content
(
project
.
path
)
expect
(
find
(
'
.breadcrumbs-sub-
title'
)).
to
have_content
(
project
.
path
)
end
end
end
end
end
end
...
...
spec/features/search_spec.rb
View file @
669fb299
...
@@ -160,7 +160,7 @@ describe "Search" do
...
@@ -160,7 +160,7 @@ describe "Search" do
fill_in
'search'
,
with:
'gitlab'
fill_in
'search'
,
with:
'gitlab'
find
(
'#search'
).
native
.
send_keys
(
:enter
)
find
(
'#search'
).
native
.
send_keys
(
:enter
)
page
.
within
'.title'
do
page
.
within
'.
breadcrumbs-sub-
title'
do
expect
(
page
).
to
have_content
'Search'
expect
(
page
).
to
have_content
'Search'
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