diff options
author | Mike Greiling <mike@pixelcog.com> | 2017-01-07 02:21:54 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-01-10 21:30:43 +0300 |
commit | 52c6702ec708deedef189784cdcb39564b2dcf52 (patch) | |
tree | 02e9b66893a86ddf264d31f7f101f06e50055fd1 | |
parent | 05b95e712d1ea70d8658de42f7c87661e6937976 (diff) |
include spec_helper within karma config rather than each individual test
56 files changed, 3 insertions, 57 deletions
diff --git a/config/karma.config.js b/config/karma.config.js index 0a3530b65ac..96d33490b37 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -6,13 +6,14 @@ var ROOT_PATH = path.resolve(__dirname, '..'); module.exports = function(config) { config.set({ basePath: ROOT_PATH, - frameworks: ['jquery-2.1.0', 'jasmine'], + frameworks: ['jasmine'], files: [ + 'spec/javascripts/spec_helper.js', 'spec/javascripts/**/*_spec.js?(.es6)', { pattern: 'spec/javascripts/fixtures/**/*@(.json|.html|.html.raw)', included: false }, ], preprocessors: { - 'spec/javascripts/**/*_spec.js?(.es6)': ['webpack'], + 'spec/javascripts/**/*.js?(.es6)': ['webpack'], }, webpack: webpackConfig, webpackMiddleware: { stats: 'errors-only' }, diff --git a/spec/javascripts/abuse_reports_spec.js.es6 b/spec/javascripts/abuse_reports_spec.js.es6 index dadee40f9b9..f4b6c9deae5 100644 --- a/spec/javascripts/abuse_reports_spec.js.es6 +++ b/spec/javascripts/abuse_reports_spec.js.es6 @@ -1,4 +1,3 @@ -require('./spec_helper'); require('lib/utils/text_utility'); require('abuse_reports'); diff --git a/spec/javascripts/activities_spec.js.es6 b/spec/javascripts/activities_spec.js.es6 index 6d625eeb973..feba184dbb0 100644 --- a/spec/javascripts/activities_spec.js.es6 +++ b/spec/javascripts/activities_spec.js.es6 @@ -1,6 +1,5 @@ /* eslint-disable no-unused-expressions, comma-spacing, prefer-const, no-prototype-builtins, semi, no-new, keyword-spacing, no-plusplus, no-shadow, max-len */ -require('./spec_helper'); window.Cookies = require('vendor/js.cookie'); require('vendor/jquery.endless-scroll.js'); require('pager'); diff --git a/spec/javascripts/awards_handler_spec.js b/spec/javascripts/awards_handler_spec.js index c256da072c0..65efa3df90b 100644 --- a/spec/javascripts/awards_handler_spec.js +++ b/spec/javascripts/awards_handler_spec.js @@ -1,7 +1,6 @@ /* eslint-disable space-before-function-paren, no-var, one-var, one-var-declaration-per-line, no-unused-expressions, comma-dangle, new-parens, no-unused-vars, quotes, jasmine/no-spec-dupes, prefer-template, padded-blocks, max-len */ /* global AwardsHandler */ -require('./spec_helper'); require('awards_handler'); window.Cookies = require('vendor/js.cookie'); require('./fixtures/emoji_menu'); diff --git a/spec/javascripts/behaviors/autosize_spec.js b/spec/javascripts/behaviors/autosize_spec.js index 603f1ae5f3e..e05793cf2e3 100644 --- a/spec/javascripts/behaviors/autosize_spec.js +++ b/spec/javascripts/behaviors/autosize_spec.js @@ -1,6 +1,5 @@ /* eslint-disable space-before-function-paren, no-var, comma-dangle, no-return-assign, padded-blocks, max-len */ -require('../spec_helper'); require('behaviors/autosize'); (function() { diff --git a/spec/javascripts/behaviors/quick_submit_spec.js b/spec/javascripts/behaviors/quick_submit_spec.js index f7bf95daa6c..c7c6f6393a6 100644 --- a/spec/javascripts/behaviors/quick_submit_spec.js +++ b/spec/javascripts/behaviors/quick_submit_spec.js @@ -1,6 +1,5 @@ /* eslint-disable space-before-function-paren, no-var, no-return-assign, comma-dangle, jasmine/no-spec-dupes, new-cap, padded-blocks, max-len */ -require('../spec_helper'); require('behaviors/quick_submit'); (function() { diff --git a/spec/javascripts/behaviors/requires_input_spec.js b/spec/javascripts/behaviors/requires_input_spec.js index 40a113cded3..793405cd197 100644 --- a/spec/javascripts/behaviors/requires_input_spec.js +++ b/spec/javascripts/behaviors/requires_input_spec.js @@ -1,6 +1,5 @@ /* eslint-disable space-before-function-paren, no-var, padded-blocks */ -require('../spec_helper'); require('behaviors/requires_input'); (function() { diff --git a/spec/javascripts/boards/boards_store_spec.js.es6 b/spec/javascripts/boards/boards_store_spec.js.es6 index c8de9ad79c3..7817e7c1b92 100644 --- a/spec/javascripts/boards/boards_store_spec.js.es6 +++ b/spec/javascripts/boards/boards_store_spec.js.es6 @@ -6,7 +6,6 @@ /* global listObj */ /* global listObjDuplicate */ -require('../spec_helper'); require('jquery-ujs'); window.Cookies = require('vendor/js.cookie'); window.Vue = require('vue'); diff --git a/spec/javascripts/boards/issue_spec.js.es6 b/spec/javascripts/boards/issue_spec.js.es6 index 143315e4ac1..cf2485bff8d 100644 --- a/spec/javascripts/boards/issue_spec.js.es6 +++ b/spec/javascripts/boards/issue_spec.js.es6 @@ -2,7 +2,6 @@ /* global BoardService */ /* global ListIssue */ -require('../spec_helper'); require('jquery-ujs'); window.Cookies = require('vendor/js.cookie'); window.Vue = require('vue'); diff --git a/spec/javascripts/boards/list_spec.js.es6 b/spec/javascripts/boards/list_spec.js.es6 index ab04e7b5896..65094642b64 100644 --- a/spec/javascripts/boards/list_spec.js.es6 +++ b/spec/javascripts/boards/list_spec.js.es6 @@ -5,7 +5,6 @@ /* global List */ /* global listObj */ -require('../spec_helper'); require('jquery-ujs'); window.Cookies = require('vendor/js.cookie'); window.Vue = require('vue'); diff --git a/spec/javascripts/bootstrap_linked_tabs_spec.js.es6 b/spec/javascripts/bootstrap_linked_tabs_spec.js.es6 index b6d223dcb80..f73bb5c6fed 100644 --- a/spec/javascripts/bootstrap_linked_tabs_spec.js.es6 +++ b/spec/javascripts/bootstrap_linked_tabs_spec.js.es6 @@ -1,4 +1,3 @@ -require('./spec_helper'); require('lib/utils/bootstrap_linked_tabs'); (() => { diff --git a/spec/javascripts/build_spec.js.es6 b/spec/javascripts/build_spec.js.es6 index 1821c44fdfb..41a3e614cd1 100644 --- a/spec/javascripts/build_spec.js.es6 +++ b/spec/javascripts/build_spec.js.es6 @@ -2,7 +2,6 @@ /* global Build */ /* global Turbolinks */ -require('./spec_helper'); require('lib/utils/datetime_utility'); require('build'); require('breakpoints'); diff --git a/spec/javascripts/dashboard_spec.js.es6 b/spec/javascripts/dashboard_spec.js.es6 index 7e9e622970d..5fb101fd584 100644 --- a/spec/javascripts/dashboard_spec.js.es6 +++ b/spec/javascripts/dashboard_spec.js.es6 @@ -1,6 +1,5 @@ /* eslint-disable no-new, padded-blocks */ -require('./spec_helper'); require('sidebar'); window.Cookies = require('vendor/js.cookie'); require('lib/utils/text_utility'); diff --git a/spec/javascripts/datetime_utility_spec.js.es6 b/spec/javascripts/datetime_utility_spec.js.es6 index d4f27d2691a..713e7742988 100644 --- a/spec/javascripts/datetime_utility_spec.js.es6 +++ b/spec/javascripts/datetime_utility_spec.js.es6 @@ -1,4 +1,3 @@ -require('./spec_helper'); require('lib/utils/datetime_utility'); (() => { diff --git a/spec/javascripts/diff_comments_store_spec.js.es6 b/spec/javascripts/diff_comments_store_spec.js.es6 index 487f1ab8b5d..f27ba0f93f7 100644 --- a/spec/javascripts/diff_comments_store_spec.js.es6 +++ b/spec/javascripts/diff_comments_store_spec.js.es6 @@ -1,7 +1,6 @@ /* eslint-disable no-extra-semi, jasmine/no-global-setup, dot-notation, jasmine/no-expect-in-setup-teardown, max-len */ /* global CommentsStore */ -require('./spec_helper'); require('diff_notes/models/discussion'); require('diff_notes/models/note'); require('diff_notes/stores/comments'); diff --git a/spec/javascripts/environments/environment_actions_spec.js.es6 b/spec/javascripts/environments/environment_actions_spec.js.es6 index 8d3539b29a5..304c3dccd1e 100644 --- a/spec/javascripts/environments/environment_actions_spec.js.es6 +++ b/spec/javascripts/environments/environment_actions_spec.js.es6 @@ -1,4 +1,3 @@ -require('../spec_helper'); window.Vue = require('vue'); require('environments/components/environment_actions'); diff --git a/spec/javascripts/environments/environment_external_url_spec.js.es6 b/spec/javascripts/environments/environment_external_url_spec.js.es6 index 01264781a68..d50971583a1 100644 --- a/spec/javascripts/environments/environment_external_url_spec.js.es6 +++ b/spec/javascripts/environments/environment_external_url_spec.js.es6 @@ -1,4 +1,3 @@ -require('../spec_helper'); window.Vue = require('vue'); require('environments/components/environment_external_url'); diff --git a/spec/javascripts/environments/environment_item_spec.js.es6 b/spec/javascripts/environments/environment_item_spec.js.es6 index 56c718eb501..f6079afd617 100644 --- a/spec/javascripts/environments/environment_item_spec.js.es6 +++ b/spec/javascripts/environments/environment_item_spec.js.es6 @@ -1,4 +1,3 @@ -require('../spec_helper'); window.Vue = require('vue'); window.timeago = require('vendor/timeago'); require('environments/components/environment_item'); diff --git a/spec/javascripts/environments/environment_rollback_spec.js.es6 b/spec/javascripts/environments/environment_rollback_spec.js.es6 index 5c378901608..87ffd76c152 100644 --- a/spec/javascripts/environments/environment_rollback_spec.js.es6 +++ b/spec/javascripts/environments/environment_rollback_spec.js.es6 @@ -1,4 +1,3 @@ -require('../spec_helper'); window.Vue = require('vue'); require('environments/components/environment_rollback'); diff --git a/spec/javascripts/environments/environment_stop_spec.js.es6 b/spec/javascripts/environments/environment_stop_spec.js.es6 index 96c738f42d6..b0b8f355fde 100644 --- a/spec/javascripts/environments/environment_stop_spec.js.es6 +++ b/spec/javascripts/environments/environment_stop_spec.js.es6 @@ -1,4 +1,3 @@ -require('../spec_helper'); window.Vue = require('vue'); require('environments/components/environment_stop'); diff --git a/spec/javascripts/environments/environments_store_spec.js.es6 b/spec/javascripts/environments/environments_store_spec.js.es6 index 8c113b5679e..bcbe214eb05 100644 --- a/spec/javascripts/environments/environments_store_spec.js.es6 +++ b/spec/javascripts/environments/environments_store_spec.js.es6 @@ -1,6 +1,5 @@ /* global environmentsList */ -require('../spec_helper'); window.Vue = require('vue'); require('environments/stores/environments_store'); require('./mock_data'); diff --git a/spec/javascripts/extensions/array_spec.js.es6 b/spec/javascripts/extensions/array_spec.js.es6 index f35cda4cac7..5396e0eb639 100644 --- a/spec/javascripts/extensions/array_spec.js.es6 +++ b/spec/javascripts/extensions/array_spec.js.es6 @@ -1,6 +1,5 @@ /* eslint-disable space-before-function-paren, no-var, padded-blocks */ -require('../spec_helper'); require('extensions/array'); (function() { diff --git a/spec/javascripts/extensions/element_spec.js.es6 b/spec/javascripts/extensions/element_spec.js.es6 index fddd7600cb9..49544ae8b5c 100644 --- a/spec/javascripts/extensions/element_spec.js.es6 +++ b/spec/javascripts/extensions/element_spec.js.es6 @@ -1,4 +1,3 @@ -require('../spec_helper'); require('extensions/element'); (() => { diff --git a/spec/javascripts/extensions/jquery_spec.js b/spec/javascripts/extensions/jquery_spec.js index 5f5bca4bc06..3163414b134 100644 --- a/spec/javascripts/extensions/jquery_spec.js +++ b/spec/javascripts/extensions/jquery_spec.js @@ -1,6 +1,5 @@ /* eslint-disable space-before-function-paren, no-var, padded-blocks */ -require('../spec_helper'); require('extensions/jquery'); (function() { diff --git a/spec/javascripts/extensions/object_spec.js.es6 b/spec/javascripts/extensions/object_spec.js.es6 index 25707be7bb4..77ffa1a35ae 100644 --- a/spec/javascripts/extensions/object_spec.js.es6 +++ b/spec/javascripts/extensions/object_spec.js.es6 @@ -1,4 +1,3 @@ -require('../spec_helper'); require('extensions/object'); describe('Object extensions', () => { diff --git a/spec/javascripts/gl_dropdown_spec.js.es6 b/spec/javascripts/gl_dropdown_spec.js.es6 index 7b2b4771756..1f4d7a4eb07 100644 --- a/spec/javascripts/gl_dropdown_spec.js.es6 +++ b/spec/javascripts/gl_dropdown_spec.js.es6 @@ -1,7 +1,6 @@ /* eslint-disable comma-dangle, prefer-const, no-param-reassign, no-plusplus, semi, no-unused-expressions, arrow-spacing, max-len */ /* global Turbolinks */ -require('./spec_helper'); require('gl_dropdown'); require('lib/utils/common_utils'); require('lib/utils/type_utility'); diff --git a/spec/javascripts/gl_field_errors_spec.js.es6 b/spec/javascripts/gl_field_errors_spec.js.es6 index 763e1bb5685..53f7e576394 100644 --- a/spec/javascripts/gl_field_errors_spec.js.es6 +++ b/spec/javascripts/gl_field_errors_spec.js.es6 @@ -1,6 +1,5 @@ /* eslint-disable space-before-function-paren, arrow-body-style, indent, padded-blocks */ -require('./spec_helper'); require('gl_field_errors'); ((global) => { diff --git a/spec/javascripts/graphs/stat_graph_contributors_graph_spec.js b/spec/javascripts/graphs/stat_graph_contributors_graph_spec.js index b4d278dfe88..a914eda90bb 100644 --- a/spec/javascripts/graphs/stat_graph_contributors_graph_spec.js +++ b/spec/javascripts/graphs/stat_graph_contributors_graph_spec.js @@ -3,7 +3,6 @@ /* global ContributorsGraph */ /* global ContributorsMasterGraph */ -require('../spec_helper'); require('graphs/stat_graph_contributors_graph'); describe("ContributorsGraph", function () { diff --git a/spec/javascripts/graphs/stat_graph_contributors_util_spec.js b/spec/javascripts/graphs/stat_graph_contributors_util_spec.js index 8323fcff02d..4f82e1c46db 100644 --- a/spec/javascripts/graphs/stat_graph_contributors_util_spec.js +++ b/spec/javascripts/graphs/stat_graph_contributors_util_spec.js @@ -1,7 +1,6 @@ /* eslint-disable quotes, padded-blocks, no-var, camelcase, object-curly-spacing, semi, indent, object-property-newline, comma-dangle, comma-spacing, spaced-comment, max-len, key-spacing, vars-on-top, quote-props, no-multi-spaces */ /* global ContributorsStatGraphUtil */ -require('../spec_helper'); require('graphs/stat_graph_contributors_util'); describe("ContributorsStatGraphUtil", function () { diff --git a/spec/javascripts/graphs/stat_graph_spec.js b/spec/javascripts/graphs/stat_graph_spec.js index 66c8c16a40f..a017f35831d 100644 --- a/spec/javascripts/graphs/stat_graph_spec.js +++ b/spec/javascripts/graphs/stat_graph_spec.js @@ -1,7 +1,6 @@ /* eslint-disable quotes, padded-blocks, semi */ /* global StatGraph */ -require('../spec_helper'); require('graphs/stat_graph'); describe("StatGraph", function () { diff --git a/spec/javascripts/header_spec.js b/spec/javascripts/header_spec.js index 4e93e33d432..570d0ab78cb 100644 --- a/spec/javascripts/header_spec.js +++ b/spec/javascripts/header_spec.js @@ -1,6 +1,5 @@ /* eslint-disable space-before-function-paren, padded-blocks, no-var */ -require('./spec_helper'); require('header'); require('lib/utils/text_utility'); diff --git a/spec/javascripts/issuable_spec.js.es6 b/spec/javascripts/issuable_spec.js.es6 index 5d3269626af..eaf155f1606 100644 --- a/spec/javascripts/issuable_spec.js.es6 +++ b/spec/javascripts/issuable_spec.js.es6 @@ -1,7 +1,6 @@ /* global Issuable */ /* global Turbolinks */ -require('./spec_helper'); require('issuable'); (() => { diff --git a/spec/javascripts/issue_spec.js b/spec/javascripts/issue_spec.js index 126b3682d5d..2938d69e94c 100644 --- a/spec/javascripts/issue_spec.js +++ b/spec/javascripts/issue_spec.js @@ -1,7 +1,6 @@ /* eslint-disable space-before-function-paren, no-var, one-var, one-var-declaration-per-line, no-use-before-define, indent, no-trailing-spaces, comma-dangle, padded-blocks, max-len */ /* global Issue */ -require('./spec_helper'); require('lib/utils/text_utility'); require('issue'); diff --git a/spec/javascripts/labels_issue_sidebar_spec.js.es6 b/spec/javascripts/labels_issue_sidebar_spec.js.es6 index 885e975c32b..ac3b4e8e0f6 100644 --- a/spec/javascripts/labels_issue_sidebar_spec.js.es6 +++ b/spec/javascripts/labels_issue_sidebar_spec.js.es6 @@ -2,7 +2,6 @@ /* global IssuableContext */ /* global LabelsSelect */ -require('./spec_helper'); require('lib/utils/type_utility'); require('gl_dropdown'); require('select2'); diff --git a/spec/javascripts/lib/utils/common_utils_spec.js.es6 b/spec/javascripts/lib/utils/common_utils_spec.js.es6 index 02aabf202d0..46aa0702bda 100644 --- a/spec/javascripts/lib/utils/common_utils_spec.js.es6 +++ b/spec/javascripts/lib/utils/common_utils_spec.js.es6 @@ -1,4 +1,3 @@ -require('../../spec_helper'); require('lib/utils/common_utils'); (() => { diff --git a/spec/javascripts/line_highlighter_spec.js b/spec/javascripts/line_highlighter_spec.js index fb549b846e0..afc51e6682a 100644 --- a/spec/javascripts/line_highlighter_spec.js +++ b/spec/javascripts/line_highlighter_spec.js @@ -1,7 +1,6 @@ /* eslint-disable space-before-function-paren, no-var, no-param-reassign, quotes, prefer-template, no-else-return, new-cap, dot-notation, no-return-assign, comma-dangle, no-new, one-var, one-var-declaration-per-line, no-plusplus, jasmine/no-spec-dupes, no-underscore-dangle, padded-blocks, max-len */ /* global LineHighlighter */ -require('./spec_helper'); require('line_highlighter'); (function() { diff --git a/spec/javascripts/merge_request_spec.js b/spec/javascripts/merge_request_spec.js index bbfa6aa67a5..5f98edc3bb0 100644 --- a/spec/javascripts/merge_request_spec.js +++ b/spec/javascripts/merge_request_spec.js @@ -1,7 +1,6 @@ /* eslint-disable space-before-function-paren, no-return-assign, padded-blocks */ /* global MergeRequest */ -require('./spec_helper'); require('merge_request'); (function() { diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js index a8fa47cdd57..5f53334f44c 100644 --- a/spec/javascripts/merge_request_tabs_spec.js +++ b/spec/javascripts/merge_request_tabs_spec.js @@ -1,6 +1,5 @@ /* eslint-disable no-var, comma-dangle, object-shorthand */ -require('./spec_helper'); require('merge_request_tabs'); require('breakpoints'); require('lib/utils/common_utils'); diff --git a/spec/javascripts/merge_request_widget_spec.js b/spec/javascripts/merge_request_widget_spec.js index 0ec119c94b3..b29f5bad234 100644 --- a/spec/javascripts/merge_request_widget_spec.js +++ b/spec/javascripts/merge_request_widget_spec.js @@ -1,6 +1,5 @@ /* eslint-disable space-before-function-paren, quotes, comma-dangle, dot-notation, indent, quote-props, no-var, padded-blocks, max-len */ -require('./spec_helper'); require('merge_request_widget'); require('lib/utils/datetime_utility'); diff --git a/spec/javascripts/mini_pipeline_graph_dropdown_spec.js.es6 b/spec/javascripts/mini_pipeline_graph_dropdown_spec.js.es6 index 1faa1f88d70..32b80a4f4bd 100644 --- a/spec/javascripts/mini_pipeline_graph_dropdown_spec.js.es6 +++ b/spec/javascripts/mini_pipeline_graph_dropdown_spec.js.es6 @@ -1,6 +1,5 @@ /* eslint-disable no-new */ -require('./spec_helper'); require('flash'); require('mini_pipeline_graph_dropdown'); diff --git a/spec/javascripts/new_branch_spec.js b/spec/javascripts/new_branch_spec.js index 8d8c8ec9b0d..40c6b6d3999 100644 --- a/spec/javascripts/new_branch_spec.js +++ b/spec/javascripts/new_branch_spec.js @@ -1,7 +1,6 @@ /* eslint-disable space-before-function-paren, one-var, no-var, one-var-declaration-per-line, no-return-assign, quotes, padded-blocks, max-len */ /* global NewBranchForm */ -require('./spec_helper'); require('jquery-ui/ui/autocomplete'); require('new_branch_form'); diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js index 75f5192a54e..0b2ac007495 100644 --- a/spec/javascripts/notes_spec.js +++ b/spec/javascripts/notes_spec.js @@ -1,7 +1,6 @@ /* eslint-disable space-before-function-paren, no-unused-expressions, no-var, object-shorthand, comma-dangle, semi, padded-blocks, max-len */ /* global Notes */ -require('./spec_helper'); require('notes'); require('vendor/autosize'); require('gl_form'); diff --git a/spec/javascripts/pipelines_spec.js.es6 b/spec/javascripts/pipelines_spec.js.es6 index e51977ab720..1bee64b814f 100644 --- a/spec/javascripts/pipelines_spec.js.es6 +++ b/spec/javascripts/pipelines_spec.js.es6 @@ -1,4 +1,3 @@ -require('./spec_helper'); require('pipelines'); (() => { diff --git a/spec/javascripts/pretty_time_spec.js.es6 b/spec/javascripts/pretty_time_spec.js.es6 index 249aa4817e9..207d40983b4 100644 --- a/spec/javascripts/pretty_time_spec.js.es6 +++ b/spec/javascripts/pretty_time_spec.js.es6 @@ -1,4 +1,3 @@ -require('./spec_helper'); require('lib/utils/pretty_time'); (() => { diff --git a/spec/javascripts/project_title_spec.js b/spec/javascripts/project_title_spec.js index a438b01fbce..a774b978458 100644 --- a/spec/javascripts/project_title_spec.js +++ b/spec/javascripts/project_title_spec.js @@ -1,7 +1,6 @@ /* eslint-disable space-before-function-paren, no-unused-expressions, no-return-assign, no-param-reassign, no-var, new-cap, wrap-iife, no-unused-vars, quotes, jasmine/no-expect-in-setup-teardown, padded-blocks, max-len */ /* global Project */ -require('./spec_helper'); require('select2/select2.js'); require('lib/utils/type_utility'); require('gl_dropdown'); diff --git a/spec/javascripts/right_sidebar_spec.js b/spec/javascripts/right_sidebar_spec.js index 65730b42ea3..026ae04eb21 100644 --- a/spec/javascripts/right_sidebar_spec.js +++ b/spec/javascripts/right_sidebar_spec.js @@ -1,7 +1,6 @@ /* eslint-disable space-before-function-paren, no-var, one-var, one-var-declaration-per-line, new-parens, no-return-assign, new-cap, vars-on-top, semi, padded-blocks, max-len */ /* global Sidebar */ -require('./spec_helper'); require('right_sidebar'); window.Cookies = require('vendor/js.cookie'); require('extensions/jquery.js'); diff --git a/spec/javascripts/search_autocomplete_spec.js b/spec/javascripts/search_autocomplete_spec.js index 4ac9117fd8a..8d7f48eabc5 100644 --- a/spec/javascripts/search_autocomplete_spec.js +++ b/spec/javascripts/search_autocomplete_spec.js @@ -1,6 +1,5 @@ /* eslint-disable space-before-function-paren, max-len, no-var, one-var, one-var-declaration-per-line, no-unused-expressions, consistent-return, no-param-reassign, default-case, no-return-assign, comma-dangle, object-shorthand, prefer-template, quotes, new-parens, vars-on-top, new-cap, padded-blocks, max-len */ -require('./spec_helper'); require('gl_dropdown'); require('search_autocomplete'); require('lib/utils/common_utils'); diff --git a/spec/javascripts/shortcuts_issuable_spec.js b/spec/javascripts/shortcuts_issuable_spec.js index e6605c46bfc..65c4f42e3b8 100644 --- a/spec/javascripts/shortcuts_issuable_spec.js +++ b/spec/javascripts/shortcuts_issuable_spec.js @@ -1,7 +1,6 @@ /* eslint-disable space-before-function-paren, no-return-assign, no-var, quotes, padded-blocks */ /* global ShortcutsIssuable */ -require('./spec_helper'); require('shortcuts_issuable'); (function() { diff --git a/spec/javascripts/signin_tabs_memoizer_spec.js.es6 b/spec/javascripts/signin_tabs_memoizer_spec.js.es6 index f7aa3e663f9..b34942d78d1 100644 --- a/spec/javascripts/signin_tabs_memoizer_spec.js.es6 +++ b/spec/javascripts/signin_tabs_memoizer_spec.js.es6 @@ -1,4 +1,3 @@ -require('./spec_helper'); require('signin_tabs_memoizer'); ((global) => { diff --git a/spec/javascripts/smart_interval_spec.js.es6 b/spec/javascripts/smart_interval_spec.js.es6 index 23cf8689585..3075965d7f9 100644 --- a/spec/javascripts/smart_interval_spec.js.es6 +++ b/spec/javascripts/smart_interval_spec.js.es6 @@ -1,4 +1,3 @@ -require('./spec_helper'); require('smart_interval'); (() => { diff --git a/spec/javascripts/subbable_resource_spec.js.es6 b/spec/javascripts/subbable_resource_spec.js.es6 index a70a1419792..1434ae8364d 100644 --- a/spec/javascripts/subbable_resource_spec.js.es6 +++ b/spec/javascripts/subbable_resource_spec.js.es6 @@ -1,6 +1,5 @@ /* eslint-disable max-len, arrow-parens, comma-dangle, no-plusplus */ -require('./spec_helper'); require('subbable_resource'); /* diff --git a/spec/javascripts/syntax_highlight_spec.js b/spec/javascripts/syntax_highlight_spec.js index c06339fa709..b5e869e2169 100644 --- a/spec/javascripts/syntax_highlight_spec.js +++ b/spec/javascripts/syntax_highlight_spec.js @@ -1,6 +1,5 @@ /* eslint-disable space-before-function-paren, no-var, no-return-assign, quotes, padded-blocks */ -require('./spec_helper'); require('syntax_highlight'); (function() { diff --git a/spec/javascripts/u2f/authenticate_spec.js b/spec/javascripts/u2f/authenticate_spec.js index a14f0e3c448..22cea407943 100644 --- a/spec/javascripts/u2f/authenticate_spec.js +++ b/spec/javascripts/u2f/authenticate_spec.js @@ -2,7 +2,6 @@ /* global MockU2FDevice */ /* global U2FAuthenticate */ -require('../spec_helper'); require('u2f/authenticate'); require('u2f/util'); require('u2f/error'); diff --git a/spec/javascripts/u2f/register_spec.js b/spec/javascripts/u2f/register_spec.js index 157c8796fd5..17b3732975b 100644 --- a/spec/javascripts/u2f/register_spec.js +++ b/spec/javascripts/u2f/register_spec.js @@ -2,7 +2,6 @@ /* global MockU2FDevice */ /* global U2FRegister */ -require('../spec_helper'); require('u2f/register'); require('u2f/util'); require('u2f/error'); diff --git a/spec/javascripts/vue_common_components/commit_spec.js.es6 b/spec/javascripts/vue_common_components/commit_spec.js.es6 index 28ffc005001..12d8c411847 100644 --- a/spec/javascripts/vue_common_components/commit_spec.js.es6 +++ b/spec/javascripts/vue_common_components/commit_spec.js.es6 @@ -1,4 +1,3 @@ -require('../spec_helper'); require('vue_common_component/commit'); describe('Commit component', () => { diff --git a/spec/javascripts/zen_mode_spec.js b/spec/javascripts/zen_mode_spec.js index 2c790b193b0..7fe2ab68c75 100644 --- a/spec/javascripts/zen_mode_spec.js +++ b/spec/javascripts/zen_mode_spec.js @@ -3,7 +3,6 @@ /* global Mousetrap */ /* global ZenMode */ -require('./spec_helper'); require('zen_mode'); (function() { |