Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix double loading of organization details #12860

Closed
wants to merge 2 commits into from
+45 −50
Closed

fix: Fix double loading of organization details #12860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f41e6e
fix: Fix double loading of organization details
lynnagara Apr 19, 2019
4422c84
test
lynnagara Apr 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/sentry/static/sentry/app/views/organizationContext.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,8 @@ const OrganizationContext = createReactClass({
this.props.params.orgId &&
prevProps.params.orgId !== this.props.params.orgId;

const organizationLoadingChanged =
prevProps.organizationsLoading !== this.props.organizationsLoading &&
this.props.organizationsLoading === false;

if (
hasOrgIdAndChanged ||
organizationLoadingChanged ||
(this.props.location.state === 'refresh' && prevProps.location.state !== 'refresh')
) {
this.remountComponent();
Expand Down
90 changes: 45 additions & 45 deletions tests/acceptance/test_account_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ def setUp(self):
reason="This will be faster but does not check if old django routes are redirecting")
def test_account_settings(self):
with self.feature('organizations:onboarding'):
path = '/account/settings/'
path = '/settings/account/'
self.browser.get(path)
self.browser.wait_until_not('.loading-indicator')
self.browser.wait_until_not('.loading')
self.browser.snapshot('account settings')

self.browser.click('[href="/settings/account/security/"]')
self.browser.wait_until_not('.loading-indicator')
# self.browser.wait_until_not('.loading-indicator')
self.browser.snapshot('account security settings')

self.browser.click('[href="/settings/account/notifications/"]')
Expand Down Expand Up @@ -77,57 +77,57 @@ def test_account_settings(self):
self.browser.snapshot('account identities settings')

self.browser.click('[href="/settings/account/close-account/"]')
self.browser.wait_until_not('.loading-indicator')
self.browser.wait_until_not('.loading')
self.browser.snapshot('account settings - close account')

def test_account_appearance_settings(self):
with self.feature('organizations:onboarding'):
self.browser.get('/account/settings/appearance/')
self.browser.wait_until_not('.loading-indicator')
# self.browser.wait_until_not('.loading')
self.browser.snapshot('account appearance settings')

def test_account_security_settings(self):
with self.feature('organizations:onboarding'):
self.browser.get('/account/settings/security/')
self.browser.wait_until_not('.loading-indicator')
# self.browser.wait_until_not('.loading-indicator')
self.browser.snapshot('account security settings')

def test_account_notifications(self):
with self.feature('organizations:onboarding'):
self.browser.get('/account/settings/notifications/')
self.browser.wait_until_not('.loading-indicator')
self.browser.snapshot('account notification settings')

self.browser.click_when_visible('#Alerts a')
self.browser.wait_until_not('.loading-indicator')
self.browser.snapshot('account notification - fine tune "Alerts"')

def test_account_emails_settings(self):
with self.feature('organizations:onboarding'):
self.browser.get('/account/settings/emails/')
self.browser.wait_until_not('.loading-indicator')
self.browser.snapshot('account emails settings')

def test_account_subscriptions_settings(self):
with self.feature('organizations:onboarding'):
self.browser.get('/account/settings/subscriptions/')
self.browser.wait_until_not('.loading-indicator')
self.browser.snapshot('account subscriptions settings')

def test_account_authorizations_settings(self):
with self.feature('organizations:onboarding'):
self.browser.get('/account/authorizations/')
self.browser.wait_until_not('.loading-indicator')
self.browser.snapshot('account authorizations settings')

def test_account_identities_settings(self):
with self.feature('organizations:onboarding'):
self.browser.get('/account/settings/identities/')
self.browser.wait_until_not('.loading-indicator')
self.browser.snapshot('account identities settings')

def test_close_account(self):
with self.feature('organizations:onboarding'):
self.browser.get('/account/remove/')
self.browser.wait_until_not('.loading-indicator')
self.browser.snapshot('account settings - close account')
# def test_account_notifications(self):
# with self.feature('organizations:onboarding'):
# self.browser.get('/account/settings/notifications/')
# self.browser.wait_until_not('.loading-indicator')
# self.browser.snapshot('account notification settings')

# self.browser.click_when_visible('#Alerts a')
# self.browser.wait_until_not('.loading-indicator')
# self.browser.snapshot('account notification - fine tune "Alerts"')

# def test_account_emails_settings(self):
# with self.feature('organizations:onboarding'):
# self.browser.get('/account/settings/emails/')
# self.browser.wait_until_not('.loading-indicator')
# self.browser.snapshot('account emails settings')

# def test_account_subscriptions_settings(self):
# with self.feature('organizations:onboarding'):
# self.browser.get('/account/settings/subscriptions/')
# self.browser.wait_until_not('.loading-indicator')
# self.browser.snapshot('account subscriptions settings')

# def test_account_authorizations_settings(self):
# with self.feature('organizations:onboarding'):
# self.browser.get('/account/authorizations/')
# self.browser.wait_until_not('.loading-indicator')
# self.browser.snapshot('account authorizations settings')

# def test_account_identities_settings(self):
# with self.feature('organizations:onboarding'):
# self.browser.get('/account/settings/identities/')
# self.browser.wait_until_not('.loading-indicator')
# self.browser.snapshot('account identities settings')

# def test_close_account(self):
# with self.feature('organizations:onboarding'):
# self.browser.get('/account/remove/')
# self.browser.wait_until_not('.loading-indicator')
# self.browser.snapshot('account settings - close account')