Skip to content
Snippets Groups Projects
Commit 6bf781e4 authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files

Fix autocomplete broken tests

parent b67e333c
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -98,7 +98,7 @@ import initChangesDropdown from './init_changes_dropdown';
path = page.split(':');
shortcut_handler = null;
 
$('.js-gfm-input').each((i, el) => {
$('.js-gfm-input:not(.js-vue-textarea)').each((i, el) => {
const gfm = new GfmAutoComplete(gl.GfmAutoComplete && gl.GfmAutoComplete.dataSources);
const enableGFM = gl.utils.convertPermissionToBoolean(el.dataset.supportsAutocomplete);
gfm.setup($(el), {
Loading
Loading
Loading
Loading
@@ -240,7 +240,7 @@
<textarea
id="note-body"
name="note[note]"
class="note-textarea js-vue-comment-form js-gfm-input js-autosize markdown-area"
class="note-textarea js-vue-comment-form js-gfm-input js-autosize markdown-area js-vue-textarea"
data-supports-quick-actions="true"
aria-label="Description"
v-model="note"
Loading
Loading
Loading
Loading
@@ -131,7 +131,7 @@
<textarea
id="note_note"
name="note[note]"
class="note-textarea js-gfm-input js-autosize markdown-area js-vue-issue-note-form"
class="note-textarea js-gfm-input js-autosize markdown-area js-vue-issue-note-form js-vue-textarea"
:data-supports-quick-actions="!isEditing"
aria-label="Description"
v-model="note"
Loading
Loading
- @gfm_form = true
- content_for :note_actions do
- if can?(current_user, :update_issue, @issue)
= link_to 'Reopen issue', issue_path(@issue, issue: {state_event: :reopen}, format: 'json'), data: {original_text: "Reopen issue", alternative_text: "Comment & reopen issue"}, class: "btn btn-nr btn-reopen btn-comment js-note-target-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen issue'
Loading
Loading
@@ -16,5 +17,3 @@
- content_for :page_specific_javascripts do
= webpack_bundle_tag 'common_vue'
= webpack_bundle_tag 'notes'
= render "layouts/init_auto_complete"
Loading
Loading
@@ -11,10 +11,14 @@ feature 'Member autocomplete', :js do
sign_in(user)
end
 
shared_examples "open suggestions when typing @" do
shared_examples "open suggestions when typing @" do |resource_name|
before do
page.within('.new-note') do
find('#note_note').send_keys('@')
if resource_name == 'issue'
find('#note-body').send_keys('@')
else
find('#note_note').send_keys('@')
end
end
end
 
Loading
Loading
@@ -32,7 +36,7 @@ feature 'Member autocomplete', :js do
visit project_issue_path(project, noteable)
end
 
include_examples "open suggestions when typing @"
include_examples "open suggestions when typing @", 'issue'
end
 
context 'adding a new note on a Merge Request' do
Loading
Loading
@@ -45,7 +49,7 @@ feature 'Member autocomplete', :js do
visit project_merge_request_path(project, noteable)
end
 
include_examples "open suggestions when typing @"
include_examples "open suggestions when typing @", 'merge_request'
end
 
context 'adding a new note on a Commit' do
Loading
Loading
@@ -60,6 +64,6 @@ feature 'Member autocomplete', :js do
visit project_commit_path(project, noteable)
end
 
include_examples "open suggestions when typing @"
include_examples "open suggestions when typing @", 'commit'
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment