Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion static/app/views/onboarding/onboarding.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ describe('Onboarding', () => {

describe('SCM onboarding flow', () => {
const scmOrganization = OrganizationFixture({
features: ['onboarding-scm'],
features: ['onboarding-scm-experiment'],
});

const githubProvider = GitHubIntegrationProviderFixture({
Expand Down
6 changes: 5 additions & 1 deletion static/app/views/onboarding/onboarding.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import type {PlatformKey} from 'sentry/types/project';
import {defined} from 'sentry/utils';
import {trackAnalytics} from 'sentry/utils/analytics';
import {normalizeUrl} from 'sentry/utils/url/normalizeUrl';
import {useExperiment} from 'sentry/utils/useExperiment';
import {useLocation} from 'sentry/utils/useLocation';
import {useNavigate} from 'sentry/utils/useNavigate';
import {useOrganization} from 'sentry/utils/useOrganization';
Expand Down Expand Up @@ -163,7 +164,10 @@ export function OnboardingWithoutContext() {
onboardingContext.createdProjectSlug ?? onboardingContext.selectedPlatform?.key;

const hasNewWelcomeUI = useHasNewWelcomeUI();
const hasScmOnboarding = organization.features.includes('onboarding-scm');
const {inExperiment: hasScmOnboarding} = useExperiment({
feature: 'onboarding-scm-experiment',
});

const onboardingSteps = hasScmOnboarding ? scmOnboardingSteps : legacyOnboardingSteps;

const stepObj = onboardingSteps.find(({id}) => stepId === id);
Expand Down
10 changes: 5 additions & 5 deletions tests/acceptance/test_scm_onboarding.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def test_scm_onboarding_happy_path(self) -> None:
with (
self.feature(
{
"organizations:onboarding-scm": True,
"organizations:onboarding-scm-experiment": True,
"organizations:integrations-github-platform-detection": True,
}
),
Expand Down Expand Up @@ -122,7 +122,7 @@ def test_scm_onboarding_happy_path(self) -> None:

def test_scm_onboarding_skip_integration(self) -> None:
"""Skip flow: welcome → skip connect → manual platform → create project."""
with self.feature({"organizations:onboarding-scm": True}):
with self.feature({"organizations:onboarding-scm-experiment": True}):
self.start_onboarding()

# SCM Connect: skip
Expand Down Expand Up @@ -178,7 +178,7 @@ def test_scm_onboarding_with_integration_install(self) -> None:
with (
self.feature(
{
"organizations:onboarding-scm": True,
"organizations:onboarding-scm-experiment": True,
"organizations:integrations-github-platform-detection": True,
}
),
Expand Down Expand Up @@ -279,7 +279,7 @@ def test_scm_onboarding_detection_error_falls_back_to_manual_picker(self) -> Non
with (
self.feature(
{
"organizations:onboarding-scm": True,
"organizations:onboarding-scm-experiment": True,
"organizations:integrations-github-platform-detection": True,
}
),
Expand Down Expand Up @@ -339,7 +339,7 @@ def test_scm_onboarding_repo_search_no_results(self) -> None:
self.create_github_integration()

with (
self.feature({"organizations:onboarding-scm": True}),
self.feature({"organizations:onboarding-scm-experiment": True}),
mock.patch(
"sentry.integrations.github.integration.GitHubIntegration.get_repositories",
return_value=[],
Expand Down
Loading