Browse Source

ref(tests): Rename data test ID (#14661)

* (ref) Change data test ID (and make linter happy)
Colleen O'Rourke 5 years ago
parent
commit
1013cd525a

+ 6 - 6
src/sentry/static/sentry/app/components/confirm.jsx

@@ -66,10 +66,10 @@ class Confirm extends React.PureComponent {
       onConfirming();
     }
 
-    this.setState(state => ({
+    this.setState({
       isModalOpen: true,
       disableConfirmButton,
-    }));
+    });
 
     // always reset `confirming` when modal visibility changes
     this.confirming = false;
@@ -80,16 +80,16 @@ class Confirm extends React.PureComponent {
     if (typeof onCancel === 'function') {
       onCancel();
     }
-    this.setState(state => ({
+    this.setState({
       isModalOpen: false,
       disableConfirmButton,
-    }));
+    });
 
     // always reset `confirming` when modal visibility changes
     this.confirming = false;
   };
 
-  handleConfirm = e => {
+  handleConfirm = () => {
     // `confirming` is used to make sure `onConfirm` is only called once
     if (!this.confirming) {
       this.props.onConfirm();
@@ -173,7 +173,7 @@ class Confirm extends React.PureComponent {
               {cancelText}
             </Button>
             <Button
-              data-test-id="confirm-modal"
+              data-test-id="confirm-button"
               disabled={this.state.disableConfirmButton}
               priority={priority}
               onClick={this.handleConfirm}

+ 1 - 1
tests/acceptance/page_objects/issue_list.py

@@ -20,7 +20,7 @@ class IssueListPage(BasePage):
 
     def resolve_issues(self):
         self.browser.click('[aria-label="Resolve"]')
-        self.browser.click('[data-test-id="confirm-modal"]')
+        self.browser.click('[data-test-id="confirm-button"]')
 
     def wait_for_resolved_issue(self):
         self.browser.wait_until('[data-test-id="resolved-issue"]')

+ 1 - 1
tests/acceptance/test_organization_settings.py

@@ -58,7 +58,7 @@ class OrganizationSettingsTest(AcceptanceTestCase):
         self.browser.click("#require2FA")
 
         self.browser.wait_until(".modal")
-        self.browser.click('.modal [data-test-id="confirm-modal"]')
+        self.browser.click('.modal [data-test-id="confirm-button"]')
         self.browser.wait_until_not(".modal")
         self.browser.wait_until_test_id("toast-error")
         self.load_organization_helper("setting 2fa without 2fa enabled")

+ 2 - 2
tests/acceptance/test_project_tags_settings.py

@@ -37,8 +37,8 @@ class ProjectTagsSettingsTest(AcceptanceTestCase, SnubaTestCase):
 
         self.browser.wait_until(".ref-tag-row")
         self.browser.click('.ref-tag-row [data-test-id="delete"]')
-        self.browser.wait_until('.modal-footer [data-test-id="confirm-modal"]')
+        self.browser.wait_until('.modal-footer [data-test-id="confirm-button"]')
 
-        self.browser.click('.modal-footer [data-test-id="confirm-modal"]')
+        self.browser.click('.modal-footer [data-test-id="confirm-button"]')
         self.browser.wait_until_not(".ref-tag-row")
         self.browser.snapshot("project settings - tags - after remove")

+ 1 - 1
tests/js/spec/components/__snapshots__/confirm.spec.jsx.snap

@@ -59,7 +59,7 @@ exports[`Confirm renders 1`] = `
       <Button
         align="center"
         autoFocus={true}
-        data-test-id="confirm-modal"
+        data-test-id="confirm-button"
         disabled={false}
         onClick={[Function]}
         priority="primary"

+ 4 - 4
tests/js/spec/components/__snapshots__/confirmDelete.spec.jsx.snap

@@ -305,7 +305,7 @@ exports[`ConfirmDelete renders 1`] = `
           <Button
             align="center"
             autoFocus={true}
-            data-test-id="confirm-modal"
+            data-test-id="confirm-button"
             disabled={true}
             onClick={[Function]}
             priority="primary"
@@ -314,7 +314,7 @@ exports[`ConfirmDelete renders 1`] = `
               aria-disabled={true}
               aria-label="Confirm"
               autoFocus={true}
-              data-test-id="confirm-modal"
+              data-test-id="confirm-button"
               disabled={true}
               onClick={[Function]}
               priority="primary"
@@ -325,7 +325,7 @@ exports[`ConfirmDelete renders 1`] = `
                 aria-label="Confirm"
                 autoFocus={true}
                 className="css-pbzt2j-StyledButton-getColors edwq9my0"
-                data-test-id="confirm-modal"
+                data-test-id="confirm-button"
                 disabled={true}
                 onClick={[Function]}
                 priority="primary"
@@ -336,7 +336,7 @@ exports[`ConfirmDelete renders 1`] = `
                   aria-label="Confirm"
                   autoFocus={true}
                   className="css-pbzt2j-StyledButton-getColors edwq9my0"
-                  data-test-id="confirm-modal"
+                  data-test-id="confirm-button"
                   onClick={[Function]}
                   role="button"
                 >

+ 8 - 8
tests/js/spec/views/issueList/__snapshots__/actions.spec.jsx.snap

@@ -211,7 +211,7 @@ exports[`IssueListActions Bulk Total results < bulk limit bulk resolves 1`] = `
           <Button
             align="center"
             autoFocus={true}
-            data-test-id="confirm-modal"
+            data-test-id="confirm-button"
             disabled={false}
             onClick={[Function]}
             priority="primary"
@@ -220,7 +220,7 @@ exports[`IssueListActions Bulk Total results < bulk limit bulk resolves 1`] = `
               aria-disabled={false}
               aria-label="Bulk resolve issues"
               autoFocus={true}
-              data-test-id="confirm-modal"
+              data-test-id="confirm-button"
               disabled={false}
               onClick={[Function]}
               priority="primary"
@@ -231,7 +231,7 @@ exports[`IssueListActions Bulk Total results < bulk limit bulk resolves 1`] = `
                 aria-label="Bulk resolve issues"
                 autoFocus={true}
                 className="css-xiynrq-StyledButton-getColors edwq9my0"
-                data-test-id="confirm-modal"
+                data-test-id="confirm-button"
                 disabled={false}
                 onClick={[Function]}
                 priority="primary"
@@ -242,7 +242,7 @@ exports[`IssueListActions Bulk Total results < bulk limit bulk resolves 1`] = `
                   aria-label="Bulk resolve issues"
                   autoFocus={true}
                   className="css-xiynrq-StyledButton-getColors edwq9my0"
-                  data-test-id="confirm-modal"
+                  data-test-id="confirm-button"
                   onClick={[Function]}
                   role="button"
                 >
@@ -516,7 +516,7 @@ exports[`IssueListActions Bulk Total results > bulk limit bulk resolves 1`] = `
           <Button
             align="center"
             autoFocus={true}
-            data-test-id="confirm-modal"
+            data-test-id="confirm-button"
             disabled={false}
             onClick={[Function]}
             priority="primary"
@@ -525,7 +525,7 @@ exports[`IssueListActions Bulk Total results > bulk limit bulk resolves 1`] = `
               aria-disabled={false}
               aria-label="Bulk resolve issues"
               autoFocus={true}
-              data-test-id="confirm-modal"
+              data-test-id="confirm-button"
               disabled={false}
               onClick={[Function]}
               priority="primary"
@@ -536,7 +536,7 @@ exports[`IssueListActions Bulk Total results > bulk limit bulk resolves 1`] = `
                 aria-label="Bulk resolve issues"
                 autoFocus={true}
                 className="css-xiynrq-StyledButton-getColors edwq9my0"
-                data-test-id="confirm-modal"
+                data-test-id="confirm-button"
                 disabled={false}
                 onClick={[Function]}
                 priority="primary"
@@ -547,7 +547,7 @@ exports[`IssueListActions Bulk Total results > bulk limit bulk resolves 1`] = `
                   aria-label="Bulk resolve issues"
                   autoFocus={true}
                   className="css-xiynrq-StyledButton-getColors edwq9my0"
-                  data-test-id="confirm-modal"
+                  data-test-id="confirm-button"
                   onClick={[Function]}
                   role="button"
                 >

+ 1 - 1
tests/js/spec/views/organizationGroupDetails/groupSimilar.spec.jsx

@@ -98,7 +98,7 @@ describe('Issues Similar View', function() {
     await tick();
     wrapper.update();
     wrapper.find('[data-test-id="merge"] a').simulate('click');
-    wrapper.find('Button[data-test-id="confirm-modal"]').simulate('click');
+    wrapper.find('Button[data-test-id="confirm-button"]').simulate('click');
 
     await tick();
     wrapper.update();

+ 1 - 1
tests/js/spec/views/settings/organizationIntegrations/sentryAppInstallations.spec.jsx

@@ -224,7 +224,7 @@ describe('Sentry App Installations', function() {
           .first()
           .simulate('click');
         wrapper
-          .find('[data-test-id="confirm-modal"]')
+          .find('[data-test-id="confirm-button"]')
           .first()
           .simulate('click');
         expect(response).toHaveBeenCalledWith(

+ 1 - 1
tests/js/spec/views/settings/organizationMembers/organizationMemberDetail.spec.jsx

@@ -381,7 +381,7 @@ describe('OrganizationMemberDetail', function() {
 
       expectButtonEnabled();
       wrapper.find(button).simulate('click');
-      wrapper.find('Button[data-test-id="confirm-modal"]').simulate('click');
+      wrapper.find('Button[data-test-id="confirm-button"]').simulate('click');
       deleteMocks.map(deleteMock => {
         expect(deleteMock).toHaveBeenCalled();
       });