Merge branch 'dynamic-header-fixture' into 'master'
Replace static fixture for header_spec.js See merge request !9174
This commit is contained in:
commit
79e8e6134f
3 changed files with 5 additions and 36 deletions
4
changelogs/unreleased/dynamic-header-fixture.yml
Normal file
4
changelogs/unreleased/dynamic-header-fixture.yml
Normal file
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Replace static fixture for header_spec.js
|
||||
merge_request: 9174
|
||||
author: winniehell
|
|
@ -1,35 +0,0 @@
|
|||
%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
|
|
@ -6,7 +6,7 @@ require('~/lib/utils/text_utility');
|
|||
(function() {
|
||||
describe('Header', function() {
|
||||
var todosPendingCount = '.todos-pending-count';
|
||||
var fixtureTemplate = 'static/header.html.raw';
|
||||
var fixtureTemplate = 'issues/open-issue.html.raw';
|
||||
|
||||
function isTodosCountHidden() {
|
||||
return $(todosPendingCount).hasClass('hidden');
|
||||
|
|
Loading…
Reference in a new issue