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
4e5bf7d6
Commit
4e5bf7d6
authored
Mar 14, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated specs to check that the token is correctly added
parent
b1d07760
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
app/assets/javascripts/boards/components/modal/filters.js
app/assets/javascripts/boards/components/modal/filters.js
+1
-2
spec/features/boards/modal_filter_spec.rb
spec/features/boards/modal_filter_spec.rb
+8
-1
No files found.
app/assets/javascripts/boards/components/modal/filters.js
View file @
4e5bf7d6
/* global Vue */
import
FilteredSearchBoards
from
'
../../filtered_search_boards
'
;
import
FilteredSearchBoards
from
'
../../filtered_search_boards
'
;
import
FilteredSearchContainer
from
'
../../../filtered_search/container
'
;
import
FilteredSearchContainer
from
'
../../../filtered_search/container
'
;
...
@@ -13,7 +12,7 @@ export default {
...
@@ -13,7 +12,7 @@ export default {
mounted
()
{
mounted
()
{
FilteredSearchContainer
.
container
=
this
.
$el
;
FilteredSearchContainer
.
container
=
this
.
$el
;
this
.
filteredSearch
=
new
FilteredSearchBoards
(
this
.
store
,
false
);
this
.
filteredSearch
=
new
FilteredSearchBoards
(
this
.
store
);
},
},
beforeDestroy
()
{
beforeDestroy
()
{
this
.
filteredSearch
.
cleanup
();
this
.
filteredSearch
.
cleanup
();
...
...
spec/features/boards/modal_filter_spec.rb
View file @
4e5bf7d6
...
@@ -91,6 +91,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
...
@@ -91,6 +91,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
page
.
within
(
'.add-issues-modal'
)
do
page
.
within
(
'.add-issues-modal'
)
do
wait_for_vue_resource
wait_for_vue_resource
expect
(
page
).
to
have_selector
(
'.js-visual-token'
,
text:
user2
.
username
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
1
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
1
)
end
end
end
end
...
@@ -113,6 +114,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
...
@@ -113,6 +114,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
page
.
within
(
'.add-issues-modal'
)
do
page
.
within
(
'.add-issues-modal'
)
do
wait_for_vue_resource
wait_for_vue_resource
expect
(
page
).
to
have_selector
(
'.js-visual-token'
,
text:
'none'
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
1
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
1
)
end
end
end
end
...
@@ -125,6 +127,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
...
@@ -125,6 +127,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
page
.
within
(
'.add-issues-modal'
)
do
page
.
within
(
'.add-issues-modal'
)
do
wait_for_vue_resource
wait_for_vue_resource
expect
(
page
).
to
have_selector
(
'.js-visual-token'
,
text:
user2
.
username
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
1
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
1
)
end
end
end
end
...
@@ -146,6 +149,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
...
@@ -146,6 +149,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
page
.
within
(
'.add-issues-modal'
)
do
page
.
within
(
'.add-issues-modal'
)
do
wait_for_vue_resource
wait_for_vue_resource
expect
(
page
).
to
have_selector
(
'.js-visual-token'
,
text:
'upcoming'
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
0
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
0
)
end
end
end
end
...
@@ -158,6 +162,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
...
@@ -158,6 +162,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
page
.
within
(
'.add-issues-modal'
)
do
page
.
within
(
'.add-issues-modal'
)
do
wait_for_vue_resource
wait_for_vue_resource
expect
(
page
).
to
have_selector
(
'.js-visual-token'
,
text:
milestone
.
name
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
1
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
1
)
end
end
end
end
...
@@ -179,18 +184,20 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
...
@@ -179,18 +184,20 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
page
.
within
(
'.add-issues-modal'
)
do
page
.
within
(
'.add-issues-modal'
)
do
wait_for_vue_resource
wait_for_vue_resource
expect
(
page
).
to
have_selector
(
'.js-visual-token'
,
text:
'none'
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
1
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
1
)
end
end
end
end
it
'filters by label'
do
it
'filters by label'
do
set_filter
(
'label'
)
set_filter
(
'label'
)
click_filter_link
(
'No Label'
)
click_filter_link
(
label
.
title
)
submit_filter
submit_filter
page
.
within
(
'.add-issues-modal'
)
do
page
.
within
(
'.add-issues-modal'
)
do
wait_for_vue_resource
wait_for_vue_resource
expect
(
page
).
to
have_selector
(
'.js-visual-token'
,
text:
label
.
title
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
1
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
1
)
end
end
end
end
...
...
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