more post-merge fixes

6 files changed, 21 insertions, 23 deletions

diff --git a/spec/javascripts/filtered_search/dropdown_utils_spec.js.es6 b/spec/javascripts/filtered_search/dropdown_utils_spec.js.es6
index ce61b73aa8a..96f33427213 100644
--- a/spec/javascripts/filtered_search/dropdown_utils_spec.js.es6
+++ b/spec/javascripts/filtered_search/dropdown_utils_spec.js.es6
@@ -1,7 +1,7 @@
-//= require extensions/array
-//= require filtered_search/dropdown_utils
-//= require filtered_search/filtered_search_tokenizer
-//= require filtered_search/filtered_search_dropdown_manager
+require('~/extensions/array');
+require('~/filtered_search/dropdown_utils');
+require('~/filtered_search/filtered_search_tokenizer');
+require('~/filtered_search/filtered_search_dropdown_manager');
 
 (() => {
   describe('Dropdown Utils', () => {
diff --git a/spec/javascripts/filtered_search/filtered_search_dropdown_manager_spec.js.es6 b/spec/javascripts/filtered_search/filtered_search_dropdown_manager_spec.js.es6
index d0d27ceb4a6..0bc6689eba5 100644
--- a/spec/javascripts/filtered_search/filtered_search_dropdown_manager_spec.js.es6
+++ b/spec/javascripts/filtered_search/filtered_search_dropdown_manager_spec.js.es6
@@ -1,6 +1,6 @@
-//= require extensions/array
-//= require filtered_search/filtered_search_tokenizer
-//= require filtered_search/filtered_search_dropdown_manager
+require('~/extensions/array');
+require('~/filtered_search/filtered_search_tokenizer');
+require('~/filtered_search/filtered_search_dropdown_manager');
 
 (() => {
   describe('Filtered Search Dropdown Manager', () => {
diff --git a/spec/javascripts/filtered_search/filtered_search_token_keys_spec.js.es6 b/spec/javascripts/filtered_search/filtered_search_token_keys_spec.js.es6
index 6df7c0e44ef..7df9d9ec1cb 100644
--- a/spec/javascripts/filtered_search/filtered_search_token_keys_spec.js.es6
+++ b/spec/javascripts/filtered_search/filtered_search_token_keys_spec.js.es6
@@ -1,5 +1,5 @@
-//= require extensions/array
-//= require filtered_search/filtered_search_token_keys
+require('~/extensions/array');
+require('~/filtered_search/filtered_search_token_keys');
 
 (() => {
   describe('Filtered Search Token Keys', () => {
diff --git a/spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js.es6 b/spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js.es6
index ac7f8e9cbcd..84c0e9cbfe2 100644
--- a/spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js.es6
+++ b/spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js.es6
@@ -1,6 +1,6 @@
-//= require extensions/array
-//= require filtered_search/filtered_search_token_keys
-//= require filtered_search/filtered_search_tokenizer
+require('~/extensions/array');
+require('~/filtered_search/filtered_search_token_keys');
+require('~/filtered_search/filtered_search_tokenizer');
 
 (() => {
   describe('Filtered Search Tokenizer', () => {
diff --git a/spec/javascripts/lib/utils/text_utility_spec.js.es6 b/spec/javascripts/lib/utils/text_utility_spec.js.es6
index e97356b65d5..976e24c4ea5 100644
--- a/spec/javascripts/lib/utils/text_utility_spec.js.es6
+++ b/spec/javascripts/lib/utils/text_utility_spec.js.es6
@@ -1,4 +1,4 @@
-//= require lib/utils/text_utility
+require('~/lib/utils/text_utility');
 
 (() => {
   describe('text_utility', () => {
diff --git a/spec/javascripts/vue_pagination/pagination_spec.js.es6 b/spec/javascripts/vue_pagination/pagination_spec.js.es6
index 1a7f2bb5fb8..8935c474ee5 100644
--- a/spec/javascripts/vue_pagination/pagination_spec.js.es6
+++ b/spec/javascripts/vue_pagination/pagination_spec.js.es6
@@ -1,7 +1,5 @@
-//= require vue
-//= require lib/utils/common_utils
-//= require vue_pagination/index
-/* global fixture, gl */
+require('~/lib/utils/common_utils');
+require('~/vue_pagination/index');
 
 describe('Pagination component', () => {
   let component;
@@ -17,7 +15,7 @@ describe('Pagination component', () => {
   };
 
   it('should render and start at page 1', () => {
-    fixture.set('<div class="test-pagination-container"></div>');
+    setFixtures('<div class="test-pagination-container"></div>');
 
     component = new window.gl.VueGlPagination({
       el: document.querySelector('.test-pagination-container'),
@@ -40,7 +38,7 @@ describe('Pagination component', () => {
   });
 
   it('should go to the previous page', () => {
-    fixture.set('<div class="test-pagination-container"></div>');
+    setFixtures('<div class="test-pagination-container"></div>');
 
     component = new window.gl.VueGlPagination({
       el: document.querySelector('.test-pagination-container'),
@@ -61,7 +59,7 @@ describe('Pagination component', () => {
   });
 
   it('should go to the next page', () => {
-    fixture.set('<div class="test-pagination-container"></div>');
+    setFixtures('<div class="test-pagination-container"></div>');
 
     component = new window.gl.VueGlPagination({
       el: document.querySelector('.test-pagination-container'),
@@ -82,7 +80,7 @@ describe('Pagination component', () => {
   });
 
   it('should go to the last page', () => {
-    fixture.set('<div class="test-pagination-container"></div>');
+    setFixtures('<div class="test-pagination-container"></div>');
 
     component = new window.gl.VueGlPagination({
       el: document.querySelector('.test-pagination-container'),
@@ -103,7 +101,7 @@ describe('Pagination component', () => {
   });
 
   it('should go to the first page', () => {
-    fixture.set('<div class="test-pagination-container"></div>');
+    setFixtures('<div class="test-pagination-container"></div>');
 
     component = new window.gl.VueGlPagination({
       el: document.querySelector('.test-pagination-container'),
@@ -124,7 +122,7 @@ describe('Pagination component', () => {
   });
 
   it('should do nothing', () => {
-    fixture.set('<div class="test-pagination-container"></div>');
+    setFixtures('<div class="test-pagination-container"></div>');
 
     component = new window.gl.VueGlPagination({
       el: document.querySelector('.test-pagination-container'),