diff --git a/static/app/views/onboarding/onboarding.spec.tsx b/static/app/views/onboarding/onboarding.spec.tsx index 931b526d6b01b1..c455e569c2f20f 100644 --- a/static/app/views/onboarding/onboarding.spec.tsx +++ b/static/app/views/onboarding/onboarding.spec.tsx @@ -630,7 +630,7 @@ describe('Onboarding', () => { describe('SCM onboarding flow', () => { const scmOrganization = OrganizationFixture({ - features: ['onboarding-scm'], + features: ['onboarding-scm-experiment'], }); const githubProvider = GitHubIntegrationProviderFixture({ diff --git a/static/app/views/onboarding/onboarding.tsx b/static/app/views/onboarding/onboarding.tsx index b92c9bb1ce7f1a..6b7b3951f2ec24 100644 --- a/static/app/views/onboarding/onboarding.tsx +++ b/static/app/views/onboarding/onboarding.tsx @@ -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'; @@ -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); diff --git a/tests/acceptance/test_scm_onboarding.py b/tests/acceptance/test_scm_onboarding.py index 0f872712336f2d..027494091b185f 100644 --- a/tests/acceptance/test_scm_onboarding.py +++ b/tests/acceptance/test_scm_onboarding.py @@ -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, } ), @@ -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 @@ -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, } ), @@ -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, } ), @@ -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=[],