@@ -685,13 +685,15 @@ def test_owner_available_plans(self):
685685 }
686686 """ % (current_org .username )
687687 data = self .gql_request (query , owner = current_org )
688- assert sorted ( data [ "owner" ][ "availablePlans" ]) == sorted ( [
688+ expected_plans = [
689689 {"value" : "users-pr-inappm" },
690690 {"value" : "users-pr-inappy" },
691691 {"value" : "users-teamm" },
692692 {"value" : "users-teamy" },
693693 {"value" : DEFAULT_FREE_PLAN },
694- ])
694+ ]
695+ for plan in expected_plans :
696+ self .assertIn (plan , data ["owner" ]["availablePlans" ])
695697
696698 def test_owner_query_with_no_service (self ):
697699 current_org = OwnerFactory (
@@ -1120,79 +1122,77 @@ def test_fetch_activated_user_count_when_not_in_org_but_has_shared_account(self)
11201122 data = self .gql_request (query , owner = owner )
11211123 assert data ["owner" ]["activatedUserCount" ] == 2
11221124
1123- def test_fetch_available_plans_is_enterprise_plan (self ):
1124- current_org = OwnerFactory (
1125- username = "random-plan-user" ,
1126- service = "github" ,
1127- plan = DEFAULT_FREE_PLAN ,
1128- )
11291125
1130- query = """{
1131- owner(username: "%s") {
1132- availablePlans {
1133- value
1134- isEnterprisePlan
1135- isProPlan
1136- isTeamPlan
1137- isSentryPlan
1138- isFreePlan
1139- isTrialPlan
1140- }
1126+ def test_fetch_available_plans_is_enterprise_plan (self ):
1127+ current_org = OwnerFactory (
1128+ username = "random-plan-user" ,
1129+ service = "github" ,
1130+ plan = DEFAULT_FREE_PLAN ,
1131+ )
1132+ query = """{
1133+ owner(username: "%s") {
1134+ availablePlans {
1135+ value
1136+ isEnterprisePlan
1137+ isProPlan
1138+ isTeamPlan
1139+ isSentryPlan
1140+ isFreePlan
1141+ isTrialPlan
11411142 }
11421143 }
1143- """ % (current_org .username )
1144- data = self .gql_request (query , owner = current_org )
1145- assert sorted (data ) == sorted ({
1146- "owner" : {
1147- "availablePlans" : [
1148- {
1149- "value" : "users-pr-inappm" ,
1150- "isEnterprisePlan" : False ,
1151- "isProPlan" : True ,
1152- "isTeamPlan" : False ,
1153- "isSentryPlan" : False ,
1154- "isFreePlan" : False ,
1155- "isTrialPlan" : False ,
1156- },
1157- {
1158- "value" : "users-pr-inappy" ,
1159- "isEnterprisePlan" : False ,
1160- "isProPlan" : True ,
1161- "isTeamPlan" : False ,
1162- "isSentryPlan" : False ,
1163- "isFreePlan" : False ,
1164- "isTrialPlan" : False ,
1165- },
1166- {
1167- "value" : "users-teamm" ,
1168- "isEnterprisePlan" : False ,
1169- "isProPlan" : False ,
1170- "isTeamPlan" : True ,
1171- "isSentryPlan" : False ,
1172- "isFreePlan" : False ,
1173- "isTrialPlan" : False ,
1174- },
1175- {
1176- "value" : "users-teamy" ,
1177- "isEnterprisePlan" : False ,
1178- "isProPlan" : False ,
1179- "isTeamPlan" : True ,
1180- "isSentryPlan" : False ,
1181- "isFreePlan" : False ,
1182- "isTrialPlan" : False ,
1183- },
1184- {
1185- "value" : DEFAULT_FREE_PLAN ,
1186- "isEnterprisePlan" : False ,
1187- "isProPlan" : False ,
1188- "isTeamPlan" : True ,
1189- "isSentryPlan" : False ,
1190- "isFreePlan" : True ,
1191- "isTrialPlan" : False ,
1192- },
1193- ]
1194- }
1195- })
1144+ }
1145+ """ % (current_org .username )
1146+ data = self .gql_request (query , owner = current_org )
1147+ expected_plans = [
1148+ {
1149+ "value" : "users-pr-inappm" ,
1150+ "isEnterprisePlan" : False ,
1151+ "isProPlan" : True ,
1152+ "isTeamPlan" : False ,
1153+ "isSentryPlan" : False ,
1154+ "isFreePlan" : False ,
1155+ "isTrialPlan" : False ,
1156+ },
1157+ {
1158+ "value" : "users-pr-inappy" ,
1159+ "isEnterprisePlan" : False ,
1160+ "isProPlan" : True ,
1161+ "isTeamPlan" : False ,
1162+ "isSentryPlan" : False ,
1163+ "isFreePlan" : False ,
1164+ "isTrialPlan" : False ,
1165+ },
1166+ {
1167+ "value" : "users-teamm" ,
1168+ "isEnterprisePlan" : False ,
1169+ "isProPlan" : False ,
1170+ "isTeamPlan" : True ,
1171+ "isSentryPlan" : False ,
1172+ "isFreePlan" : False ,
1173+ "isTrialPlan" : False ,
1174+ },
1175+ {
1176+ "value" : "users-teamy" ,
1177+ "isEnterprisePlan" : False ,
1178+ "isProPlan" : False ,
1179+ "isTeamPlan" : True ,
1180+ "isSentryPlan" : False ,
1181+ "isFreePlan" : False ,
1182+ "isTrialPlan" : False ,
1183+ },
1184+ {
1185+ "value" : DEFAULT_FREE_PLAN ,
1186+ "isEnterprisePlan" : False ,
1187+ "isProPlan" : False ,
1188+ "isTeamPlan" : True ,
1189+ "isSentryPlan" : False ,
1190+ "isFreePlan" : True ,
1191+ "isTrialPlan" : False ,
1192+ },
1193+ ]
1194+ for plan in expected_plans :
1195+ self .assertIn (plan , data ["owner" ]["availablePlans" ])
11961196
11971197 def test_fetch_owner_with_no_service (self ):
11981198 current_org = OwnerFactory (
0 commit comments