Refactor account sorting logic to a fixture

Refactor shared setup for account sorting tests into a reusable fixture
to improve readability and reduce repeated boilerplate.

Author: kdaily

tests/unit/customizations/configure/test_sso.py

@@ -374,6 +374,43 @@ def role_name_select(role_name):
     return SelectMenu(answer=role_name, expected_choices=[role_name, "roleB"])
 
 
+@pytest.fixture
+def stub_account_sorting_flow(
+    ptk_stubber,
+    stub_sso_list_accounts,
+    stub_sso_list_roles,
+    start_url_prompt,
+    sso_region_prompt,
+    region_prompt,
+    output_prompt,
+    profile_prompt,
+    account_id,
+    role_name,
+):
+    def _stub(accounts, expected_sorted_accounts, selected_account):
+        account_select = SelectMenu(
+            answer=selected_account,
+            expected_choices=expected_sorted_accounts,
+        )
+        ptk_stubber.user_inputs = UserInputs(
+            session_prompt=RecommendedSessionPrompt(answer=""),
+            start_url_prompt=start_url_prompt,
+            sso_region_prompt=sso_region_prompt,
+            account_id_select=account_select,
+            role_name_select=None,
+            region_prompt=region_prompt,
+            output_prompt=output_prompt,
+            profile_prompt=profile_prompt,
+        )
+        stub_sso_list_accounts(accounts)
+        stub_sso_list_roles(
+            [role_name],
+            expected_account_id=account_id,
+        )
+
+    return _stub
+
+
 @pytest.fixture
 def region_prompt():
     return RegionPrompt(answer="us-west-2", expected_default=None)
@@ -1530,195 +1567,85 @@ def test_single_account_single_role_device_code_fallback(
     def test_account_list_sorted_by_name(
         self,
         sso_cmd,
-        ptk_stubber,
-        stub_sso_list_accounts,
-        stub_sso_list_roles,
+        stub_account_sorting_flow,
         args,
         parsed_globals,
-        start_url_prompt,
-        sso_region_prompt,
-        region_prompt,
-        output_prompt,
-        profile_prompt,
         account_id,
-        role_name,
     ):
-        selected_account = {
+        selected = {
             'accountId': account_id,
             'accountName': 'Charlie',
             'emailAddress': 'charlie@example.com',
         }
-        first_account = {
+        first = {
             'accountId': '1111111111',
             'accountName': 'Alpha',
             'emailAddress': 'alpha@example.com',
         }
-        second_account = {
+        second = {
             'accountId': '2222222222',
             'accountName': 'Bravo',
             'emailAddress': 'bravo@example.com',
         }
-        third_account = {
+        third = {
             'accountId': '3333333333',
             'accountName': 'Delta',
             'emailAddress': 'delta@example.com',
         }
-        accounts = [
-            selected_account,
-            second_account,
-            third_account,
-            first_account,
-        ]
-        expected_accounts = [
-            first_account,
-            second_account,
-            selected_account,
-            third_account,
-        ]
-        account_select = SelectMenu(
-            answer=selected_account,
-            expected_choices=expected_accounts,
-        )
-        ptk_stubber.user_inputs = UserInputs(
-            session_prompt=RecommendedSessionPrompt(answer=""),
-            start_url_prompt=start_url_prompt,
-            sso_region_prompt=sso_region_prompt,
-            account_id_select=account_select,
-            role_name_select=None,
-            region_prompt=region_prompt,
-            output_prompt=output_prompt,
-            profile_prompt=profile_prompt,
-        )
-        stub_sso_list_accounts(accounts)
-        stub_sso_list_roles(
-            [role_name],
-            expected_account_id=account_id,
+        stub_account_sorting_flow(
+            accounts=[selected, second, third, first],
+            expected_sorted_accounts=[first, second, selected, third],
+            selected_account=selected,
         )
         assert sso_cmd(args, parsed_globals) == 0
 
     def test_account_list_sorted_by_email(
         self,
         sso_cmd,
-        ptk_stubber,
-        stub_sso_list_accounts,
-        stub_sso_list_roles,
+        stub_account_sorting_flow,
         args,
         parsed_globals,
-        start_url_prompt,
-        sso_region_prompt,
-        region_prompt,
-        output_prompt,
-        profile_prompt,
         account_id,
-        role_name,
     ):
-        selected_account = {
+        selected = {
             'accountId': account_id,
             'emailAddress': 'charlie@example.com',
         }
-        first_account = {
+        first = {
             'accountId': '1111111111',
             'emailAddress': 'alpha@example.com',
         }
-        second_account = {
+        second = {
             'accountId': '2222222222',
             'emailAddress': 'bravo@example.com',
         }
-        third_account = {
+        third = {
             'accountId': '3333333333',
             'emailAddress': 'delta@example.com',
         }
-        accounts = [
-            selected_account,
-            third_account,
-            first_account,
-            second_account,
-        ]
-        expected_accounts = [
-            first_account,
-            second_account,
-            selected_account,
-            third_account,
-        ]
-        account_select = SelectMenu(
-            answer=selected_account,
-            expected_choices=expected_accounts,
-        )
-        ptk_stubber.user_inputs = UserInputs(
-            session_prompt=RecommendedSessionPrompt(answer=""),
-            start_url_prompt=start_url_prompt,
-            sso_region_prompt=sso_region_prompt,
-            account_id_select=account_select,
-            role_name_select=None,
-            region_prompt=region_prompt,
-            output_prompt=output_prompt,
-            profile_prompt=profile_prompt,
-        )
-        stub_sso_list_accounts(accounts)
-        stub_sso_list_roles(
-            [role_name],
-            expected_account_id=account_id,
+        stub_account_sorting_flow(
+            accounts=[selected, third, first, second],
+            expected_sorted_accounts=[first, second, selected, third],
+            selected_account=selected,
         )
         assert sso_cmd(args, parsed_globals) == 0
 
     def test_account_list_sorted_by_account_id(
         self,
         sso_cmd,
-        ptk_stubber,
-        stub_sso_list_accounts,
-        stub_sso_list_roles,
+        stub_account_sorting_flow,
         args,
         parsed_globals,
-        start_url_prompt,
-        sso_region_prompt,
-        region_prompt,
-        output_prompt,
-        profile_prompt,
         account_id,
-        role_name,
     ):
-        selected_account = {
-            'accountId': account_id,
-        }
-        first_account = {
-            'accountId': '1111111111',
-        }
-        second_account = {
-            'accountId': '2222222222',
-        }
-        third_account = {
-            'accountId': '3333333333',
-        }
-        accounts = [
-            third_account,
-            selected_account,
-            first_account,
-            second_account,
-        ]
-        expected_accounts = [
-            selected_account,
-            first_account,
-            second_account,
-            third_account,
-        ]
-        account_select = SelectMenu(
-            answer=selected_account,
-            expected_choices=expected_accounts,
-        )
-        ptk_stubber.user_inputs = UserInputs(
-            session_prompt=RecommendedSessionPrompt(answer=""),
-            start_url_prompt=start_url_prompt,
-            sso_region_prompt=sso_region_prompt,
-            account_id_select=account_select,
-            role_name_select=None,
-            region_prompt=region_prompt,
-            output_prompt=output_prompt,
-            profile_prompt=profile_prompt,
-        )
-        stub_sso_list_accounts(accounts)
-        stub_sso_list_roles(
-            [role_name],
-            expected_account_id=account_id,
+        selected = {'accountId': account_id}
+        first = {'accountId': '1111111111'}
+        second = {'accountId': '2222222222'}
+        third = {'accountId': '3333333333'}
+        stub_account_sorting_flow(
+            accounts=[third, selected, first, second],
+            expected_sorted_accounts=[selected, first, second, third],
+            selected_account=selected,
         )
         assert sso_cmd(args, parsed_globals) == 0