From 7c5d4942742cf8d5c942fba0888eaab5e1133fb4 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Sat, 28 Jan 2017 11:38:30 -0600
Subject: [PATCH] fix frontend tests

---
 spec/javascripts/commits_spec.js.es6          | 20 +++++++++++++++----
 .../filtered_search_manager_spec.js.es6       | 11 +++++-----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/spec/javascripts/commits_spec.js.es6 b/spec/javascripts/commits_spec.js.es6
index bb9a9072f3a..05260760c43 100644
--- a/spec/javascripts/commits_spec.js.es6
+++ b/spec/javascripts/commits_spec.js.es6
@@ -1,10 +1,19 @@
 /* global CommitsList */
 
-//= require jquery.endless-scroll
-//= require pager
-//= require commits
+require('vendor/jquery.endless-scroll');
+require('~/pager');
+require('~/commits');
 
 (() => {
+  // TODO: remove this hack!
+  // PhantomJS causes spyOn to panic because replaceState isn't "writable"
+  let phantomjs;
+  try {
+    phantomjs = !Object.getOwnPropertyDescriptor(window.history, 'replaceState').writable;
+  } catch (err) {
+    phantomjs = false;
+  }
+
   describe('Commits List', () => {
     beforeEach(() => {
       setFixtures(`
@@ -25,7 +34,10 @@
       beforeEach(() => {
         CommitsList.init(25);
         CommitsList.searchField.val('');
-        spyOn(history, 'replaceState').and.stub();
+
+        if (!phantomjs) {
+          spyOn(history, 'replaceState').and.stub();
+        }
         ajaxSpy = spyOn(jQuery, 'ajax').and.callFake((req) => {
           req.success({
             data: '<li>Result</li>',
diff --git a/spec/javascripts/filtered_search/filtered_search_manager_spec.js.es6 b/spec/javascripts/filtered_search/filtered_search_manager_spec.js.es6
index c8b5c2b36ad..1a06b60b2c2 100644
--- a/spec/javascripts/filtered_search/filtered_search_manager_spec.js.es6
+++ b/spec/javascripts/filtered_search/filtered_search_manager_spec.js.es6
@@ -1,11 +1,10 @@
 /* global Turbolinks */
 
-//= require turbolinks
-//= require lib/utils/common_utils
-//= require filtered_search/filtered_search_token_keys
-//= require filtered_search/filtered_search_tokenizer
-//= require filtered_search/filtered_search_dropdown_manager
-//= require filtered_search/filtered_search_manager
+require('~/lib/utils/common_utils');
+require('~/filtered_search/filtered_search_token_keys');
+require('~/filtered_search/filtered_search_tokenizer');
+require('~/filtered_search/filtered_search_dropdown_manager');
+require('~/filtered_search/filtered_search_manager');
 
 (() => {
   describe('Filtered Search Manager', () => {