Commit f86ac8f5 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'enable-autocomplete-on-project-snippets' into 'master'

Enable autocomplete on project snippets

Closes #33911

See merge request !12286
parents 6ac777a7 a7750f1b
...@@ -226,6 +226,8 @@ import initSettingsPanels from './settings_panels'; ...@@ -226,6 +226,8 @@ import initSettingsPanels from './settings_panels';
case 'projects:snippets:edit': case 'projects:snippets:edit':
case 'projects:snippets:create': case 'projects:snippets:create':
case 'projects:snippets:update': case 'projects:snippets:update':
new gl.GLForm($('.snippet-form'), true);
break;
case 'snippets:new': case 'snippets:new':
case 'snippets:edit': case 'snippets:edit':
case 'snippets:create': case 'snippets:create':
......
...@@ -9,4 +9,4 @@ ...@@ -9,4 +9,4 @@
.row-content-block.top-block.content-component-block .row-content-block.top-block.content-component-block
= render 'award_emoji/awards_block', awardable: @snippet, inline: true = render 'award_emoji/awards_block', awardable: @snippet, inline: true
#notes= render "shared/notes/notes_with_form", :autocomplete => false #notes= render "shared/notes/notes_with_form", :autocomplete => true
...@@ -33,20 +33,11 @@ describe 'Project snippets', :js, feature: true do ...@@ -33,20 +33,11 @@ describe 'Project snippets', :js, feature: true do
visit namespace_project_snippet_path(project.namespace, project, snippets[0]) visit namespace_project_snippet_path(project.namespace, project, snippets[0])
end end
it 'should not have autocomplete' do it 'should have autocomplete' do
wait_for_requests
request_count_before = page.driver.network_traffic.count
find('#note_note').native.send_keys('') find('#note_note').native.send_keys('')
fill_in 'note[note]', with: '@' fill_in 'note[note]', with: '@'
wait_for_requests expect(page).to have_selector('.atwho-view')
request_count_after = page.driver.network_traffic.count
# This selector probably won't be in place even if autocomplete was enabled
# but we want to make sure
expect(page).not_to have_selector('.atwho-view')
expect(request_count_before).to eq(request_count_after)
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment