1 files changed, 16 insertions, 4 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>',