Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
12753def
Commit
12753def
authored
Dec 18, 2016
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specs
parent
f72c1bf1
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
62 deletions
+36
-62
app/assets/javascripts/dispatcher.js.es6
app/assets/javascripts/dispatcher.js.es6
+1
-1
app/assets/javascripts/filtered_search/dropdown_utils.js.es6
app/assets/javascripts/filtered_search/dropdown_utils.js.es6
+1
-1
spec/features/issues/filtered_search/dropdown_author_spec.rb
spec/features/issues/filtered_search/dropdown_author_spec.rb
+4
-9
spec/features/issues/filtered_search/dropdown_label_spec.rb
spec/features/issues/filtered_search/dropdown_label_spec.rb
+23
-17
spec/features/issues/filtered_search/dropdown_milestone_spec.rb
...eatures/issues/filtered_search/dropdown_milestone_spec.rb
+7
-32
spec/javascripts/filtered_search/filtered_search_dropdown_manager_spec.js.es6
...tered_search/filtered_search_dropdown_manager_spec.js.es6
+0
-2
No files found.
app/assets/javascripts/dispatcher.js.es6
View file @
12753def
...
...
@@ -84,7 +84,7 @@
break;
case 'projects:merge_requests:index':
case 'projects:issues:index':
if(document.querySelector('.filtered-search') && gl.FilteredSearchManager) {
if
(document.querySelector('.filtered-search') && gl.FilteredSearchManager) {
new gl.FilteredSearchManager();
}
Issuable.init();
...
...
app/assets/javascripts/filtered_search/dropdown_utils.js.es6
View file @
12753def
...
...
@@ -43,7 +43,7 @@
static filterHint(item, query) {
const updatedItem = item;
let { lastToken } = gl.FilteredSearchTokenizer.processTokens(query);
lastToken = lastToken || '';
lastToken = lastToken
.key || lastToken
|| '';
if (!lastToken || query.split('').last() === ' ') {
updatedItem.droplab_hidden = false;
...
...
spec/features/issues/filtered_search/dropdown_author_spec.rb
View file @
12753def
...
...
@@ -70,13 +70,13 @@ describe 'Dropdown author', js: true, feature: true do
end
it
'filters by name'
do
send_keys_to_filtered_search
(
'j'
)
expect
(
dropdown_author_size
).
to
eq
(
2
)
send_keys_to_filtered_search
(
'j
a
'
)
expect
(
dropdown_author_size
).
to
eq
(
1
)
end
it
'filters by case insensitive name'
do
send_keys_to_filtered_search
(
'J'
)
expect
(
dropdown_author_size
).
to
eq
(
2
)
send_keys_to_filtered_search
(
'J
a
'
)
expect
(
dropdown_author_size
).
to
eq
(
1
)
end
it
'filters by username with symbol'
do
...
...
@@ -84,11 +84,6 @@ describe 'Dropdown author', js: true, feature: true do
expect
(
dropdown_author_size
).
to
eq
(
2
)
end
it
'filters by case insensitive username with symbol'
do
send_keys_to_filtered_search
(
'@OT'
)
expect
(
dropdown_author_size
).
to
eq
(
2
)
end
it
'filters by username without symbol'
do
send_keys_to_filtered_search
(
'ot'
)
expect
(
dropdown_author_size
).
to
eq
(
2
)
...
...
spec/features/issues/filtered_search/dropdown_label_spec.rb
View file @
12753def
...
...
@@ -9,6 +9,7 @@ describe 'Dropdown label', js: true, feature: true do
let!
(
:uppercase_label
)
{
create
(
:label
,
project:
project
,
title:
'BUG'
)
}
let!
(
:two_words_label
)
{
create
(
:label
,
project:
project
,
title:
'High Priority'
)
}
let!
(
:wont_fix_label
)
{
create
(
:label
,
project:
project
,
title:
'Won"t Fix'
)
}
let!
(
:wont_fix_single_label
)
{
create
(
:label
,
project:
project
,
title:
'Won\'t Fix'
)
}
let!
(
:special_label
)
{
create
(
:label
,
project:
project
,
title:
'!@#$%^+&*()'
)}
let!
(
:long_label
)
{
create
(
:label
,
project:
project
,
title:
'this is a very long title this is a very long title this is a very long title this is a very long title this is a very long title'
)}
let
(
:filtered_search
)
{
find
(
'.filtered-search'
)
}
...
...
@@ -68,61 +69,66 @@ describe 'Dropdown label', js: true, feature: true do
describe
'filtering'
do
before
do
filtered_search
.
set
(
'label
:
'
)
filtered_search
.
set
(
'label'
)
end
it
'filters by name'
do
send_keys_to_filtered_search
(
'b'
)
send_keys_to_filtered_search
(
'
:
b'
)
expect
(
dropdown_label_size
).
to
eq
(
2
)
end
it
'filters by case insensitive name'
do
send_keys_to_filtered_search
(
'B'
)
send_keys_to_filtered_search
(
'
:
B'
)
expect
(
dropdown_label_size
).
to
eq
(
2
)
end
it
'filters by name with symbol'
do
send_keys_to_filtered_search
(
'~bu'
)
send_keys_to_filtered_search
(
'
:
~bu'
)
expect
(
dropdown_label_size
).
to
eq
(
2
)
end
it
'filters by case insensitive name with symbol'
do
send_keys_to_filtered_search
(
'~BU'
)
send_keys_to_filtered_search
(
'
:
~BU'
)
expect
(
dropdown_label_size
).
to
eq
(
2
)
end
it
'filters by multiple names using double quotes'
do
send_keys_to_filtered_search
(
'"High P'
)
it
'filters by multiple words'
do
send_keys_to_filtered_search
(
':Hig'
)
expect
(
dropdown_label_size
).
to
eq
(
1
)
end
it
'filters by multiple words with symbol'
do
send_keys_to_filtered_search
(
':~Hig'
)
expect
(
dropdown_label_size
).
to
eq
(
1
)
end
it
'filters by multiple
names us
ing single quotes'
do
send_keys_to_filtered_search
(
'
\'High P
'
)
it
'filters by multiple
words contain
ing single quotes'
do
send_keys_to_filtered_search
(
'
:won\'t
'
)
expect
(
dropdown_label_size
).
to
eq
(
1
)
end
it
'filters by multiple
names using single and double quotes
'
do
send_keys_to_filtered_search
(
'
~"won`\'t f
'
)
it
'filters by multiple
words containing single quotes with symbol
'
do
send_keys_to_filtered_search
(
'
:~won\'t
'
)
expect
(
dropdown_label_size
).
to
eq
(
1
)
end
it
'filters by multiple
names using double quotes with symbol
'
do
send_keys_to_filtered_search
(
'
~"High P
'
)
it
'filters by multiple
words containing double quotes
'
do
send_keys_to_filtered_search
(
'
:won"t
'
)
expect
(
dropdown_label_size
).
to
eq
(
1
)
end
it
'filters by multiple
names using sing
le quotes with symbol'
do
send_keys_to_filtered_search
(
'
~\'High P
'
)
it
'filters by multiple
words containing doub
le quotes with symbol'
do
send_keys_to_filtered_search
(
'
:~won"t
'
)
expect
(
dropdown_label_size
).
to
eq
(
1
)
end
it
'filters by special characters'
do
send_keys_to_filtered_search
(
'^+'
)
send_keys_to_filtered_search
(
'
:
^+'
)
expect
(
dropdown_label_size
).
to
eq
(
1
)
end
it
'filters by special characters with symbol'
do
send_keys_to_filtered_search
(
'~^+'
)
send_keys_to_filtered_search
(
'
:
~^+'
)
expect
(
dropdown_label_size
).
to
eq
(
1
)
end
end
...
...
spec/features/issues/filtered_search/dropdown_milestone_spec.rb
View file @
12753def
...
...
@@ -73,61 +73,36 @@ describe 'Dropdown milestone', js: true, feature: true do
describe
'filtering'
do
before
do
filtered_search
.
set
(
'milestone
:
'
)
filtered_search
.
set
(
'milestone'
)
end
it
'filters by name'
do
send_keys_to_filtered_search
(
'v1'
)
send_keys_to_filtered_search
(
'
:
v1'
)
expect
(
dropdown_milestone_size
).
to
eq
(
1
)
end
it
'filters by case insensitive name'
do
send_keys_to_filtered_search
(
'V1'
)
send_keys_to_filtered_search
(
'
:
V1'
)
expect
(
dropdown_milestone_size
).
to
eq
(
1
)
end
it
'filters by name with symbol'
do
send_keys_to_filtered_search
(
'%v1'
)
send_keys_to_filtered_search
(
'
:
%v1'
)
expect
(
dropdown_milestone_size
).
to
eq
(
1
)
end
it
'filters by case insensitive name with symbol'
do
send_keys_to_filtered_search
(
'%V1'
)
expect
(
dropdown_milestone_size
).
to
eq
(
1
)
end
it
'filters by multiple names using double quotes'
do
send_keys_to_filtered_search
(
'"future'
)
expect
(
dropdown_milestone_size
).
to
eq
(
1
)
end
it
'filters by multiple names using single quotes'
do
send_keys_to_filtered_search
(
'\'future p'
)
expect
(
dropdown_milestone_size
).
to
eq
(
1
)
end
it
'filters by multiple names using single and double quotes'
do
send_keys_to_filtered_search
(
'%"won`\'t f'
)
expect
(
dropdown_milestone_size
).
to
eq
(
1
)
end
it
'filters by multiple names using double quotes with symbol'
do
send_keys_to_filtered_search
(
'%"future p'
)
expect
(
dropdown_milestone_size
).
to
eq
(
1
)
end
it
'filters by multiple names using single quotes with symbol'
do
send_keys_to_filtered_search
(
'%\'future p'
)
send_keys_to_filtered_search
(
':%V1'
)
expect
(
dropdown_milestone_size
).
to
eq
(
1
)
end
it
'filters by special characters'
do
send_keys_to_filtered_search
(
'
^
+'
)
send_keys_to_filtered_search
(
'
:(
+'
)
expect
(
dropdown_milestone_size
).
to
eq
(
1
)
end
it
'filters by special characters with symbol'
do
send_keys_to_filtered_search
(
'
~^
+'
)
send_keys_to_filtered_search
(
'
:%(
+'
)
expect
(
dropdown_milestone_size
).
to
eq
(
1
)
end
end
...
...
spec/javascripts/filtered_search/filtered_search_dropdown_manager_spec.js.es6
View file @
12753def
...
...
@@ -12,8 +12,6 @@
const input = document.createElement('input');
input.classList.add('filtered-search');
document.body.appendChild(input);
expect(input.value).toBe('');
});
afterEach(() => {
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment