diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-19 15:30:57 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-19 15:30:57 +0000 |
| commit | abdbe370a0cdef03ccb9d5be923436ba513b956c (patch) | |
| tree | 62e7cfccc001f6c2f9134bb183f5f5777145549c | |
| parent | 9092e96abc165ccd76d5b54fcd507c8c989b99ec (diff) | |
| parent | a1d0a16bfbef8654684bca828505632bcfaaaeba (diff) | |
| download | gitlab-ce-abdbe370a0cdef03ccb9d5be923436ba513b956c.tar.gz | |
Merge branch 'fix-flakey-groups-filter-list-specs' into 'master'
Fix flakey time-senstive group filter specs
See merge request gitlab-org/gitlab-ce!19880
| -rw-r--r-- | spec/features/dashboard/groups_list_spec.rb | 4 | ||||
| -rw-r--r-- | spec/features/explore/groups_list_spec.rb | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/spec/features/dashboard/groups_list_spec.rb b/spec/features/dashboard/groups_list_spec.rb index ed47f7ed390..29280bd6e06 100644 --- a/spec/features/dashboard/groups_list_spec.rb +++ b/spec/features/dashboard/groups_list_spec.rb @@ -65,7 +65,11 @@ feature 'Dashboard Groups page', :js do fill_in 'filter', with: group.name wait_for_requests + expect(page).to have_content(group.name) + expect(page).not_to have_content(nested_group.parent.name) + fill_in 'filter', with: '' + page.find('[name="filter"]').send_keys(:enter) wait_for_requests expect(page).to have_content(group.name) diff --git a/spec/features/explore/groups_list_spec.rb b/spec/features/explore/groups_list_spec.rb index 801a33979ff..ad02b454aee 100644 --- a/spec/features/explore/groups_list_spec.rb +++ b/spec/features/explore/groups_list_spec.rb @@ -35,7 +35,11 @@ describe 'Explore Groups page', :js do fill_in 'filter', with: group.name wait_for_requests + expect(page).to have_content(group.full_name) + expect(page).not_to have_content(public_group.full_name) + fill_in 'filter', with: "" + page.find('[name="filter"]').send_keys(:enter) wait_for_requests expect(page).to have_content(group.full_name) |