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
79e8e613
Commit
79e8e613
authored
Feb 13, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dynamic-header-fixture' into 'master'
Replace static fixture for header_spec.js See merge request !9174
parents
b94cf7e6
0f06d264
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
36 deletions
+5
-36
changelogs/unreleased/dynamic-header-fixture.yml
changelogs/unreleased/dynamic-header-fixture.yml
+4
-0
spec/javascripts/fixtures/header.html.haml
spec/javascripts/fixtures/header.html.haml
+0
-35
spec/javascripts/header_spec.js
spec/javascripts/header_spec.js
+1
-1
No files found.
changelogs/unreleased/dynamic-header-fixture.yml
0 → 100644
View file @
79e8e613
---
title
:
Replace static fixture for header_spec.js
merge_request
:
9174
author
:
winniehell
spec/javascripts/fixtures/header.html.haml
deleted
100644 → 0
View file @
b94cf7e6
%header
.navbar.navbar-gitlab.nav_header_class
.container-fluid
.header-content
%button
.side-nav-toggle
%span
.sr-only
Toggle navigation
%i
.fa.fa-bars
%button
.navbar-toggle
%span
.sr-only
Toggle navigation
%i
.fa.fa-ellipsis-v
.navbar-collapse.collapse
%ui
.nav.navbar-nav
%li
.hidden-sm.hidden-xs
%li
.visible-sm.visible-xs
%li
%a
%i
.fa.fa-bell.fa-fw
%span
.badge.todos-pending-count
%li
%a
%i
.fa.fa-plus.fa-fw
%li
.header-user.dropdown
%a
%img
%span
.caret
.dropdown-menu-nav
.dropdown-menu-align-right
%ul
%li
%a
.profile-link
%li
%a
%li
.divider
%li
.sign-out-link
spec/javascripts/header_spec.js
View file @
79e8e613
...
@@ -6,7 +6,7 @@ require('~/lib/utils/text_utility');
...
@@ -6,7 +6,7 @@ require('~/lib/utils/text_utility');
(
function
()
{
(
function
()
{
describe
(
'
Header
'
,
function
()
{
describe
(
'
Header
'
,
function
()
{
var
todosPendingCount
=
'
.todos-pending-count
'
;
var
todosPendingCount
=
'
.todos-pending-count
'
;
var
fixtureTemplate
=
'
static/header
.html.raw
'
;
var
fixtureTemplate
=
'
issues/open-issue
.html.raw
'
;
function
isTodosCountHidden
()
{
function
isTodosCountHidden
()
{
return
$
(
todosPendingCount
).
hasClass
(
'
hidden
'
);
return
$
(
todosPendingCount
).
hasClass
(
'
hidden
'
);
...
...
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