Skip to content

Commit d4dcfc2

Browse files
committed
CSS class updates for selenium tests
1 parent e5ca431 commit d4dcfc2

5 files changed

Lines changed: 25 additions & 21 deletions

File tree

EHR_App/test/src/org/labkey/test/pages/ReactAnimalHistoryPage.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -402,23 +402,23 @@ public class ElementCache extends LabKeyPage<ElementCache>.ElementCache
402402
public static class Locators
403403
{
404404
public static final Locator SEARCH_BY_ID_PANEL = Locator.css(".search-by-id-panel");
405-
public static final Locator ANIMAL_ID_TEXTAREA = Locator.css(".animal-id-input");
406-
public static final Locator SEARCH_BY_IDS_BUTTON = Locator.css(".search-button");
407-
public static final Locator SEARCH_BY_IDS_BUTTON_ACTIVE = Locator.css(".search-button.active");
408-
public static final Locator ALL_ANIMALS_BUTTON = Locator.css(".filter-button.all-animals");
409-
public static final Locator ALL_ANIMALS_BUTTON_ACTIVE = Locator.css(".filter-button.all-animals.active");
410-
public static final Locator ALIVE_AT_CENTER_BUTTON = Locator.css(".filter-button.alive-at-center");
411-
public static final Locator ALIVE_AT_CENTER_BUTTON_ACTIVE = Locator.css(".filter-button.alive-at-center.active");
412-
public static final Locator ALIVE_AT_CENTER_BUTTON_ENABLED = Locator.css(".filter-button.alive-at-center:not(:disabled)");
405+
public static final Locator ANIMAL_ID_TEXTAREA = Locator.css(".search-by-id-panel__input");
406+
public static final Locator SEARCH_BY_IDS_BUTTON = Locator.css(".search-by-id-panel__search-button");
407+
public static final Locator SEARCH_BY_IDS_BUTTON_ACTIVE = Locator.css(".search-by-id-panel__search-button--active");
408+
public static final Locator ALL_ANIMALS_BUTTON = Locator.css(".search-by-id-panel__filter-button--all-animals");
409+
public static final Locator ALL_ANIMALS_BUTTON_ACTIVE = Locator.css(".search-by-id-panel__filter-button--all-animals.search-by-id-panel__filter-button--active");
410+
public static final Locator ALIVE_AT_CENTER_BUTTON = Locator.css(".search-by-id-panel__filter-button--alive-at-center");
411+
public static final Locator ALIVE_AT_CENTER_BUTTON_ACTIVE = Locator.css(".search-by-id-panel__filter-button--alive-at-center.search-by-id-panel__filter-button--active");
412+
public static final Locator ALIVE_AT_CENTER_BUTTON_ENABLED = Locator.css(".search-by-id-panel__filter-button--alive-at-center:not(:disabled)");
413413
public static final Locator REPORT_TARGET = Locator.css(".tabbed-report-panel .report-target");
414414
public static final Locator ID_RESOLUTION_FEEDBACK = Locator.css(".id-resolution-feedback");
415-
public static final Locator RESOLVED_SECTION_TITLE = Locator.css(".id-resolution-feedback .section-title.resolved");
416-
public static final Locator NOT_FOUND_SECTION_TITLE = Locator.css(".id-resolution-feedback .section-title.not-found");
417-
public static final Locator RESOLVED_ITEMS = Locator.css(".id-resolution-feedback .section .items .resolved-item");
418-
public static final Locator NOT_FOUND_ITEMS = Locator.css(".id-resolution-feedback .section .items .not-found-item");
415+
public static final Locator RESOLVED_SECTION_TITLE = Locator.css(".id-resolution-feedback__section-title--resolved");
416+
public static final Locator NOT_FOUND_SECTION_TITLE = Locator.css(".id-resolution-feedback__section-title--not-found");
417+
public static final Locator RESOLVED_ITEMS = Locator.css(".id-resolution-feedback__item--resolved");
418+
public static final Locator NOT_FOUND_ITEMS = Locator.css(".id-resolution-feedback__item--not-found");
419419
public static final Locator CATEGORY_TAB = Locator.css(".tabbed-report-panel .category-tabs button");
420420
public static final Locator REPORT_TAB = Locator.css(".tabbed-report-panel .report-tabs button");
421-
public static final Locator VALIDATION_ERROR = Locator.css(".search-by-id-panel .validation-error");
422-
public static final Locator EMPTY_STATE_PLACEHOLDER = Locator.css(".tabbed-report-panel .empty-state-placeholder");
421+
public static final Locator VALIDATION_ERROR = Locator.css(".search-by-id-panel__validation-error");
422+
public static final Locator EMPTY_STATE_PLACEHOLDER = Locator.css(".tabbed-report-panel__empty-state");
423423
}
424424
}

labkey-ui-ehr/src/ParticipantHistory/SearchByIdPanel/SearchByIdPanel.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,14 @@ const SearchByIdPanelComponent: FC<SearchByIdPanelProps> = ({
196196
Search By Ids
197197
</button>
198198
<button
199-
className={classNames('search-by-id-panel__filter-button', {
200-
'search-by-id-panel__filter-button--active': filterType === FILTER_TYPE_ALL,
201-
'search-by-id-panel__filter-button--inactive': filterType !== FILTER_TYPE_ALL,
202-
})}
199+
className={classNames(
200+
'search-by-id-panel__filter-button',
201+
'search-by-id-panel__filter-button--all-animals',
202+
{
203+
'search-by-id-panel__filter-button--active': filterType === FILTER_TYPE_ALL,
204+
'search-by-id-panel__filter-button--inactive': filterType !== FILTER_TYPE_ALL,
205+
}
206+
)}
203207
onClick={() => handleFilterModeChange(FILTER_TYPE_ALL)}
204208
>
205209
All Animals

labkey-ui-ehr/src/ParticipantHistory/TabbedReportPanel/JSReportWrapper.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ const JSReportWrapperComponent: FC<JSReportWrapperProps> = ({ report, filters })
219219
};
220220
}, [tab, report]);
221221

222-
return <div className="js-report-wrapper__target" ref={targetRef} />;
222+
return <div className="js-report-wrapper__target report-target" ref={targetRef} />;
223223
};
224224

225225
JSReportWrapperComponent.displayName = 'JSReportWrapper';

labkey-ui-ehr/src/ParticipantHistory/TabbedReportPanel/OtherReportWrapper.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ const OtherReportWrapperComponent: FC<OtherReportWrapperProps> = ({ report, filt
8989

9090
return (
9191
<>
92-
<div className="other-report-wrapper__target" ref={targetRef} />
92+
<div className="other-report-wrapper__target report-target" ref={targetRef} />
9393
<div className="other-report-wrapper__content" id={targetId} ref={otherReportRef} />
9494
</>
9595
);

labkey-ui-ehr/src/ParticipantHistory/TabbedReportPanel/QueryReportWrapper.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const QueryReportWrapperComponent: FC<QueryReportWrapperProps> = ({ report, filt
5050
};
5151
}, [tab, report]);
5252

53-
return <div className="query-report-wrapper__target" ref={targetRef} />;
53+
return <div className="query-report-wrapper__target report-target" ref={targetRef} />;
5454
};
5555

5656
QueryReportWrapperComponent.displayName = 'QueryReportWrapper';

0 commit comments

Comments
 (0)