-
+
{React.cloneElement(this.props.children, {
- memberList: this.props.memberList,
group,
})}
@@ -228,4 +196,4 @@ const GroupDetails = createReactClass({
},
});
-export default withEnvironment(GroupDetails);
+export default GroupDetails;
diff --git a/src/sentry/static/sentry/app/views/groupDetails/header.jsx b/src/sentry/static/sentry/app/views/groupDetails/shared/header.jsx
similarity index 98%
rename from src/sentry/static/sentry/app/views/groupDetails/header.jsx
rename to src/sentry/static/sentry/app/views/groupDetails/shared/header.jsx
index ec3d0b2222df19..47534a955b348f 100644
--- a/src/sentry/static/sentry/app/views/groupDetails/header.jsx
+++ b/src/sentry/static/sentry/app/views/groupDetails/shared/header.jsx
@@ -5,8 +5,7 @@ import {Link} from 'react-router';
import ApiMixin from 'app/mixins/apiMixin';
import AssigneeSelector from 'app/components/assigneeSelector';
import Count from 'app/components/count';
-import GroupActions from 'app/views/groupDetails/actions';
-import GroupSeenBy from 'app/views/groupDetails/seenBy';
+import GroupActions from 'app/views/groupDetails/project/actions';
import IndicatorStore from 'app/stores/indicatorStore';
import ListLink from 'app/components/listLink';
import NavTabs from 'app/components/navTabs';
@@ -17,6 +16,8 @@ import ProjectState from 'app/mixins/projectState';
import Tooltip from 'app/components/tooltip';
import {t} from 'app/locale';
+import GroupSeenBy from '../project/seenBy';
+
const GroupHeader = createReactClass({
displayName: 'GroupHeader',
diff --git a/tests/js/spec/views/groupActivity/index.spec.jsx b/tests/js/spec/views/groupActivity/index.spec.jsx
index b6d07da7de8793..99eb3062707540 100644
--- a/tests/js/spec/views/groupActivity/index.spec.jsx
+++ b/tests/js/spec/views/groupActivity/index.spec.jsx
@@ -1,7 +1,7 @@
import React from 'react';
import {shallow} from 'enzyme';
-import GroupActivity from 'app/views/groupActivity';
+import GroupActivity from 'app/views/groupDetails/project/groupActivity';
import NoteInput from 'app/components/activity/noteInput';
import ConfigStore from 'app/stores/configStore';
import GroupStore from 'app/stores/groupStore';
diff --git a/tests/js/spec/views/__snapshots__/groupEvents.spec.jsx.snap b/tests/js/spec/views/groupDetails/__snapshots__/groupEvents.spec.jsx.snap
similarity index 100%
rename from tests/js/spec/views/__snapshots__/groupEvents.spec.jsx.snap
rename to tests/js/spec/views/groupDetails/__snapshots__/groupEvents.spec.jsx.snap
diff --git a/tests/js/spec/views/__snapshots__/groupMergedView.spec.jsx.snap b/tests/js/spec/views/groupDetails/__snapshots__/groupMergedView.spec.jsx.snap
similarity index 100%
rename from tests/js/spec/views/__snapshots__/groupMergedView.spec.jsx.snap
rename to tests/js/spec/views/groupDetails/__snapshots__/groupMergedView.spec.jsx.snap
diff --git a/tests/js/spec/views/__snapshots__/groupSimilarView.spec.jsx.snap b/tests/js/spec/views/groupDetails/__snapshots__/groupSimilarView.spec.jsx.snap
similarity index 100%
rename from tests/js/spec/views/__snapshots__/groupSimilarView.spec.jsx.snap
rename to tests/js/spec/views/groupDetails/__snapshots__/groupSimilarView.spec.jsx.snap
diff --git a/tests/js/spec/views/groupDetails/actions.spec.jsx b/tests/js/spec/views/groupDetails/actions.spec.jsx
index fd1364c8e29e41..3734c1e8e5035f 100644
--- a/tests/js/spec/views/groupDetails/actions.spec.jsx
+++ b/tests/js/spec/views/groupDetails/actions.spec.jsx
@@ -1,7 +1,7 @@
import React from 'react';
import {shallow} from 'enzyme';
-import GroupActions from 'app/views/groupDetails/actions';
+import GroupActions from 'app/views/groupDetails/project/actions';
import ConfigStore from 'app/stores/configStore';
describe('GroupActions', function() {
diff --git a/tests/js/spec/views/groupEvents.spec.jsx b/tests/js/spec/views/groupDetails/groupEvents.spec.jsx
similarity index 97%
rename from tests/js/spec/views/groupEvents.spec.jsx
rename to tests/js/spec/views/groupDetails/groupEvents.spec.jsx
index 9348f731b94213..946be5883de67c 100644
--- a/tests/js/spec/views/groupEvents.spec.jsx
+++ b/tests/js/spec/views/groupDetails/groupEvents.spec.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import {shallow} from 'enzyme';
import {browserHistory} from 'react-router';
-import {GroupEvents} from 'app/views/groupEvents';
+import {GroupEvents} from 'app/views/groupDetails/project/groupEvents';
describe('groupEvents', function() {
beforeEach(function() {
diff --git a/tests/js/spec/views/groupMergedView.spec.jsx b/tests/js/spec/views/groupDetails/groupMergedView.spec.jsx
similarity index 93%
rename from tests/js/spec/views/groupMergedView.spec.jsx
rename to tests/js/spec/views/groupDetails/groupMergedView.spec.jsx
index 8a67d0dd7e82c3..234b3966d46be5 100644
--- a/tests/js/spec/views/groupMergedView.spec.jsx
+++ b/tests/js/spec/views/groupDetails/groupMergedView.spec.jsx
@@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
import {shallow} from 'enzyme';
-import GroupMergedView from 'app/views/groupMerged/groupMergedView';
+import GroupMergedView from 'app/views/groupDetails/project/groupMerged';
import {Client} from 'app/api';
-import events from '../../mocks/events';
+import events from 'app-test/mocks/events';
jest.mock('app/api');
jest.mock('app/mixins/projectState', () => {
diff --git a/tests/js/spec/views/groupSimilarView.spec.jsx b/tests/js/spec/views/groupDetails/groupSimilarView.spec.jsx
similarity index 95%
rename from tests/js/spec/views/groupSimilarView.spec.jsx
rename to tests/js/spec/views/groupDetails/groupSimilarView.spec.jsx
index a14928cfbcaab5..e080a3e41ceab8 100644
--- a/tests/js/spec/views/groupSimilarView.spec.jsx
+++ b/tests/js/spec/views/groupDetails/groupSimilarView.spec.jsx
@@ -3,9 +3,9 @@ import {browserHistory} from 'react-router';
import React from 'react';
import {mount, shallow} from 'enzyme';
-import GroupSimilarView from 'app/views/groupSimilar/groupSimilarView';
+import GroupSimilarView from 'app/views/groupDetails/project/groupSimilar';
-import issues from '../../mocks/issues';
+import issues from 'app-test/mocks/issues';
jest.mock('app/mixins/projectState', () => {
return {
diff --git a/tests/js/spec/views/groupDetails/seenBy.spec.jsx b/tests/js/spec/views/groupDetails/seenBy.spec.jsx
index 4cecb21a21dbe4..b0b828f456bc32 100644
--- a/tests/js/spec/views/groupDetails/seenBy.spec.jsx
+++ b/tests/js/spec/views/groupDetails/seenBy.spec.jsx
@@ -1,7 +1,7 @@
import React from 'react';
import {shallow} from 'enzyme';
-import GroupSeenBy from 'app/views/groupDetails/seenBy';
+import GroupSeenBy from 'app/views/groupDetails/project/seenBy';
import ConfigStore from 'app/stores/configStore';
describe('GroupSeenBy', function() {