Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-02-05 21:17:38 +0300
committerFilipa Lacerda <filipa@gitlab.com>2017-02-05 21:17:38 +0300
commitd97b96228973658fbd390823c1ab6f5364b33d00 (patch)
treea3d09e858659c818e773fba20ca2c376b5cbc6e3 /spec
parent2e5e4bd75bfb63f2110c8789e05f24f2af012d34 (diff)
Use webpack to require files
Diffstat (limited to 'spec')
-rw-r--r--spec/javascripts/commit/pipelines/pipelines_spec.js.es615
-rw-r--r--spec/javascripts/commit/pipelines/pipelines_store_spec.js.es63
-rw-r--r--spec/javascripts/vue_shared/components/pipelines_table_row_spec.js.es65
-rw-r--r--spec/javascripts/vue_shared/components/pipelines_table_spec.js.es67
4 files changed, 13 insertions, 17 deletions
diff --git a/spec/javascripts/commit/pipelines/pipelines_spec.js.es6 b/spec/javascripts/commit/pipelines/pipelines_spec.js.es6
index 3bcc0d1eb18..c2b61632827 100644
--- a/spec/javascripts/commit/pipelines/pipelines_spec.js.es6
+++ b/spec/javascripts/commit/pipelines/pipelines_spec.js.es6
@@ -1,13 +1,12 @@
/* global pipeline, Vue */
-//= require vue
-//= require vue-resource
-//= require flash
-//= require commit/pipelines/pipelines_store
-//= require commit/pipelines/pipelines_service
-//= require commit/pipelines/pipelines_table
-//= require vue_shared/vue_resource_interceptor
-//= require ./mock_data
+require('vue-resource');
+require('flash');
+require('~/commit/pipelines/pipelines_store');
+require('~/commit/pipelines/pipelines_service');
+require('~/commit/pipelines/pipelines_table');
+require('~vue_shared/vue_resource_interceptor');
+require('./mock_data');
describe('Pipelines table in Commits and Merge requests', () => {
preloadFixtures('pipelines_table');
diff --git a/spec/javascripts/commit/pipelines/pipelines_store_spec.js.es6 b/spec/javascripts/commit/pipelines/pipelines_store_spec.js.es6
index 46a7df3bb21..a5a16544ffb 100644
--- a/spec/javascripts/commit/pipelines/pipelines_store_spec.js.es6
+++ b/spec/javascripts/commit/pipelines/pipelines_store_spec.js.es6
@@ -1,5 +1,4 @@
-//= require vue
-//= require commit/pipelines/pipelines_store
+require('~commit/pipelines/pipelines_store');
describe('Store', () => {
const store = gl.commits.pipelines.PipelinesStore;
diff --git a/spec/javascripts/vue_shared/components/pipelines_table_row_spec.js.es6 b/spec/javascripts/vue_shared/components/pipelines_table_row_spec.js.es6
index 6825de069e4..e83a1749e82 100644
--- a/spec/javascripts/vue_shared/components/pipelines_table_row_spec.js.es6
+++ b/spec/javascripts/vue_shared/components/pipelines_table_row_spec.js.es6
@@ -1,8 +1,7 @@
/* global pipeline */
-//= require vue
-//= require vue_shared/components/pipelines_table_row
-//= require commit/pipelines/mock_data
+require('~vue_shared/components/pipelines_table_row');
+require('./mock_data');
describe('Pipelines Table Row', () => {
let component;
diff --git a/spec/javascripts/vue_shared/components/pipelines_table_spec.js.es6 b/spec/javascripts/vue_shared/components/pipelines_table_spec.js.es6
index cb1006d44dc..adc9ea904cc 100644
--- a/spec/javascripts/vue_shared/components/pipelines_table_spec.js.es6
+++ b/spec/javascripts/vue_shared/components/pipelines_table_spec.js.es6
@@ -1,9 +1,8 @@
/* global pipeline */
-//= require vue
-//= require vue_shared/components/pipelines_table
-//= require commit/pipelines/mock_data
-//= require lib/utils/datetime_utility
+require('~vue_shared/components/pipelines_table');
+require('~lib/utils/datetime_utility');
+require('./mock_data');
describe('Pipelines Table', () => {
preloadFixtures('static/environments/element.html.raw');