diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-15 19:18:23 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-15 19:18:23 +0300 |
commit | d2f313dcbccc1e3642fb0ccdf0849e0ef4ec8e21 (patch) | |
tree | a33d3ecd1dba2768010a14bf85767db20c90b360 /spec | |
parent | dc17e7d7a9a6a246cd8c69a7d06ff1dcfefd8384 (diff) | |
parent | 29e1a63d3d3dac857e0a9189e1b306f072700801 (diff) |
Merge branch 'ph-more-es-modules' into 'master'
Export JS classes as modules
See merge request gitlab-org/gitlab-ce!15952
Diffstat (limited to 'spec')
-rw-r--r-- | spec/javascripts/activities_spec.js | 1 | ||||
-rw-r--r-- | spec/javascripts/commits_spec.js | 1 | ||||
-rw-r--r-- | spec/javascripts/merge_request_tabs_spec.js | 4 | ||||
-rw-r--r-- | spec/javascripts/pager_spec.js | 8 |
4 files changed, 3 insertions, 11 deletions
diff --git a/spec/javascripts/activities_spec.js b/spec/javascripts/activities_spec.js index fc9be14df8f..7a9c539e9d0 100644 --- a/spec/javascripts/activities_spec.js +++ b/spec/javascripts/activities_spec.js @@ -1,7 +1,6 @@ /* eslint-disable no-unused-expressions, no-prototype-builtins, no-new, no-shadow, max-len */ import 'vendor/jquery.endless-scroll'; -import '~/pager'; import Activities from '~/activities'; (() => { diff --git a/spec/javascripts/commits_spec.js b/spec/javascripts/commits_spec.js index e5a5e3293b9..d0176520440 100644 --- a/spec/javascripts/commits_spec.js +++ b/spec/javascripts/commits_spec.js @@ -1,5 +1,4 @@ import 'vendor/jquery.endless-scroll'; -import '~/pager'; import CommitsList from '~/commits'; describe('Commits List', () => { diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js index 5076435e7a8..31426ceb110 100644 --- a/spec/javascripts/merge_request_tabs_spec.js +++ b/spec/javascripts/merge_request_tabs_spec.js @@ -2,7 +2,7 @@ /* global Notes */ import * as urlUtils from '~/lib/utils/url_utility'; -import '~/merge_request_tabs'; +import MergeRequestTabs from '~/merge_request_tabs'; import '~/commit/pipelines/pipelines_bundle'; import '~/breakpoints'; import '~/lib/utils/common_utils'; @@ -32,7 +32,7 @@ import 'vendor/jquery.scrollTo'; ); beforeEach(function () { - this.class = new gl.MergeRequestTabs({ stubLocation: stubLocation }); + this.class = new MergeRequestTabs({ stubLocation: stubLocation }); setLocation(); this.spies = { diff --git a/spec/javascripts/pager_spec.js b/spec/javascripts/pager_spec.js index fe3ea996eac..2fd87754238 100644 --- a/spec/javascripts/pager_spec.js +++ b/spec/javascripts/pager_spec.js @@ -1,15 +1,9 @@ /* global fixture */ import * as utils from '~/lib/utils/url_utility'; -import '~/pager'; +import Pager from '~/pager'; describe('pager', () => { - const Pager = window.Pager; - - it('is defined on window', () => { - expect(window.Pager).toBeDefined(); - }); - describe('init', () => { const originalHref = window.location.href; |