External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-15 11:50:42 -03:30
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts and failing test

Browse Source
This commit is contained in:
John Mitchell 2020-07-31 15:50:32 -04:00
parent 36585ad74e
commit ede1260675
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui_next/src/components/DataListToolbar/DataListToolbar.test.jsx
View File

@ -68,11 +68,12 @@ describe('<DataListToolbar />', () => {
test('dropdown items sortable/searchable columns work', () => {
const sortDropdownToggleSelector = 'button[id="awx-sort"]';
const searchDropdownToggleSelector = 'button[id="awx-search"]';
const searchDropdownToggleSelector =
'Select[aria-label="Simple key select"] SelectToggle';
const sortDropdownMenuItems =
'DropdownMenu > ul[aria-labelledby="awx-sort"]';
const searchDropdownMenuItems =
'DropdownMenu > ul[aria-labelledby="awx-search"]';
'Select[aria-label="Simple key select"] SelectOption';
const NEW_QS_CONFIG = {
namespace: 'organization',