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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
75e0ec0f
Commit
75e0ec0f
authored
Jun 06, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rspec
parent
d14acc3f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
13 deletions
+11
-13
spec/features/issues/filtered_search/filter_issues_spec.rb
spec/features/issues/filtered_search/filter_issues_spec.rb
+4
-4
spec/features/merge_requests/filter_merge_requests_spec.rb
spec/features/merge_requests/filter_merge_requests_spec.rb
+7
-9
No files found.
spec/features/issues/filtered_search/filter_issues_spec.rb
View file @
75e0ec0f
...
@@ -777,17 +777,17 @@ describe 'Filter issues', js: true, feature: true do
...
@@ -777,17 +777,17 @@ describe 'Filter issues', js: true, feature: true do
end
end
it
'open state'
do
it
'open state'
do
find
(
'.issues-state-filters
a'
,
text:
'C
losed'
).
click
find
(
'.issues-state-filters
.state-c
losed'
).
click
wait_for_requests
wait_for_requests
find
(
'.issues-state-filters
a'
,
text:
'Open
'
).
click
find
(
'.issues-state-filters
.state-opened
'
).
click
wait_for_requests
wait_for_requests
expect
(
page
).
to
have_selector
(
'.issues-list .issue'
,
count:
4
)
expect
(
page
).
to
have_selector
(
'.issues-list .issue'
,
count:
4
)
end
end
it
'closed state'
do
it
'closed state'
do
find
(
'.issues-state-filters
a'
,
text:
'C
losed'
).
click
find
(
'.issues-state-filters
.state-c
losed'
).
click
wait_for_requests
wait_for_requests
expect
(
page
).
to
have_selector
(
'.issues-list .issue'
,
count:
1
)
expect
(
page
).
to
have_selector
(
'.issues-list .issue'
,
count:
1
)
...
@@ -795,7 +795,7 @@ describe 'Filter issues', js: true, feature: true do
...
@@ -795,7 +795,7 @@ describe 'Filter issues', js: true, feature: true do
end
end
it
'all state'
do
it
'all state'
do
find
(
'.issues-state-filters
a'
,
text:
'A
ll'
).
click
find
(
'.issues-state-filters
.state-a
ll'
).
click
wait_for_requests
wait_for_requests
expect
(
page
).
to
have_selector
(
'.issues-list .issue'
,
count:
5
)
expect
(
page
).
to
have_selector
(
'.issues-list .issue'
,
count:
5
)
...
...
spec/features/merge_requests/filter_merge_requests_spec.rb
View file @
75e0ec0f
...
@@ -40,13 +40,13 @@ describe 'Filter merge requests', feature: true do
...
@@ -40,13 +40,13 @@ describe 'Filter merge requests', feature: true do
end
end
it
'does not change when closed link is clicked'
do
it
'does not change when closed link is clicked'
do
find
(
'.issues-state-filters
a'
,
text:
"Closed"
).
click
find
(
'.issues-state-filters
.state-closed'
).
click
expect_assignee_visual_tokens
()
expect_assignee_visual_tokens
()
end
end
it
'does not change when all link is clicked'
do
it
'does not change when all link is clicked'
do
find
(
'.issues-state-filters
a'
,
text:
"All"
).
click
find
(
'.issues-state-filters
.state-all'
).
click
expect_assignee_visual_tokens
()
expect_assignee_visual_tokens
()
end
end
...
@@ -73,13 +73,13 @@ describe 'Filter merge requests', feature: true do
...
@@ -73,13 +73,13 @@ describe 'Filter merge requests', feature: true do
end
end
it
'does not change when closed link is clicked'
do
it
'does not change when closed link is clicked'
do
find
(
'.issues-state-filters
a'
,
text:
"Closed"
).
click
find
(
'.issues-state-filters
.state-closed'
).
click
expect_milestone_visual_tokens
()
expect_milestone_visual_tokens
()
end
end
it
'does not change when all link is clicked'
do
it
'does not change when all link is clicked'
do
find
(
'.issues-state-filters
a'
,
text:
"All"
).
click
find
(
'.issues-state-filters
.state-all'
).
click
expect_milestone_visual_tokens
()
expect_milestone_visual_tokens
()
end
end
...
@@ -142,11 +142,9 @@ describe 'Filter merge requests', feature: true do
...
@@ -142,11 +142,9 @@ describe 'Filter merge requests', feature: true do
expect_tokens
([{
name:
'assignee'
,
value:
"@
#{
user
.
username
}
"
}])
expect_tokens
([{
name:
'assignee'
,
value:
"@
#{
user
.
username
}
"
}])
expect_filtered_search_input_empty
expect_filtered_search_input_empty
input_filtered_search_keys
(
"label:~
#{
label
.
title
}
"
)
input_filtered_search_keys
(
"label:~
#{
label
.
title
}
"
)
expect_mr_list_count
(
1
)
expect_mr_list_count
(
1
)
find
(
"#state-opened[href=
\"
#{
URI
.
parse
(
current_url
).
path
}
?assignee_username=
#{
user
.
username
}
&label_name%5B%5D=
#{
label
.
title
}
&scope=all&state=opened
\"
]"
)
end
end
context
'assignee and label'
,
js:
true
do
context
'assignee and label'
,
js:
true
do
...
@@ -163,13 +161,13 @@ describe 'Filter merge requests', feature: true do
...
@@ -163,13 +161,13 @@ describe 'Filter merge requests', feature: true do
end
end
it
'does not change when closed link is clicked'
do
it
'does not change when closed link is clicked'
do
find
(
'.issues-state-filters
a'
,
text:
"Closed"
).
click
find
(
'.issues-state-filters
.state-closed'
).
click
expect_assignee_label_visual_tokens
()
expect_assignee_label_visual_tokens
()
end
end
it
'does not change when all link is clicked'
do
it
'does not change when all link is clicked'
do
find
(
'.issues-state-filters
a'
,
text:
"All"
).
click
find
(
'.issues-state-filters
.state-all'
).
click
expect_assignee_label_visual_tokens
()
expect_assignee_label_visual_tokens
()
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