feat: Update to send users developer instead of users basic (#3702)

Co-authored-by: Ajay Singh <[email protected]>
codecov · Feb 4, 2025 · 1441847 · 1441847
1 parent 47e6e13
commit 1441847
Show file tree

Hide file tree

Showing 59 changed files with 231 additions and 222 deletions.
diff --git a/src/App.test.tsx b/src/App.test.tsx
@@ -89,7 +89,7 @@ const user = {
       service: 'github',
       ownerid: 123,
       serviceId: '123',
-      plan: Plans.USERS_BASIC,
+      plan: Plans.USERS_DEVELOPER,
       staff: false,
       hasYaml: false,
       bot: null,

diff --git a/src/layouts/BaseLayout/BaseLayout.test.tsx b/src/layouts/BaseLayout/BaseLayout.test.tsx
@@ -71,7 +71,7 @@ const mockTrackingMetadata = {
   service: 'github',
   ownerid: 123,
   serviceId: '123',
-  plan: Plans.USERS_BASIC,
+  plan: Plans.USERS_DEVELOPER,
   staff: false,
   hasYaml: false,
   bot: null,

diff --git a/src/layouts/BaseLayout/hooks/useUserAccessGate.test.tsx b/src/layouts/BaseLayout/hooks/useUserAccessGate.test.tsx
@@ -73,7 +73,7 @@ const mockTrackingMetadata = {
   service: 'github',
   ownerid: 123,
   serviceId: '123',
-  plan: Plans.USERS_BASIC,
+  plan: Plans.USERS_DEVELOPER,
   staff: false,
   hasYaml: false,
   bot: null,

diff --git a/src/layouts/Header/Header.test.tsx b/src/layouts/Header/Header.test.tsx
@@ -58,7 +58,7 @@ const mockUser = {
       service: 'github',
       ownerid: 123,
       serviceId: '123',
-      plan: Plans.USERS_BASIC,
+      plan: Plans.USERS_DEVELOPER,
       staff: false,
       hasYaml: false,
       bot: null,

diff --git a/src/layouts/Header/components/Navigator/Navigator.test.tsx b/src/layouts/Header/components/Navigator/Navigator.test.tsx
@@ -73,7 +73,7 @@ const mockUser = {
     service: 'github',
     ownerid: 123,
     serviceId: '123',
-    plan: Plans.USERS_BASIC,
+    plan: Plans.USERS_DEVELOPER,
     staff: false,
     hasYaml: false,
     bot: null,

diff --git a/src/layouts/Header/components/UserDropdown/UserDropdown.test.tsx b/src/layouts/Header/components/UserDropdown/UserDropdown.test.tsx
@@ -42,7 +42,7 @@ const mockUser = {
       service: 'github',
       ownerid: 123,
       serviceId: '123',
-      plan: Plans.USERS_BASIC,
+      plan: Plans.USERS_DEVELOPER,
       staff: false,
       hasYaml: false,
       bot: null,

diff --git a/src/mocks/handlers.js b/src/mocks/handlers.js
@@ -43,7 +43,7 @@ graphql.query('CurrentUser', () => {
           service: 'github',
           ownerid: 3456556,
           serviceId: '87824812',
-          plan: Plans.USERS_BASIC,
+          plan: Plans.USERS_DEVELOPER,
           staff: true,
           hasYaml: false,
           bot: null,

diff --git a/src/pages/AccountSettings/AccountSettings.test.jsx b/src/pages/AccountSettings/AccountSettings.test.jsx
@@ -31,7 +31,7 @@ const mockPlanData = {
   billingRate: BillingRate.MONTHLY,
   marketingName: 'Pro Team',
   monthlyUploadLimit: 250,
-  value: Plans.USERS_BASIC,
+  value: Plans.USERS_DEVELOPER,
   trialStatus: 'NOT_STARTED',
   trialStartDate: '',
   trialEndDate: '',
@@ -64,7 +64,7 @@ const mockCurrentUser = (username) => ({
       service: 'github',
       ownerid: 123,
       serviceId: '123',
-      plan: Plans.USERS_BASIC,
+      plan: Plans.USERS_DEVELOPER,
       staff: false,
       hasYaml: false,
       bot: null,
@@ -130,14 +130,14 @@ describe('AccountSettings', () => {
       username = 'codecov',
       isAdmin = false,
       hideAccessTab = true,
-      planValue = Plans.USERS_BASIC,
+      planValue = Plans.USERS_DEVELOPER,
     } = {
       isSelfHosted: false,
       owner: 'codecov',
       username: 'codecov',
       isAdmin: false,
       hideAccessTab: true,
-      planValue: Plans.USERS_BASIC,
+      planValue: Plans.USERS_DEVELOPER,
     }
   ) {
     config.IS_SELF_HOSTED = isSelfHosted
@@ -161,11 +161,14 @@ describe('AccountSettings', () => {
                 ...mockPlanData,
                 value: planValue,
                 isEnterprisePlan: planValue === Plans.USERS_ENTERPRISEM,
-                isFreePlan: planValue === Plans.USERS_BASIC,
+                isFreePlan:
+                  planValue === Plans.USERS_DEVELOPER ||
+                  planValue === Plans.USERS_BASIC,
                 isProPlan: false,
                 isTeamPlan:
                   planValue === Plans.USERS_TEAMM ||
-                  planValue === Plans.USERS_TEAMY,
+                  planValue === Plans.USERS_TEAMY ||
+                  planValue === Plans.USERS_DEVELOPER,
                 isTrialPlan: false,
                 isSentryPlan: false,
               },

diff --git a/src/pages/AccountSettings/AccountSettingsSideMenu.test.jsx b/src/pages/AccountSettings/AccountSettingsSideMenu.test.jsx
@@ -19,7 +19,7 @@ const mockPlanData = {
   billingRate: BillingRate.MONTHLY,
   marketingName: 'Pro Team',
   monthlyUploadLimit: 250,
-  value: Plans.USERS_BASIC,
+  value: Plans.USERS_DEVELOPER,
   trialStatus: 'NOT_STARTED',
   trialStartDate: '',
   trialEndDate: '',
@@ -52,7 +52,7 @@ const mockCurrentUser = (username) => ({
       service: 'github',
       ownerid: 123,
       serviceId: '123',
-      plan: Plans.USERS_BASIC,
+      plan: Plans.USERS_DEVELOPER,
       staff: false,
       hasYaml: false,
       bot: null,
@@ -118,14 +118,14 @@ describe('AccountSettingsSideMenu', () => {
       owner = 'codecov',
       isSelfHosted = false,
       hideAccessTab = false,
-      planValue = Plans.USERS_BASIC,
+      planValue = Plans.USERS_DEVELOPER,
     } = {
       isAdmin: false,
       username: 'codecov',
       isSelfHosted: false,
       owner: 'codecov',
       hideAccessTab: false,
-      planValue: Plans.USERS_BASIC,
+      planValue: Plans.USERS_DEVELOPER,
     }
   ) {
     config.IS_SELF_HOSTED = isSelfHosted
@@ -149,11 +149,14 @@ describe('AccountSettingsSideMenu', () => {
                 ...mockPlanData,
                 value: planValue,
                 isEnterprisePlan: planValue === Plans.USERS_ENTERPRISEM,
-                isFreePlan: planValue === Plans.USERS_BASIC,
+                isFreePlan:
+                  planValue === Plans.USERS_DEVELOPER ||
+                  planValue === Plans.USERS_BASIC,
                 isProPlan: false,
                 isTeamPlan:
                   planValue === Plans.USERS_TEAMM ||
-                  planValue === Plans.USERS_TEAMY,
+                  planValue === Plans.USERS_TEAMY ||
+                  planValue === Plans.USERS_DEVELOPER,
                 isTrialPlan: false,
                 isSentryPlan: false,
               },

diff --git a/src/pages/AccountSettings/tabs/Access/Access.test.tsx b/src/pages/AccountSettings/tabs/Access/Access.test.tsx
@@ -36,7 +36,7 @@ const mockSignedInUser = {
       service: 'github',
       ownerid: 123,
       serviceId: '123',
-      plan: Plans.USERS_BASIC,
+      plan: Plans.USERS_DEVELOPER,
       staff: false,
       hasYaml: false,
       bot: null,

diff --git a/src/pages/AccountSettings/tabs/Admin/Admin.test.jsx b/src/pages/AccountSettings/tabs/Admin/Admin.test.jsx
@@ -39,7 +39,7 @@ const user = {
       service: 'github',
       ownerid: 123,
       serviceId: '123',
-      plan: Plans.USERS_BASIC,
+      plan: Plans.USERS_DEVELOPER,
       staff: false,
       hasYaml: false,
       bot: null,

diff --git a/...ges/AccountSettings/tabs/Admin/GithubIntegrationSection/GithubIntegrationSection.test.jsx b/...ges/AccountSettings/tabs/Admin/GithubIntegrationSection/GithubIntegrationSection.test.jsx
@@ -57,7 +57,7 @@ describe('GithubIntegrationSection', () => {
       http.get(`/internal/gh/codecov/account-details/`, () => {
         return HttpResponse.json({
           plan: {
-            marketingName: Plans.USERS_BASIC,
+            marketingName: Plans.USERS_DEVELOPER,
             baseUnitPrice: 12,
             benefits: ['Configurable # of users', 'Unlimited repos'],
             quantity: 5,

diff --git a/src/pages/MembersPage/MembersActivation/Activation/Activation.test.jsx b/src/pages/MembersPage/MembersActivation/Activation/Activation.test.jsx
@@ -19,7 +19,7 @@ const mockedAccountDetails = {
     baseUnitPrice: 12,
     benefits: ['Configurable # of users', 'Unlimited repos'],
     quantity: 9,
-    value: Plans.USERS_BASIC,
+    value: Plans.USERS_DEVELOPER,
   },
   activatedUserCount: 5,
   inactiveUserCount: 1,
@@ -35,9 +35,9 @@ const mockPlanData = {
   baseUnitPrice: 10,
   benefits: [],
   billingRate: BillingRate.MONTHLY,
-  marketingName: 'Users Basic',
+  marketingName: 'Users Developer',
   monthlyUploadLimit: 250,
-  value: Plans.USERS_BASIC,
+  value: Plans.USERS_DEVELOPER,
   trialStatus: TrialStatuses.NOT_STARTED,
   trialStartDate: '',
   trialEndDate: '',

diff --git a/src/pages/MembersPage/MembersActivation/Activation/ChangePlanLink/ChangePlanLink.test.jsx b/src/pages/MembersPage/MembersActivation/Activation/ChangePlanLink/ChangePlanLink.test.jsx
@@ -20,7 +20,7 @@ describe('Members ChangePlanLink', () => {
     it('Renders change plan link', async () => {
       const mockedAccountDetailsNonEnterprise = {
         plan: {
-          value: Plans.USERS_BASIC,
+          value: Plans.USERS_DEVELOPER,
         },
         subscriptionDetail: {
           collectionMethod: 'paid',
@@ -46,7 +46,7 @@ describe('Members ChangePlanLink', () => {
     it('Does not render change plan link', async () => {
       const mockedAccountDetailsNonEnterprise = {
         plan: {
-          value: Plans.USERS_BASIC,
+          value: Plans.USERS_DEVELOPER,
         },
         subscriptionDetail: {
           collectionMethod: 'paid',

diff --git a/src/pages/MembersPage/MembersActivation/MembersActivation.test.jsx b/src/pages/MembersPage/MembersActivation/MembersActivation.test.jsx
@@ -20,7 +20,7 @@ const mockedAccountDetails = {
     baseUnitPrice: 12,
     benefits: ['Configurable # of users', 'Unlimited repos'],
     quantity: 9,
-    value: Plans.USERS_BASIC,
+    value: Plans.USERS_DEVELOPER,
   },
   activatedUserCount: 5,
   inactiveUserCount: 1,
@@ -30,9 +30,9 @@ const mockPlanData = {
   baseUnitPrice: 10,
   benefits: [],
   billingRate: BillingRate.MONTHLY,
-  marketingName: 'Users Basic',
+  marketingName: 'Users Developer',
   monthlyUploadLimit: 250,
-  value: Plans.USERS_BASIC,
+  value: Plans.USERS_DEVELOPER,
   trialStatus: TrialStatuses.NOT_STARTED,
   trialStartDate: '',
   trialEndDate: '',

diff --git a/src/pages/MembersPage/MembersList/MembersList.test.jsx b/src/pages/MembersPage/MembersList/MembersList.test.jsx
@@ -58,7 +58,7 @@ const mockPlanData = {
   baseUnitPrice: 10,
   benefits: [],
   billingRate: 'monthly',
-  marketingName: 'Users Basic',
+  marketingName: 'Users Developer',
   monthlyUploadLimit: 250,
   trialStatus: TrialStatuses.NOT_STARTED,
   trialStartDate: '',
@@ -102,7 +102,7 @@ describe('MembersList', () => {
   )
 
   function setup({
-    planName = Plans.USERS_BASIC,
+    planName = Plans.USERS_DEVELOPER,
     planUserCount = 0,
     hasSeatsLeft = true,
   }) {
@@ -132,7 +132,7 @@ describe('MembersList', () => {
               plan: {
                 ...mockPlanData,
                 value: planName,
-                isFreePlan: planName === Plans.USERS_BASIC,
+                isFreePlan: planName === Plans.USERS_DEVELOPER,
                 isTeamPlan:
                   planName === Plans.USERS_TEAMM ||
                   planName === Plans.USERS_TEAMY,
@@ -347,7 +347,7 @@ describe('MembersList', () => {
           const { user } = setup({
             hasSeatsLeft: false,
             planUserCount: 1,
-            planName: Plans.USERS_BASIC,
+            planName: Plans.USERS_DEVELOPER,
           })
 
           render(<MembersList />, { wrapper })
@@ -373,7 +373,7 @@ describe('MembersList', () => {
           const { user } = setup({
             hasSeatsLeft: true,
             planUserCount: 1,
-            planName: Plans.USERS_BASIC,
+            planName: Plans.USERS_DEVELOPER,
           })
           render(<MembersList />, { wrapper })
 

diff --git a/src/pages/MembersPage/MembersList/MembersTable/MembersTable.test.jsx b/src/pages/MembersPage/MembersList/MembersTable/MembersTable.test.jsx
@@ -97,7 +97,7 @@ const mockPlanData = {
   baseUnitPrice: 10,
   benefits: [],
   billingRate: 'monthly',
-  marketingName: 'Users Basic',
+  marketingName: 'Users Developer',
   monthlyUploadLimit: 250,
   trialStatus: TrialStatuses.NOT_STARTED,
   trialStartDate: '',
@@ -132,7 +132,7 @@ describe('MembersTable', () => {
   function setup({
     mockUserRequest = mockBaseUserRequest(false),
     usePaginatedRequest = false,
-    planName = Plans.USERS_BASIC,
+    planName = Plans.USERS_DEVELOPER,
     planUserCount = 0,
     hasSeatsLeft = false,
   }) {
@@ -160,10 +160,13 @@ describe('MembersTable', () => {
               plan: {
                 ...mockPlanData,
                 value: planName,
-                isFreePlan: planName === Plans.USERS_BASIC,
+                isFreePlan:
+                  planName === Plans.USERS_DEVELOPER ||
+                  planName === Plans.USERS_BASIC,
                 isTeamPlan:
                   planName === Plans.USERS_TEAMM ||
-                  planName === Plans.USERS_TEAMY,
+                  planName === Plans.USERS_TEAMY ||
+                  planName === Plans.USERS_DEVELOPER,
                 planUserCount,
                 hasSeatsLeft,
               },
@@ -319,7 +322,7 @@ describe('MembersTable', () => {
             describe('there are no open seats', () => {
               beforeEach(() =>
                 setup({
-                  planName: Plans.USERS_BASIC,
+                  planName: Plans.USERS_DEVELOPER,
                   hasSeatsLeft: false,
                   planUserCount: 1,
                 })
@@ -337,7 +340,7 @@ describe('MembersTable', () => {
           describe('there are open seats', () => {
             beforeEach(() =>
               setup({
-                planName: Plans.USERS_BASIC,
+                planName: Plans.USERS_DEVELOPER,
                 hasSeatsLeft: true,
                 planUserCount: 1,
               })
@@ -378,7 +381,7 @@ describe('MembersTable', () => {
       it('calls handleActivate', async () => {
         const { user } = setup({
           mockUserRequest: mockBaseUserRequest({ student: true }),
-          planName: Plans.USERS_BASIC,
+          planName: Plans.USERS_DEVELOPER,
           planUserCount: 1,
           hasSeatsLeft: false,
         })