summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-07-19 16:32:48 +0000
committerRobert Speicher <robert@gitlab.com>2017-07-19 16:32:48 +0000
commit606ed6d14d3f4ff15edf1b8d5143bfa6f160dcbc (patch)
treecfc9928023761941baac6bd8ab49ff94aa525b9b
parentf6ec2816794dc2708c34a96541082facd782573f (diff)
parentfc7c7cb954fb590afe8d6553308aa60945271ac0 (diff)
downloadgitlab-ce-606ed6d14d3f4ff15edf1b8d5143bfa6f160dcbc.tar.gz
Merge branch '31443-fix-transient-failure' into 'master'
Fix a broken spec Closes #31443 See merge request !12963
-rw-r--r--spec/features/merge_requests/filter_merge_requests_spec.rb12
1 files changed, 3 insertions, 9 deletions
diff --git a/spec/features/merge_requests/filter_merge_requests_spec.rb b/spec/features/merge_requests/filter_merge_requests_spec.rb
index 2a161b83aa0..e8085ec36aa 100644
--- a/spec/features/merge_requests/filter_merge_requests_spec.rb
+++ b/spec/features/merge_requests/filter_merge_requests_spec.rb
@@ -132,19 +132,13 @@ describe 'Filter merge requests', feature: true do
end
end
- describe 'for assignee and label from issues#index' do
+ describe 'for assignee and label from mr#index' do
let(:search_query) { "assignee:@#{user.username} label:~#{label.title}" }
before do
- input_filtered_search("assignee:@#{user.username}")
-
- expect_mr_list_count(1)
- expect_tokens([{ name: 'assignee', value: "@#{user.username}" }])
- expect_filtered_search_input_empty
-
- input_filtered_search_keys("label:~#{label.title}")
+ input_filtered_search(search_query)
- expect_mr_list_count(1)
+ expect_mr_list_count(0)
end
context 'assignee and label', js: true do