tests(acceptance): Add tests for resolving issues in Issues Li… (#14069)

billyvg · web-flow · commit dbda6e49b246 · 2019-07-23T10:45:57.000-07:00
Also refactor slightly to use page object
diff --git a/src/sentry/static/sentry/app/components/checkbox.jsx b/src/sentry/static/sentry/app/components/checkbox.jsx
@@ -1,15 +1,12 @@
 import React from 'react';
-import classNames from 'classnames';
 
 class Checkbox extends React.Component {
   static defaultProps = {
     checked: false,
   };
 
   render() {
-    const {className, ...otherProps} = this.props;
-    const cx = classNames('chk-select', className);
-    return <input type="checkbox" className={cx} {...otherProps} />;
+    return <input type="checkbox" {...this.props} />;
   }
 }
 
diff --git a/src/sentry/static/sentry/app/components/eventOrGroupHeader.jsx b/src/sentry/static/sentry/app/components/eventOrGroupHeader.jsx
@@ -59,6 +59,7 @@ class EventOrGroupHeader extends React.Component {
     return (
       <Wrapper
         {...props}
+        data-test-id={data.status === 'resolved' ? 'resolved-issue' : null}
         style={data.status === 'resolved' ? {textDecoration: 'line-through'} : null}
       >
         {!hideLevel && level && (
diff --git a/src/sentry/static/sentry/app/components/stream/groupCheckBox.jsx b/src/sentry/static/sentry/app/components/stream/groupCheckBox.jsx
@@ -1,10 +1,11 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import createReactClass from 'create-react-class';
 import Reflux from 'reflux';
+import createReactClass from 'create-react-class';
 
-import SelectedGroupStore from 'app/stores/selectedGroupStore';
+import {t} from 'app/locale';
 import Checkbox from 'app/components/checkbox';
+import SelectedGroupStore from 'app/stores/selectedGroupStore';
 
 const GroupCheckBox = createReactClass({
   displayName: 'GroupCheckBox',
@@ -29,7 +30,7 @@ const GroupCheckBox = createReactClass({
     }
   },
 
-  shouldComponentUpdate(nextProps, nextState) {
+  shouldComponentUpdate(_nextProps, nextState) {
     return nextState.isSelected !== this.state.isSelected;
   },
 
@@ -50,6 +51,7 @@ const GroupCheckBox = createReactClass({
   render() {
     return (
       <Checkbox
+        aria-label={t('Select Issue')}
         value={this.props.id}
         checked={this.state.isSelected}
         onChange={this.onSelect}
diff --git a/tests/acceptance/page_objects/base.py b/tests/acceptance/page_objects/base.py
@@ -11,6 +11,9 @@ def __init__(self, browser):
     def driver(self):
         return self.browser.driver
 
+    def wait_until_loaded(self):
+        self.browser.wait_until_not('.loading-indicator')
+
 
 class BaseElement(object):
     def __init__(self, element):
diff --git a/tests/acceptance/page_objects/issue_list.py b/tests/acceptance/page_objects/issue_list.py
@@ -0,0 +1,30 @@
+from __future__ import absolute_import
+
+from .base import BasePage
+
+
+class IssueListPage(BasePage):
+    def __init__(self, browser, client):
+        super(IssueListPage, self).__init__(browser)
+        self.client = client
+
+    def visit_issue_list(self, org):
+        self.browser.get(u'/organizations/{}/issues/'.format(org))
+        self.wait_until_loaded()
+
+    def wait_for_stream(self):
+        self.browser.wait_until('.event-issue-header', timeout=20)
+
+    def select_issue(self, position):
+        self.browser.click(u'[data-test-id="group"]:nth-child({})'.format(position))
+
+    def resolve_issues(self):
+        self.browser.click('[aria-label="Resolve"]')
+        self.browser.click('[data-test-id="confirm-modal"]')
+
+    def wait_for_resolved_issue(self):
+        self.browser.wait_until('[data-test-id="resolved-issue"]')
+
+    def find_resolved_issues(self):
+        return self.browser.find_elements_by_css_selector(
+            '[data-test-id="resolved-issue"]')
diff --git a/tests/acceptance/test_organization_group_index.py b/tests/acceptance/test_organization_group_index.py
@@ -6,6 +6,8 @@
 from django.utils import timezone
 
 from sentry.testutils import AcceptanceTestCase, SnubaTestCase
+from tests.acceptance.page_objects.issue_list import IssueListPage
+
 from mock import patch
 
 
@@ -32,25 +34,9 @@ def setUp(self):
             name='Sumatra',
         )
         self.login_as(self.user)
-        self.path = u'/organizations/{}/issues/'.format(self.org.slug)
-
-    def test_with_onboarding(self):
-        self.project.update(first_event=None)
-        self.browser.get(self.path)
-        self.wait_until_loaded()
-        self.browser.wait_until_test_id('awaiting-events')
-        self.browser.snapshot('organization issues onboarding')
+        self.page = IssueListPage(self.browser, self.client)
 
-    def test_with_no_results(self):
-        self.project.update(first_event=timezone.now())
-        self.browser.get(self.path)
-        self.wait_until_loaded()
-        self.browser.wait_until_test_id('empty-state')
-        self.browser.snapshot('organization issues no results')
-
-    @patch('django.utils.timezone.now')
-    def test_with_results(self, mock_now):
-        mock_now.return_value = datetime.utcnow().replace(tzinfo=pytz.utc)
+    def create_issues(self):
         self.store_event(
             data={
                 'event_id': 'a' * 32,
@@ -69,15 +55,60 @@ def test_with_results(self, mock_now):
             },
             project_id=self.project.id
         )
-        self.browser.get(self.path)
-        self.wait_until_loaded()
-        self.browser.wait_until('.event-issue-header')
+
+    def test_with_onboarding(self):
+        self.project.update(first_event=None)
+        self.page.visit_issue_list(self.org.slug)
+        self.browser.wait_until_test_id('awaiting-events')
+        self.browser.snapshot('organization issues onboarding')
+
+    def test_with_no_results(self):
+        self.project.update(first_event=timezone.now())
+        self.page.visit_issue_list(self.org.slug)
+        self.browser.wait_until_test_id('empty-state')
+        self.browser.snapshot('organization issues no results')
+
+    @patch('django.utils.timezone.now')
+    def test_with_results(self, mock_now):
+        mock_now.return_value = datetime.utcnow().replace(tzinfo=pytz.utc)
+        self.create_issues()
+        self.page.visit_issue_list(self.org.slug)
+        self.page.wait_for_stream()
         self.browser.snapshot('organization issues with issues')
 
         groups = self.browser.find_elements_by_class_name('event-issue-header')
         assert len(groups) == 2
         assert 'oh snap' in groups[0].text
         assert 'oh no' in groups[1].text
 
-    def wait_until_loaded(self):
-        self.browser.wait_until_not('.loading')
+    @patch('django.utils.timezone.now')
+    def test_resolve_issues(self, mock_now):
+        mock_now.return_value = datetime.utcnow().replace(tzinfo=pytz.utc)
+        self.create_issues()
+        self.page.visit_issue_list(self.org.slug)
+        self.page.wait_for_stream()
+
+        self.page.select_issue(1)
+        self.page.select_issue(2)
+        self.page.resolve_issues()
+        self.page.wait_for_resolved_issue()
+        resolved_groups = self.page.find_resolved_issues()
+
+        assert len(resolved_groups) == 2
+
+    @patch('django.utils.timezone.now')
+    def test_resolve_issues_multi_projects(self, mock_now):
+        mock_now.return_value = datetime.utcnow().replace(tzinfo=pytz.utc)
+        self.create_issues()
+
+        with self.feature('organizations:global-views'):
+            self.page.visit_issue_list(self.org.slug)
+            self.page.wait_for_stream()
+
+            self.page.select_issue(1)
+            self.page.select_issue(2)
+            self.page.resolve_issues()
+            self.page.wait_for_resolved_issue()
+            resolved_groups = self.page.find_resolved_issues()
+
+            assert len(resolved_groups) == 2
diff --git a/tests/js/spec/components/__snapshots__/checkbox.spec.jsx.snap b/tests/js/spec/components/__snapshots__/checkbox.spec.jsx.snap
@@ -3,7 +3,6 @@
 exports[`Checkbox renders 1`] = `
 <input
   checked={false}
-  className="chk-select"
   type="checkbox"
 />
 `;
diff --git a/tests/js/spec/views/organizationGroupDetails/__snapshots__/groupSimilar.spec.jsx.snap b/tests/js/spec/views/organizationGroupDetails/__snapshots__/groupSimilar.spec.jsx.snap
@@ -658,7 +658,6 @@ exports[`Issues Similar View renders with mocked data 1`] = `
                           >
                             <input
                               checked={false}
-                              className="chk-select"
                               id="271"
                               onChange={[Function]}
                               type="checkbox"
@@ -845,6 +844,7 @@ exports[`Issues Similar View renders with mocked data 1`] = `
                                     size="normal"
                                   >
                                     <Link
+                                      data-test-id="resolved-issue"
                                       onlyActiveOnIndex={false}
                                       style={
                                         Object {
@@ -859,6 +859,7 @@ exports[`Issues Similar View renders with mocked data 1`] = `
                                       }
                                     >
                                       <a
+                                        data-test-id="resolved-issue"
                                         onClick={[Function]}
                                         style={
                                           Object {
diff --git a/tests/js/spec/views/settings/organizationDeveloperSettings/__snapshots__/subscriptionBox.spec.jsx.snap b/tests/js/spec/views/settings/organizationDeveloperSettings/__snapshots__/subscriptionBox.spec.jsx.snap
@@ -89,7 +89,6 @@ exports[`SubscriptionBox renders resource checkbox 1`] = `
             >
               <input
                 checked={false}
-                className="chk-select"
                 disabled={false}
                 id="issue"
                 onChange={[Function]}

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,12 @@`
`1`	`1`	`import React from 'react';`
`2`		`-import classNames from 'classnames';`
`3`	`2`
`4`	`3`	`class Checkbox extends React.Component {`
`5`	`4`	`static defaultProps = {`
`6`	`5`	`checked: false,`
`7`	`6`	`};`
`8`	`7`
`9`	`8`	`render() {`
`10`		`- const {className, ...otherProps} = this.props;`
`11`		`- const cx = classNames('chk-select', className);`
`12`		`- return <input type="checkbox" className={cx} {...otherProps} />;`
	`9`	`+ return <input type="checkbox" {...this.props} />;`
`13`	`10`	`}`
`14`	`11`	`}`
`15`	`12`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ class EventOrGroupHeader extends React.Component {`
`59`	`59`	`return (`
`60`	`60`	`<Wrapper`
`61`	`61`	`{...props}`
	`62`	`+ data-test-id={data.status === 'resolved' ? 'resolved-issue' : null}`
`62`	`63`	`style={data.status === 'resolved' ? {textDecoration: 'line-through'} : null}`
`63`	`64`	`>`
`64`	`65`	`{!hideLevel && level && (`
Original file line number	Diff line number	Diff line change
@@ -658,7 +658,6 @@ exports[`Issues Similar View renders with mocked data 1`] = `
`658`	`658`	`>`
`659`	`659`	`<input`
`660`	`660`	`checked={false}`
`661`		`- className="chk-select"`
`662`	`661`	`id="271"`
`663`	`662`	`onChange={[Function]}`
`664`	`663`	`type="checkbox"`
@@ -845,6 +844,7 @@ exports[`Issues Similar View renders with mocked data 1`] = `
`845`	`844`	`size="normal"`
`846`	`845`	`>`
`847`	`846`	`<Link`
	`847`	`+ data-test-id="resolved-issue"`
`848`	`848`	`onlyActiveOnIndex={false}`
`849`	`849`	`style={`
`850`	`850`	`Object {`
@@ -859,6 +859,7 @@ exports[`Issues Similar View renders with mocked data 1`] = `
`859`	`859`	`}`
`860`	`860`	`>`
`861`	`861`	`<a`
	`862`	`+ data-test-id="resolved-issue"`
`862`	`863`	`onClick={[Function]}`
`863`	`864`	`style={`
`864`	`865`	`Object {`
Original file line number	Diff line number	Diff line change
@@ -89,7 +89,6 @@ exports[`SubscriptionBox renders resource checkbox 1`] = `
`89`	`89`	`>`
`90`	`90`	`<input`
`91`	`91`	`checked={false}`
`92`		`- className="chk-select"`
`93`	`92`	`disabled={false}`
`94`	`93`	`id="issue"`
`95`	`94`	`onChange={[Function]}`