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
3566b5b0
Commit
3566b5b0
authored
Sep 14, 2018
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve remaining conflicts in frontend specs for runner view change
parent
dc514da2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
32 deletions
+0
-32
spec/javascripts/filtered_search/dropdown_user_spec.js
spec/javascripts/filtered_search/dropdown_user_spec.js
+0
-8
spec/javascripts/filtered_search/dropdown_utils_spec.js
spec/javascripts/filtered_search/dropdown_utils_spec.js
+0
-8
spec/javascripts/filtered_search/filtered_search_manager_spec.js
...vascripts/filtered_search/filtered_search_manager_spec.js
+0
-8
spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js
...scripts/filtered_search/filtered_search_tokenizer_spec.js
+0
-8
No files found.
spec/javascripts/filtered_search/dropdown_user_spec.js
View file @
3566b5b0
import
DropdownUtils
from
'
~/filtered_search/dropdown_utils
'
;
import
DropdownUser
from
'
~/filtered_search/dropdown_user
'
;
import
FilteredSearchTokenizer
from
'
~/filtered_search/filtered_search_tokenizer
'
;
<<<<<<<
HEAD
import
IssuesFilteredSearchTokenKeys
from
'
~/filtered_search/issues_filtered_search_token_keys
'
;
=======
import
IssuableFilteredTokenKeys
from
'
~/filtered_search/issuable_filtered_search_token_keys
'
;
>>>>>>>
upstream
/
master
describe
(
'
Dropdown User
'
,
()
=>
{
describe
(
'
getSearchInput
'
,
()
=>
{
...
...
@@ -18,11 +14,7 @@ describe('Dropdown User', () => {
spyOn
(
DropdownUtils
,
'
getSearchInput
'
).
and
.
callFake
(()
=>
{});
dropdownUser
=
new
DropdownUser
({
<<<<<<<
HEAD
tokenKeys
:
IssuesFilteredSearchTokenKeys
,
=======
tokenKeys
:
IssuableFilteredTokenKeys
,
>>>>>>>
upstream
/
master
});
});
...
...
spec/javascripts/filtered_search/dropdown_utils_spec.js
View file @
3566b5b0
import
DropdownUtils
from
'
~/filtered_search/dropdown_utils
'
;
import
FilteredSearchDropdownManager
from
'
~/filtered_search/filtered_search_dropdown_manager
'
;
<<<<<<<
HEAD
import
IssuesFilteredSearchTokenKeys
from
'
~/filtered_search/issues_filtered_search_token_keys
'
;
=======
import
IssuableFilteredSearchTokenKeys
from
'
~/filtered_search/issuable_filtered_search_token_keys
'
;
>>>>>>>
upstream
/
master
import
FilteredSearchSpecHelper
from
'
../helpers/filtered_search_spec_helper
'
;
describe
(
'
Dropdown Utils
'
,
()
=>
{
...
...
@@ -141,11 +137,7 @@ describe('Dropdown Utils', () => {
`
);
input
=
document
.
getElementById
(
'
test
'
);
<<<<<<<
HEAD
allowedKeys
=
IssuesFilteredSearchTokenKeys
.
getKeys
();
=======
allowedKeys
=
IssuableFilteredSearchTokenKeys
.
getKeys
();
>>>>>>>
upstream
/
master
});
function
config
()
{
...
...
spec/javascripts/filtered_search/filtered_search_manager_spec.js
View file @
3566b5b0
import
RecentSearchesService
from
'
~/filtered_search/services/recent_searches_service
'
;
import
RecentSearchesServiceError
from
'
~/filtered_search/services/recent_searches_service_error
'
;
import
RecentSearchesRoot
from
'
~/filtered_search/recent_searches_root
'
;
<<<<<<<
HEAD
import
IssuesFilteredSearchTokenKeys
from
'
~/filtered_search/issues_filtered_search_token_keys
'
;
=======
import
IssuableFilteredSearchTokenKeys
from
'
~/filtered_search/issuable_filtered_search_token_keys
'
;
>>>>>>>
upstream
/
master
import
'
~/lib/utils/common_utils
'
;
import
DropdownUtils
from
'
~/filtered_search/dropdown_utils
'
;
import
FilteredSearchVisualTokens
from
'
~/filtered_search/filtered_search_visual_tokens
'
;
...
...
@@ -90,11 +86,7 @@ describe('Filtered Search Manager', function () {
expect
(
RecentSearchesService
.
isAvailable
).
toHaveBeenCalled
();
expect
(
RecentSearchesStoreSpy
).
toHaveBeenCalledWith
({
isLocalStorageAvailable
,
<<<<<<<
HEAD
allowedKeys
:
IssuesFilteredSearchTokenKeys
.
getKeys
(),
=======
allowedKeys
:
IssuableFilteredSearchTokenKeys
.
getKeys
(),
>>>>>>>
upstream
/
master
});
});
});
...
...
spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js
View file @
3566b5b0
<<<<<<<
HEAD
import
IssuesFilteredSearchTokenKeys
from
'
~/filtered_search/issues_filtered_search_token_keys
'
;
import
FilteredSearchTokenizer
from
'
~/filtered_search/filtered_search_tokenizer
'
;
describe
(
'
Filtered Search Tokenizer
'
,
()
=>
{
const
allowedKeys
=
IssuesFilteredSearchTokenKeys
.
getKeys
();
=======
import
IssuableFilteredSearchTokenKeys
from
'
~/filtered_search/issuable_filtered_search_token_keys
'
;
import
FilteredSearchTokenizer
from
'
~/filtered_search/filtered_search_tokenizer
'
;
describe
(
'
Filtered Search Tokenizer
'
,
()
=>
{
const
allowedKeys
=
IssuableFilteredSearchTokenKeys
.
getKeys
();
>>>>>>>
upstream
/
master
describe
(
'
processTokens
'
,
()
=>
{
it
(
'
returns for input containing only search value
'
,
()
=>
{
...
...
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