menutraversal_test/group_test.json

@@ -1,67 +1,5 @@
 {
     "groups": [
-        {
-            "name": "main_my_vouchers_select_voucher_using_index",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "My vouchers\n1:Select voucher\n2:Voucher details\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Select number or symbol from your vouchers:\n1SRF\n0:Back\n99:Quit"
-                },
-                {
-                    "input": "",
-                    "expectedContent": "Select number or symbol from your vouchers:\n1SRF\n0:Back\n99:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Enter PIN to confirm selection:\nSymbol: SRF\nBalance: 2.745987\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Success! SRF is now your active voucher.\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "main_my_vouchers_select_voucher_using_symbol",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "My vouchers\n1:Select voucher\n2:Voucher details\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Select number or symbol from your vouchers:\n1SRF\n0:Back\n99:Quit"
-                },
-                {
-                    "input": "SRF",
-                    "expectedContent": "Enter PIN to confirm selection:\nSymbol: SRF\nBalance: 2.745987\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Success! SRF is now your active voucher.\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
         {
             "name": "my_account_change_pin",
             "steps": [
@@ -110,17 +48,13 @@
                     "input": "3",
                     "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                 },
-                {
-                    "input": "",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
                 {
                     "input": "2",
                     "expectedContent": "Please enter your PIN:"
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect PIN. You have: 2 remaining attempt(s).\n1:Retry\n9:Quit"
                 },
                 {
                     "input": "1",
@@ -140,121 +74,6 @@
                 }
             ]
         },
-        {
-            "name": "menu_my_account_reset_others_pin_with_unregistered_number",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "5",
-                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "Enter other's phone number:\n0:Back"
-                },
-                {
-                    "input": "0700000001",
-                    "expectedContent": "The number you have entered is either not registered with Sarafu or is invalid.\n1:Retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Enter other's phone number:\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_reset_others_pin_with_registered_number",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "5",
-                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "Enter other's phone number:\n0:Back"
-                },
-                {
-                    "input": "0700000000",
-                    "expectedContent": "Please enter new PIN for: {secondary_session_id}\n0:Back"
-                },
-                {
-                    "input": "11111",
-                    "expectedContent": "The PIN you have entered is invalid.Please try a 4 digit number instead.\n1:Retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter new PIN for: {secondary_session_id}\n0:Back"
-                },
-                {
-                    "input": "1111",
-                    "expectedContent": "Please confirm new PIN for: {secondary_session_id}\n0:Back"
-                },
-                {
-                    "input": "1111",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "PIN reset request for {secondary_session_id} was successful\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_reset_others_pin_with_no_privileges",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "5",
-                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "You do not have privileges to perform this action\n\n9:Quit\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
         {
             "name": "menu_my_account_check_my_balance",
             "steps": [
@@ -276,7 +95,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect PIN. You have: 2 remaining attempt(s).\n1:Retry\n9:Quit"
                 },
                 {
                     "input": "1",
@@ -321,7 +140,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect PIN. You have: 2 remaining attempt(s).\n1:Retry\n9:Quit"
                 },
                 {
                     "input": "1",
@@ -458,10 +277,6 @@
                     "input": "3",
                     "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
                 },
-                {
-                    "input": "",
-                    "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
-                },
                 {
                     "input": "1",
                     "expectedContent": "Please enter your PIN:"
@@ -623,47 +438,6 @@
                     "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                 }
             ]
-        },
-        {
-            "name": "menu_block_account_via_view_profile",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "7",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1254",
-                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1254",
-                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1254",
-                    "expectedContent": "Your account has been locked. For help on how to unblock your account, contact support at: 0757628885"
-                }
-            ]
         }
     ]
 }

menutraversal_test/menu_traversal_test.go

@@ -21,7 +21,6 @@ var (
 	sessionID string
 	src       = rand.NewSource(42)
 	g         = rand.New(src)
-	secondarySessionId = "0700000000"
 )
 
 var groupTestFile = flag.String("test-file", "group_test.json", "The test file to use for running the group tests")
@@ -68,16 +67,6 @@ func extractMaxAmount(response []byte) string {
 	return ""
 }
 
-func extractRemainingAttempts(response []byte) string {
-	// Regex to match "You have: <number> remaining attempt(s)"
-	re := regexp.MustCompile(`(?m)You have:\s+(\d+)\s+remaining attempt\(s\)`)
-	match := re.FindSubmatch(response)
-	if match != nil {
-		return string(match[1]) // "<number>" of remaining attempts
-	}
-	return ""
-}
-
 // Extracts the send amount value from the engine response.
 func extractSendAmount(response []byte) string {
 	// Regex to match the pattern "will receive X.XX SYM from"
@@ -98,43 +87,7 @@ func TestMain(m *testing.M) {
 }
 
 func TestAccountCreationSuccessful(t *testing.T) {
-	en, fn, eventChannel, _, _ := testutil.TestEngine(sessionID)
+	en, fn, eventChannel := testutil.TestEngine(sessionID)
-	defer fn()
-	ctx := context.Background()
-	sessions := testData
-	for _, session := range sessions {
-		groups := driver.FilterGroupsByName(session.Groups, "account_creation_successful")
-		for _, group := range groups {
-			for i, step := range group.Steps {
-				logg.TraceCtxf(ctx, "executing step", "i", i, "step", step)
-				cont, err := en.Exec(ctx, []byte(step.Input))
-				if err != nil {
-					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
-				}
-				if !cont {
-					break
-				}
-				w := bytes.NewBuffer(nil)
-				_, err = en.Flush(ctx, w)
-				if err != nil {
-					t.Fatalf("Test case '%s' failed during Flush: %v", group.Name, err)
-				}
-				b := w.Bytes()
-				match, err := step.MatchesExpectedContent(b)
-				if err != nil {
-					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
-				}
-				if !match {
-					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", step.ExpectedContent, b)
-				}
-			}
-		}
-	}
-	<-eventChannel
-}
-
-func TestSecondaryAccount(t *testing.T) {
-	en, fn, eventChannel, _, _ := testutil.TestEngine(secondarySessionId)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@@ -177,7 +130,7 @@ func TestAccountRegistrationRejectTerms(t *testing.T) {
 		t.Fail()
 	}
 	edgeCaseSessionID := v.String()
-	en, fn, _, _, _ := testutil.TestEngine(edgeCaseSessionID)
+	en, fn, _ := testutil.TestEngine(edgeCaseSessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@@ -213,7 +166,7 @@ func TestAccountRegistrationRejectTerms(t *testing.T) {
 }
 
 func TestMainMenuHelp(t *testing.T) {
-	en, fn, _, _, _ := testutil.TestEngine(sessionID)
+	en, fn, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@@ -255,7 +208,7 @@ func TestMainMenuHelp(t *testing.T) {
 }
 
 func TestMainMenuQuit(t *testing.T) {
-	en, fn, _, _, _ := testutil.TestEngine(sessionID)
+	en, fn, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@@ -296,7 +249,7 @@ func TestMainMenuQuit(t *testing.T) {
 }
 
 func TestMyAccount_MyAddress(t *testing.T) {
-	en, fn, _, _, _ := testutil.TestEngine(sessionID)
+	en, fn, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@@ -340,7 +293,7 @@ func TestMyAccount_MyAddress(t *testing.T) {
 }
 
 func TestMainMenuSend(t *testing.T) {
-	en, fn, _, _, _ := testutil.TestEngine(sessionID)
+	en, fn, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@@ -391,12 +344,9 @@ func TestGroups(t *testing.T) {
 	if err != nil {
 		log.Fatalf("Failed to load test groups: %v", err)
 	}
-	en, fn, _, pe, flagParser := testutil.TestEngine(sessionID)
+	en, fn, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
-
-	flag_admin_privilege, _ := flagParser.GetFlag("flag_admin_privilege")
-
 	// Create test cases from loaded groups
 	tests := driver.CreateTestCases(groups)
 	for _, tt := range tests {
@@ -415,21 +365,9 @@ func TestGroups(t *testing.T) {
 			}
 			b := w.Bytes()
 			balance := extractBalance(b)
-			attempts := extractRemainingAttempts(b)
-
-			st := pe.GetState()
-
-			if st != nil {
-				st.SetFlag(flag_admin_privilege)
-				if tt.Name == "menu_my_account_reset_others_pin_with_no_privileges" {
-					st.ResetFlag(flag_admin_privilege)
-				}
-			}
 
 			expectedContent := []byte(tt.ExpectedContent)
 			expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
-			expectedContent = bytes.Replace(expectedContent, []byte("{attempts}"), []byte(attempts), -1)
-			expectedContent = bytes.Replace(expectedContent, []byte("{secondary_session_id}"), []byte(secondarySessionId), -1)
 
 			tt.ExpectedContent = string(expectedContent)
 

services/registration/incorrect_pin.vis

@@ -7,4 +7,3 @@ MOUT quit 9
 HALT
 INCMP _ 1
 INCMP quit 9
-INCMP . *

testutil/engine.go

@@ -9,9 +9,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"git.defalsify.org/vise.git/asm"
 	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
 	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
 	httpremote "git.grassecon.net/grassrootseconomics/sarafu-api/remote/http"
@@ -62,7 +60,7 @@ func CleanDatabase() {
 	}
 }
 
-func TestEngine(sessionId string) (engine.Engine, func(), chan bool, *persist.Persister, *asm.FlagParser) {
+func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 	config.LoadConfig()
 	err := config.Apply(override)
 	if err != nil {
@@ -77,12 +75,6 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool, *persist.Pe
 	logg.InfoCtxf(ctx, "loaded engine setup", "conns", conns)
 	pfp := path.Join(scriptDir, "pp.csv")
 
-	parser := asm.NewFlagParser()
-	_, err = parser.Load(pfp)
-	if err != nil {
-		os.Exit(1)
-	}
-
 	var eventChannel = make(chan bool)
 
 	cfg := engine.Config{
@@ -165,5 +157,5 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool, *persist.Pe
 		}
 		logg.Infof("testengine storage closed")
 	}
-	return en, cleanFn, eventChannel, pe, parser
+	return en, cleanFn, eventChannel
 }

testutil/engine_test.go

@@ -5,7 +5,7 @@ import (
 )
 
 func TestCreateEngine(t *testing.T) {
-	o, clean, eventC, _, _ := TestEngine("foo")
+	o, clean, eventC := TestEngine("foo")
 	defer clean()
 	defer func() {
 		<-eventC