diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-05-22 16:07:43 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-05-22 16:07:43 +0000 |
commit | b261fb7b33912a95f841c78971d072ce3749c0c5 (patch) | |
tree | f1732d467f8be82c4e2fc4e2becdf38b2371cd5b /spec/javascripts/blob | |
parent | 53f18d8326e26304f6df0996c615ca72b6a85e5b (diff) | |
parent | 97724e62f3870d1ff546c56e67fe03b0dfe32223 (diff) | |
download | gitlab-ce-b261fb7b33912a95f841c78971d072ce3749c0c5.tar.gz |
Merge branch 'adopt-es-module-syntax' into 'master'
Adopt ES module syntax
See merge request !9567
Diffstat (limited to 'spec/javascripts/blob')
-rw-r--r-- | spec/javascripts/blob/create_branch_dropdown_spec.js | 6 | ||||
-rw-r--r-- | spec/javascripts/blob/target_branch_dropdown_spec.js | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/spec/javascripts/blob/create_branch_dropdown_spec.js b/spec/javascripts/blob/create_branch_dropdown_spec.js index 9f0d373cb81..6dbaa47c544 100644 --- a/spec/javascripts/blob/create_branch_dropdown_spec.js +++ b/spec/javascripts/blob/create_branch_dropdown_spec.js @@ -1,6 +1,6 @@ -require('~/gl_dropdown'); -require('~/blob/create_branch_dropdown'); -require('~/blob/target_branch_dropdown'); +import '~/gl_dropdown'; +import '~/blob/create_branch_dropdown'; +import '~/blob/target_branch_dropdown'; describe('CreateBranchDropdown', () => { const fixtureTemplate = 'static/target_branch_dropdown.html.raw'; diff --git a/spec/javascripts/blob/target_branch_dropdown_spec.js b/spec/javascripts/blob/target_branch_dropdown_spec.js index 76ed3dc1a2d..99c9537d2ec 100644 --- a/spec/javascripts/blob/target_branch_dropdown_spec.js +++ b/spec/javascripts/blob/target_branch_dropdown_spec.js @@ -1,6 +1,6 @@ -require('~/gl_dropdown'); -require('~/blob/create_branch_dropdown'); -require('~/blob/target_branch_dropdown'); +import '~/gl_dropdown'; +import '~/blob/create_branch_dropdown'; +import '~/blob/target_branch_dropdown'; describe('TargetBranchDropdown', () => { const fixtureTemplate = 'static/target_branch_dropdown.html.raw'; |