summaryrefslogtreecommitdiff
path: root/spec/javascripts
diff options
context:
space:
mode:
Diffstat (limited to 'spec/javascripts')
-rw-r--r--spec/javascripts/application_spec.js.coffee4
-rw-r--r--spec/javascripts/awards_handler_spec.js.coffee16
-rw-r--r--spec/javascripts/behaviors/autosize_spec.js.coffee4
-rw-r--r--spec/javascripts/behaviors/quick_submit_spec.js.coffee4
-rw-r--r--spec/javascripts/behaviors/requires_input_spec.js.coffee4
-rw-r--r--spec/javascripts/extensions/array_spec.js.coffee4
-rw-r--r--spec/javascripts/extensions/jquery_spec.js.coffee4
-rw-r--r--spec/javascripts/issue_spec.js.coffee8
-rw-r--r--spec/javascripts/line_highlighter_spec.js.coffee4
-rw-r--r--spec/javascripts/merge_request_spec.js.coffee4
-rw-r--r--spec/javascripts/merge_request_tabs_spec.js.coffee4
-rw-r--r--spec/javascripts/merge_request_widget_spec.js.coffee4
-rw-r--r--spec/javascripts/new_branch_spec.js.coffee8
-rw-r--r--spec/javascripts/notes_spec.js.coffee8
-rw-r--r--spec/javascripts/project_title_spec.js.coffee28
-rw-r--r--spec/javascripts/right_sidebar_spec.js.coffee12
-rw-r--r--spec/javascripts/search_autocomplete_spec.js.coffee24
-rw-r--r--spec/javascripts/shortcuts_issuable_spec.js.coffee4
-rw-r--r--spec/javascripts/syntax_highlight_spec.js.coffee4
-rw-r--r--spec/javascripts/u2f/register_spec.js.coffee20
-rw-r--r--spec/javascripts/zen_mode_spec.js.coffee4
21 files changed, 132 insertions, 44 deletions
diff --git a/spec/javascripts/application_spec.js.coffee b/spec/javascripts/application_spec.js.coffee
index 4b6a2bb5440..576a60762bd 100644
--- a/spec/javascripts/application_spec.js.coffee
+++ b/spec/javascripts/application_spec.js.coffee
@@ -1,4 +1,6 @@
-#= require lib/utils/common_utils
+###
+//= require lib/utils/common_utils
+###
describe 'Application', ->
describe 'disable buttons', ->
diff --git a/spec/javascripts/awards_handler_spec.js.coffee b/spec/javascripts/awards_handler_spec.js.coffee
index d7f9c6fc076..55bff06492a 100644
--- a/spec/javascripts/awards_handler_spec.js.coffee
+++ b/spec/javascripts/awards_handler_spec.js.coffee
@@ -1,7 +1,15 @@
-#= require awards_handler
-#= require jquery
-#= require jquery.cookie
-#= require ./fixtures/emoji_menu
+###
+//= require awards_handler
+###
+###
+//= require jquery
+###
+###
+//= require jquery.cookie
+###
+###
+//= require ./fixtures/emoji_menu
+###
awardsHandler = null
window.gl or= {}
diff --git a/spec/javascripts/behaviors/autosize_spec.js.coffee b/spec/javascripts/behaviors/autosize_spec.js.coffee
index 7fc1d19c35f..d5e1c8d6a02 100644
--- a/spec/javascripts/behaviors/autosize_spec.js.coffee
+++ b/spec/javascripts/behaviors/autosize_spec.js.coffee
@@ -1,4 +1,6 @@
-#= require behaviors/autosize
+###
+//= require behaviors/autosize
+###
describe 'Autosize behavior', ->
beforeEach ->
diff --git a/spec/javascripts/behaviors/quick_submit_spec.js.coffee b/spec/javascripts/behaviors/quick_submit_spec.js.coffee
index d3b003a328a..cc4be50133a 100644
--- a/spec/javascripts/behaviors/quick_submit_spec.js.coffee
+++ b/spec/javascripts/behaviors/quick_submit_spec.js.coffee
@@ -1,4 +1,6 @@
-#= require behaviors/quick_submit
+###
+//= require behaviors/quick_submit
+###
describe 'Quick Submit behavior', ->
fixture.preload('behaviors/quick_submit.html')
diff --git a/spec/javascripts/behaviors/requires_input_spec.js.coffee b/spec/javascripts/behaviors/requires_input_spec.js.coffee
index 61a17632173..c1bf27838ff 100644
--- a/spec/javascripts/behaviors/requires_input_spec.js.coffee
+++ b/spec/javascripts/behaviors/requires_input_spec.js.coffee
@@ -1,4 +1,6 @@
-#= require behaviors/requires_input
+###
+//= require behaviors/requires_input
+###
describe 'requiresInput', ->
fixture.preload('behaviors/requires_input.html')
diff --git a/spec/javascripts/extensions/array_spec.js.coffee b/spec/javascripts/extensions/array_spec.js.coffee
index 4ceac619422..7f9d4152800 100644
--- a/spec/javascripts/extensions/array_spec.js.coffee
+++ b/spec/javascripts/extensions/array_spec.js.coffee
@@ -1,4 +1,6 @@
-#= require extensions/array
+###
+//= require extensions/array
+###
describe 'Array extensions', ->
describe 'first', ->
diff --git a/spec/javascripts/extensions/jquery_spec.js.coffee b/spec/javascripts/extensions/jquery_spec.js.coffee
index b10e16b7d01..7145b297059 100644
--- a/spec/javascripts/extensions/jquery_spec.js.coffee
+++ b/spec/javascripts/extensions/jquery_spec.js.coffee
@@ -1,4 +1,6 @@
-#= require extensions/jquery
+###
+//= require extensions/jquery
+###
describe 'jQuery extensions', ->
describe 'disable', ->
diff --git a/spec/javascripts/issue_spec.js.coffee b/spec/javascripts/issue_spec.js.coffee
index d84d80f266b..24920762be9 100644
--- a/spec/javascripts/issue_spec.js.coffee
+++ b/spec/javascripts/issue_spec.js.coffee
@@ -1,5 +1,9 @@
-#= require lib/utils/text_utility
-#= require issue
+###
+//= require lib/utils/text_utility
+###
+###
+//= require issue
+###
describe 'Issue', ->
describe 'task lists', ->
diff --git a/spec/javascripts/line_highlighter_spec.js.coffee b/spec/javascripts/line_highlighter_spec.js.coffee
index a073f21e7bc..0ef25b15b90 100644
--- a/spec/javascripts/line_highlighter_spec.js.coffee
+++ b/spec/javascripts/line_highlighter_spec.js.coffee
@@ -1,4 +1,6 @@
-#= require line_highlighter
+###
+//= require line_highlighter
+###
describe 'LineHighlighter', ->
fixture.preload('line_highlighter.html')
diff --git a/spec/javascripts/merge_request_spec.js.coffee b/spec/javascripts/merge_request_spec.js.coffee
index 3cb67d51c85..b3b0f106100 100644
--- a/spec/javascripts/merge_request_spec.js.coffee
+++ b/spec/javascripts/merge_request_spec.js.coffee
@@ -1,4 +1,6 @@
-#= require merge_request
+###
+//= require merge_request
+###
describe 'MergeRequest', ->
describe 'task lists', ->
diff --git a/spec/javascripts/merge_request_tabs_spec.js.coffee b/spec/javascripts/merge_request_tabs_spec.js.coffee
index a0cfba455ea..9993bceaf2a 100644
--- a/spec/javascripts/merge_request_tabs_spec.js.coffee
+++ b/spec/javascripts/merge_request_tabs_spec.js.coffee
@@ -1,4 +1,6 @@
-#= require merge_request_tabs
+###
+//= require merge_request_tabs
+###
describe 'MergeRequestTabs', ->
stubLocation = (stubs) ->
diff --git a/spec/javascripts/merge_request_widget_spec.js.coffee b/spec/javascripts/merge_request_widget_spec.js.coffee
index 92b7eeb1116..6b6615620b2 100644
--- a/spec/javascripts/merge_request_widget_spec.js.coffee
+++ b/spec/javascripts/merge_request_widget_spec.js.coffee
@@ -1,4 +1,6 @@
-#= require merge_request_widget
+###
+//= require merge_request_widget
+###
describe 'MergeRequestWidget', ->
diff --git a/spec/javascripts/new_branch_spec.js.coffee b/spec/javascripts/new_branch_spec.js.coffee
index ce773793817..8e26490aab6 100644
--- a/spec/javascripts/new_branch_spec.js.coffee
+++ b/spec/javascripts/new_branch_spec.js.coffee
@@ -1,5 +1,9 @@
-#= require jquery-ui/autocomplete
-#= require new_branch_form
+###
+//= require jquery-ui/autocomplete
+###
+###
+//= require new_branch_form
+###
describe 'Branch', ->
describe 'create a new branch', ->
diff --git a/spec/javascripts/notes_spec.js.coffee b/spec/javascripts/notes_spec.js.coffee
index 3a3c8d63e82..e00cb6a4839 100644
--- a/spec/javascripts/notes_spec.js.coffee
+++ b/spec/javascripts/notes_spec.js.coffee
@@ -1,5 +1,9 @@
-#= require notes
-#= require gl_form
+###
+//= require notes
+###
+###
+//= require gl_form
+###
window.gon or= {}
window.disableButtonIfEmptyField = -> null
diff --git a/spec/javascripts/project_title_spec.js.coffee b/spec/javascripts/project_title_spec.js.coffee
index 0244119fa0e..9d161aa16c6 100644
--- a/spec/javascripts/project_title_spec.js.coffee
+++ b/spec/javascripts/project_title_spec.js.coffee
@@ -1,10 +1,24 @@
-#= require bootstrap
-#= require select2
-#= require lib/utils/type_utility
-#= require gl_dropdown
-#= require api
-#= require project_select
-#= require project
+###
+//= require bootstrap
+###
+###
+//= require select2
+###
+###
+//= require lib/utils/type_utility
+###
+###
+//= require gl_dropdown
+###
+###
+//= require api
+###
+###
+//= require project_select
+###
+###
+//= require project
+###
window.gon or= {}
window.gon.api_version = 'v3'
diff --git a/spec/javascripts/right_sidebar_spec.js.coffee b/spec/javascripts/right_sidebar_spec.js.coffee
index 2075cacdb67..ea8b8378f53 100644
--- a/spec/javascripts/right_sidebar_spec.js.coffee
+++ b/spec/javascripts/right_sidebar_spec.js.coffee
@@ -1,6 +1,12 @@
-#= require right_sidebar
-#= require jquery
-#= require jquery.cookie
+###
+//= require right_sidebar
+###
+###
+//= require jquery
+###
+###
+//= require jquery.cookie
+###
@sidebar = null
$aside = null
diff --git a/spec/javascripts/search_autocomplete_spec.js.coffee b/spec/javascripts/search_autocomplete_spec.js.coffee
index 1c1faca3333..eb720fea798 100644
--- a/spec/javascripts/search_autocomplete_spec.js.coffee
+++ b/spec/javascripts/search_autocomplete_spec.js.coffee
@@ -1,9 +1,21 @@
-#= require gl_dropdown
-#= require search_autocomplete
-#= require jquery
-#= require lib/utils/common_utils
-#= require lib/utils/type_utility
-#= require fuzzaldrin-plus
+###
+//= require gl_dropdown
+###
+###
+//= require search_autocomplete
+###
+###
+//= require jquery
+###
+###
+//= require lib/utils/common_utils
+###
+###
+//= require lib/utils/type_utility
+###
+###
+//= require fuzzaldrin-plus
+###
widget = null
diff --git a/spec/javascripts/shortcuts_issuable_spec.js.coffee b/spec/javascripts/shortcuts_issuable_spec.js.coffee
index a01ad7140dd..4ac64fd211d 100644
--- a/spec/javascripts/shortcuts_issuable_spec.js.coffee
+++ b/spec/javascripts/shortcuts_issuable_spec.js.coffee
@@ -1,4 +1,6 @@
-#= require shortcuts_issuable
+###
+//= require shortcuts_issuable
+###
describe 'ShortcutsIssuable', ->
fixture.preload('issuable.html')
diff --git a/spec/javascripts/syntax_highlight_spec.js.coffee b/spec/javascripts/syntax_highlight_spec.js.coffee
index 6a73b6bf32c..99d1d9c52eb 100644
--- a/spec/javascripts/syntax_highlight_spec.js.coffee
+++ b/spec/javascripts/syntax_highlight_spec.js.coffee
@@ -1,4 +1,6 @@
-#= require syntax_highlight
+###
+//= require syntax_highlight
+###
describe 'Syntax Highlighter', ->
stubUserColorScheme = (value) ->
diff --git a/spec/javascripts/u2f/register_spec.js.coffee b/spec/javascripts/u2f/register_spec.js.coffee
index 87dc769792b..815045a7d5f 100644
--- a/spec/javascripts/u2f/register_spec.js.coffee
+++ b/spec/javascripts/u2f/register_spec.js.coffee
@@ -1,8 +1,18 @@
-#= require u2f/register
-#= require u2f/util
-#= require u2f/error
-#= require u2f
-#= require ./mock_u2f_device
+###
+//= require u2f/register
+###
+###
+//= require u2f/util
+###
+###
+//= require u2f/error
+###
+###
+//= require u2f
+###
+###
+//= require ./mock_u2f_device
+###
describe 'U2FRegister', ->
fixture.load('u2f/register')
diff --git a/spec/javascripts/zen_mode_spec.js.coffee b/spec/javascripts/zen_mode_spec.js.coffee
index b790fce01ed..0672d3f30f9 100644
--- a/spec/javascripts/zen_mode_spec.js.coffee
+++ b/spec/javascripts/zen_mode_spec.js.coffee
@@ -1,4 +1,6 @@
-#= require zen_mode
+###
+//= require zen_mode
+###
describe 'ZenMode', ->
fixture.preload('zen_mode.html')