From eadcbe1ce98fe22542c3e7cae5cde3871f3ea266 Mon Sep 17 00:00:00 2001
From: Apurva Bakshi <bakshiapurva93@gmail.com>
Date: Fri, 6 Dec 2019 16:00:02 -0500
Subject: [PATCH 1/2] Add the data-Cy attribute for having better selector for
 tests

---
 .../Organization/OrganizationDetail/OrganizationDetail.jsx  | 6 +++++-
 .../src/screens/Project/ProjectDetail/ProjectDetail.jsx     | 6 +++++-
 awx/ui_next/src/screens/Team/TeamDetail/TeamDetail.jsx      | 6 +++++-
 awx/ui_next/src/screens/User/UserDetail/UserDetail.jsx      | 6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx b/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx
index f66b95be69..c21c8cd068 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx
@@ -79,7 +79,11 @@ class OrganizationDetail extends Component {
     return (
       <CardBody>
         <DetailList>
-          <Detail label={i18n._(t`Name`)} value={name} />
+          <Detail
+            label={i18n._(t`Name`)}
+            value={name}
+            dataCy="organization-detail-name"
+          />
           <Detail label={i18n._(t`Description`)} value={description} />
           <Detail label={i18n._(t`Max Hosts`)} value={`${max_hosts}`} />
           <Detail
diff --git a/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx b/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx
index 1c391f9b9f..25548e0a2e 100644
--- a/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx
+++ b/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx
@@ -91,7 +91,11 @@ function ProjectDetail({ project, i18n }) {
   return (
     <CardBody css="padding-top: 20px">
       <DetailList gutter="sm">
-        <Detail label={i18n._(t`Name`)} value={name} />
+        <Detail
+          label={i18n._(t`Name`)}
+          value={name}
+          dataCy="project-detail-name"
+        />
         <Detail label={i18n._(t`Description`)} value={description} />
         {summary_fields.organization && (
           <Detail
diff --git a/awx/ui_next/src/screens/Team/TeamDetail/TeamDetail.jsx b/awx/ui_next/src/screens/Team/TeamDetail/TeamDetail.jsx
index 9c71916a24..40dccd2758 100644
--- a/awx/ui_next/src/screens/Team/TeamDetail/TeamDetail.jsx
+++ b/awx/ui_next/src/screens/Team/TeamDetail/TeamDetail.jsx
@@ -23,7 +23,11 @@ class TeamDetail extends Component {
     return (
       <CardBody>
         <DetailList>
-          <Detail label={i18n._(t`Name`)} value={name} />
+          <Detail
+            label={i18n._(t`Name`)}
+            value={name}
+            dataCy="team-detail-name"
+          />
           <Detail label={i18n._(t`Description`)} value={description} />
           <Detail
             label={i18n._(t`Organization`)}
diff --git a/awx/ui_next/src/screens/User/UserDetail/UserDetail.jsx b/awx/ui_next/src/screens/User/UserDetail/UserDetail.jsx
index 71b4de6e99..36b363fdc8 100644
--- a/awx/ui_next/src/screens/User/UserDetail/UserDetail.jsx
+++ b/awx/ui_next/src/screens/User/UserDetail/UserDetail.jsx
@@ -42,7 +42,11 @@ class UserDetail extends Component {
     return (
       <CardBody>
         <DetailList>
-          <Detail label={i18n._(t`Username`)} value={username} />
+          <Detail
+            label={i18n._(t`Username`)}
+            value={username}
+            dataCy="user-detail-username"
+          />
           <Detail label={i18n._(t`Email`)} value={email} />
           <Detail label={i18n._(t`First Name`)} value={`${first_name}`} />
           <Detail label={i18n._(t`Last Name`)} value={`${last_name}`} />

From eddee456b33d1b8ce37c17c1ddf57107ed380ba3 Mon Sep 17 00:00:00 2001
From: Apurva Bakshi <bakshiapurva93@gmail.com>
Date: Wed, 27 Nov 2019 13:24:22 -0500
Subject: [PATCH 2/2] Add dataCy attribute to select-user-role and
 select-team-role buttons

---
 awx/ui_next/src/components/AddRole/AddResourceRole.jsx | 2 ++
 awx/ui_next/src/components/AddRole/SelectableCard.jsx  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/awx/ui_next/src/components/AddRole/AddResourceRole.jsx b/awx/ui_next/src/components/AddRole/AddResourceRole.jsx
index 3add8286c9..596b3bbe97 100644
--- a/awx/ui_next/src/components/AddRole/AddResourceRole.jsx
+++ b/awx/ui_next/src/components/AddRole/AddResourceRole.jsx
@@ -187,11 +187,13 @@ class AddResourceRole extends React.Component {
             <SelectableCard
               isSelected={selectedResource === 'users'}
               label={i18n._(t`Users`)}
+              dataCy="add-role-users"
               onClick={() => this.handleResourceSelect('users')}
             />
             <SelectableCard
               isSelected={selectedResource === 'teams'}
               label={i18n._(t`Teams`)}
+              dataCy="add-role-teams"
               onClick={() => this.handleResourceSelect('teams')}
             />
           </div>
diff --git a/awx/ui_next/src/components/AddRole/SelectableCard.jsx b/awx/ui_next/src/components/AddRole/SelectableCard.jsx
index cebc795a0e..475af3d2ce 100644
--- a/awx/ui_next/src/components/AddRole/SelectableCard.jsx
+++ b/awx/ui_next/src/components/AddRole/SelectableCard.jsx
@@ -33,7 +33,7 @@ const Label = styled.div`
 
 class SelectableCard extends Component {
   render() {
-    const { label, onClick, isSelected } = this.props;
+    const { label, onClick, isSelected, dataCy } = this.props;
 
     return (
       <SelectableItem
@@ -41,6 +41,7 @@ class SelectableCard extends Component {
         onKeyPress={onClick}
         role="button"
         tabIndex="0"
+        data-cy={dataCy}
         isSelected={isSelected}
       >
         <Indicator isSelected={isSelected} />