diff options
author | Robert Speicher <robert@gitlab.com> | 2017-07-19 16:32:48 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-07-20 17:04:18 -0500 |
commit | a11cb157f8ae5e800b5119172b06742ab382ada1 (patch) | |
tree | f0c8718109d3b3c566c7bb504cbd331b01529d76 | |
parent | 7d8d265166e94142ce8cf92afdba8fe0298eb18b (diff) | |
download | gitlab-ce-a11cb157f8ae5e800b5119172b06742ab382ada1.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.rb | 12 |
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 |