diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2017-02-13 15:10:16 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-02-13 15:10:16 +0000 |
commit | 79e8e6134f89c4a09a422ca128a7579d844f040c (patch) | |
tree | 7757ce09df217f1d2fa535905407d17df6e46aee /spec/javascripts | |
parent | b94cf7e66968edb93a07488bd3b36162c412c493 (diff) | |
parent | 0f06d2646afc1bd5b445910829d3d13f04de9c94 (diff) | |
download | gitlab-ce-79e8e6134f89c4a09a422ca128a7579d844f040c.tar.gz |
Merge branch 'dynamic-header-fixture' into 'master'
Replace static fixture for header_spec.js
See merge request !9174
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/fixtures/header.html.haml | 35 | ||||
-rw-r--r-- | spec/javascripts/header_spec.js | 2 |
2 files changed, 1 insertions, 36 deletions
diff --git a/spec/javascripts/fixtures/header.html.haml b/spec/javascripts/fixtures/header.html.haml deleted file mode 100644 index f397f69e753..00000000000 --- a/spec/javascripts/fixtures/header.html.haml +++ /dev/null @@ -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 diff --git a/spec/javascripts/header_spec.js b/spec/javascripts/header_spec.js index cecebb0b038..2b263b71b7d 100644 --- a/spec/javascripts/header_spec.js +++ b/spec/javascripts/header_spec.js @@ -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'); |