diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-28 12:12:08 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-28 12:12:08 +0200 |
| commit | 0ca275748314a27a1f36e12fe1360df11c9be25d (patch) | |
| tree | 70cbcc298304d913b146e7fd5692c48a3ed13caa /spec/javascripts | |
| parent | 8076d38a1487dd5b64153cd20eb696358b2f7acf (diff) | |
| parent | 2c3f3cb3920c5242cbc66456b3eed423636a2128 (diff) | |
| download | gitlab-ce-0ca275748314a27a1f36e12fe1360df11c9be25d.tar.gz | |
fix merge conflicts
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/application_spec.js.coffee | 2 | ||||
| -rw-r--r-- | spec/javascripts/awards_handler_spec.js.coffee | 1 | ||||
| -rw-r--r-- | spec/javascripts/fixtures/emoji_menu.coffee | 2 | ||||
| -rw-r--r-- | spec/javascripts/issue_spec.js.coffee | 2 | ||||
| -rw-r--r-- | spec/javascripts/project_title_spec.js.coffee | 2 | ||||
| -rw-r--r-- | spec/javascripts/search_autocomplete_spec.js.coffee | 4 |
6 files changed, 6 insertions, 7 deletions
diff --git a/spec/javascripts/application_spec.js.coffee b/spec/javascripts/application_spec.js.coffee index 8af39c41f2f..4b6a2bb5440 100644 --- a/spec/javascripts/application_spec.js.coffee +++ b/spec/javascripts/application_spec.js.coffee @@ -1,4 +1,4 @@ -#= require lib/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 ba191199dc7..d7f9c6fc076 100644 --- a/spec/javascripts/awards_handler_spec.js.coffee +++ b/spec/javascripts/awards_handler_spec.js.coffee @@ -160,7 +160,6 @@ describe 'AwardsHandler', -> expect($('[data-emoji=angel]').is(':visible')).toBe no expect($('[data-emoji=anger]').is(':visible')).toBe no expect($('[data-emoji=alien]').is(':visible')).toBe yes - expect($('h5.emoji-search').is(':visible')).toBe yes describe 'emoji menu', -> diff --git a/spec/javascripts/fixtures/emoji_menu.coffee b/spec/javascripts/fixtures/emoji_menu.coffee index e529dd5f1cd..ce1a41390d2 100644 --- a/spec/javascripts/fixtures/emoji_menu.coffee +++ b/spec/javascripts/fixtures/emoji_menu.coffee @@ -1,7 +1,7 @@ window.emojiMenu = """ <div class='emoji-menu'> + <input type="text" name="emoji_search" id="emoji_search" value="" class="emoji-search search-input form-control" /> <div class='emoji-menu-content'> - <input type="text" name="emoji_search" id="emoji_search" value="" class="emoji-search search-input form-control" /> <h5 class='emoji-menu-title'> Emoticons </h5> diff --git a/spec/javascripts/issue_spec.js.coffee b/spec/javascripts/issue_spec.js.coffee index 71f0c1076c5..d84d80f266b 100644 --- a/spec/javascripts/issue_spec.js.coffee +++ b/spec/javascripts/issue_spec.js.coffee @@ -1,4 +1,4 @@ -#= require lib/text_utility +#= require lib/utils/text_utility #= require issue describe 'Issue', -> diff --git a/spec/javascripts/project_title_spec.js.coffee b/spec/javascripts/project_title_spec.js.coffee index 9be29097f4c..f0d26fb5446 100644 --- a/spec/javascripts/project_title_spec.js.coffee +++ b/spec/javascripts/project_title_spec.js.coffee @@ -1,6 +1,6 @@ #= require bootstrap #= require select2 -#= require lib/type_utility +#= require lib/utils/type_utility #= require gl_dropdown #= require api #= require project_select diff --git a/spec/javascripts/search_autocomplete_spec.js.coffee b/spec/javascripts/search_autocomplete_spec.js.coffee index e77177783a7..1c1faca3333 100644 --- a/spec/javascripts/search_autocomplete_spec.js.coffee +++ b/spec/javascripts/search_autocomplete_spec.js.coffee @@ -1,8 +1,8 @@ #= require gl_dropdown #= require search_autocomplete #= require jquery -#= require lib/common_utils -#= require lib/type_utility +#= require lib/utils/common_utils +#= require lib/utils/type_utility #= require fuzzaldrin-plus |