Merge branch 'dynamic-header-fixture' into 'master'

Replace static fixture for header_spec.js

See merge request !9174

3 files changed, 5 insertions, 36 deletions

diff --git a/changelogs/unreleased/dynamic-header-fixture.yml b/changelogs/unreleased/dynamic-header-fixture.yml
new file mode 100644
index 00000000000..9789a1999c8
--- /dev/null
+++ b/changelogs/unreleased/dynamic-header-fixture.yml
@@ -0,0 +1,4 @@
+---
+title: Replace static fixture for header_spec.js
+merge_request: 9174
+author: winniehell
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');