Commit a9f85d11 authored by Luke "Jared" Bennett's avatar Luke "Jared" Bennett

Fix space issue and add test

parent 09b622f8
...@@ -112,7 +112,6 @@ ...@@ -112,7 +112,6 @@
return value.path != null ? this.Emoji.template : this.Loading.template; return value.path != null ? this.Emoji.template : this.Loading.template;
}.bind(this), }.bind(this),
insertTpl: ':${name}:', insertTpl: ':${name}:',
startWithSpace: false,
skipSpecialCharacterTest: true, skipSpecialCharacterTest: true,
data: this.defaultLoadingData, data: this.defaultLoadingData,
callbacks: { callbacks: {
...@@ -129,7 +128,6 @@ ...@@ -129,7 +128,6 @@
}.bind(this), }.bind(this),
insertTpl: '${atwho-at}${username}', insertTpl: '${atwho-at}${username}',
searchKey: 'search', searchKey: 'search',
startWithSpace: false,
alwaysHighlightFirst: true, alwaysHighlightFirst: true,
skipSpecialCharacterTest: true, skipSpecialCharacterTest: true,
data: this.defaultLoadingData, data: this.defaultLoadingData,
...@@ -172,7 +170,6 @@ ...@@ -172,7 +170,6 @@
}.bind(this), }.bind(this),
data: this.defaultLoadingData, data: this.defaultLoadingData,
insertTpl: '${atwho-at}${id}', insertTpl: '${atwho-at}${id}',
startWithSpace: false,
callbacks: { callbacks: {
sorter: this.DefaultOptions.sorter, sorter: this.DefaultOptions.sorter,
filter: this.DefaultOptions.filter, filter: this.DefaultOptions.filter,
...@@ -200,7 +197,6 @@ ...@@ -200,7 +197,6 @@
displayTpl: function(value) { displayTpl: function(value) {
return value.title != null ? this.Milestones.template : this.Loading.template; return value.title != null ? this.Milestones.template : this.Loading.template;
}.bind(this), }.bind(this),
startWithSpace: false,
data: this.defaultLoadingData, data: this.defaultLoadingData,
callbacks: { callbacks: {
matcher: this.DefaultOptions.matcher, matcher: this.DefaultOptions.matcher,
...@@ -225,7 +221,6 @@ ...@@ -225,7 +221,6 @@
at: '!', at: '!',
alias: 'mergerequests', alias: 'mergerequests',
searchKey: 'search', searchKey: 'search',
startWithSpace: false,
displayTpl: function(value) { displayTpl: function(value) {
return value.title != null ? this.Issues.template : this.Loading.template; return value.title != null ? this.Issues.template : this.Loading.template;
}.bind(this), }.bind(this),
...@@ -259,7 +254,6 @@ ...@@ -259,7 +254,6 @@
return this.isLoading(value) ? this.Loading.template : this.Labels.template; return this.isLoading(value) ? this.Loading.template : this.Labels.template;
}.bind(this), }.bind(this),
insertTpl: '${atwho-at}${title}', insertTpl: '${atwho-at}${title}',
startWithSpace: false,
callbacks: { callbacks: {
matcher: this.DefaultOptions.matcher, matcher: this.DefaultOptions.matcher,
sorter: this.DefaultOptions.sorter, sorter: this.DefaultOptions.sorter,
......
...@@ -39,7 +39,6 @@ feature 'GFM autocomplete', feature: true, js: true do ...@@ -39,7 +39,6 @@ feature 'GFM autocomplete', feature: true, js: true do
page.within '.timeline-content-form' do page.within '.timeline-content-form' do
note.native.send_keys('') note.native.send_keys('')
note.native.send_keys("~#{label.title[0]}") note.native.send_keys("~#{label.title[0]}")
sleep 1
note.click note.click
end end
...@@ -53,7 +52,6 @@ feature 'GFM autocomplete', feature: true, js: true do ...@@ -53,7 +52,6 @@ feature 'GFM autocomplete', feature: true, js: true do
page.within '.timeline-content-form' do page.within '.timeline-content-form' do
note.native.send_keys('') note.native.send_keys('')
note.native.send_keys("@#{user.username[0]}") note.native.send_keys("@#{user.username[0]}")
sleep 1
note.click note.click
end end
...@@ -67,7 +65,6 @@ feature 'GFM autocomplete', feature: true, js: true do ...@@ -67,7 +65,6 @@ feature 'GFM autocomplete', feature: true, js: true do
page.within '.timeline-content-form' do page.within '.timeline-content-form' do
note.native.send_keys('') note.native.send_keys('')
note.native.send_keys(":cartwheel") note.native.send_keys(":cartwheel")
sleep 1
note.click note.click
end end
...@@ -76,6 +73,22 @@ feature 'GFM autocomplete', feature: true, js: true do ...@@ -76,6 +73,22 @@ feature 'GFM autocomplete', feature: true, js: true do
expect_to_wrap(false, emoji_item, note, 'cartwheel_tone1') expect_to_wrap(false, emoji_item, note, 'cartwheel_tone1')
end end
it 'doesn\'t open autocomplete after non-word character' do
page.within '.timeline-content-form' do
find('#note_note').native.send_keys("@#{user.username[0..2]}!")
end
expect(page).not_to have_selector('.atwho-view')
end
it 'doesn\'t open autocomplete if there is no space before' do
page.within '.timeline-content-form' do
find('#note_note').native.send_keys("hello:#{user.username[0..2]}")
end
expect(page).not_to have_selector('.atwho-view')
end
def expect_to_wrap(should_wrap, item, note, value) def expect_to_wrap(should_wrap, item, note, value)
expect(item).to have_content(value) expect(item).to have_content(value)
expect(item).not_to have_content("\"#{value}\"") expect(item).not_to have_content("\"#{value}\"")
...@@ -89,12 +102,4 @@ feature 'GFM autocomplete', feature: true, js: true do ...@@ -89,12 +102,4 @@ feature 'GFM autocomplete', feature: true, js: true do
end end
end end
end end
it 'doesnt open autocomplete after non-word character' do
page.within '.timeline-content-form' do
find('#note_note').native.send_keys("@#{user.username[0..2]}!")
end
expect(page).not_to have_selector('.atwho-view')
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