From bc1dfb0b5058273ad9f1185ca36523d8ca6a354b Mon Sep 17 00:00:00 2001
From: gkampitakis <gkabitakis@gmail.com>
Date: Fri, 19 May 2023 18:57:18 +0100
Subject: [PATCH 1/2] fix: baseCaller not returning correct path from godog

---
 snaps/utils.go | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/snaps/utils.go b/snaps/utils.go
index 6e7d0a0..f58d4ca 100644
--- a/snaps/utils.go
+++ b/snaps/utils.go
@@ -87,29 +87,21 @@ func baseCaller(skip int) string {
 		}
 
 		funcName := f.Name()
-		if funcName == "testing.tRunner" {
+		if funcName == "testing.tRunner" ||
+			// handles godoc case
+			funcName == "reflect.Value.call" ||
+			// e.g. funcName golang.org/x/tools/go/packages/packagestest.TestAll.func1
+			strings.Contains(funcName, "packagestest") {
 			break
 		}
 
 		// special case handling test runners
-		// tested with testify/suite, packagestest and testcase
+		// tested with testify/suite, and testcase
 		segments := strings.Split(funcName, ".")
 		for _, segment := range segments {
-			if !isTest(segment, "Test") {
-				continue
+			if isTest(segment, "Test") {
+				return file
 			}
-
-			// packagestest is same as tRunner where we step one caller further
-			// so we need to return the prevFile in testcase and testify/suite we return the current file
-			// e.g. funcName golang.org/x/tools/go/packages/packagestest.TestAll.func1
-			if strings.Contains(funcName, "packagestest") {
-				// return only the Function Name
-				// e.g. "go-snaps-testing-suite/src/issues.(*ExampleTestSuite).TestExampleSnapshot"
-				// will return TestExampleSnapshot
-				return prevFile
-			}
-
-			return file
 		}
 	}
 

From 134f13d2ac7178dab21a321e7b84dde38465938e Mon Sep 17 00:00:00 2001
From: gkampitakis <gkabitakis@gmail.com>
Date: Mon, 22 May 2023 18:43:08 +0100
Subject: [PATCH 2/2] fix: simplify baseCaller logic

---
 snaps/utils.go | 46 +++++++++++-----------------------------------
 1 file changed, 11 insertions(+), 35 deletions(-)

diff --git a/snaps/utils.go b/snaps/utils.go
index f58d4ca..e607c36 100644
--- a/snaps/utils.go
+++ b/snaps/utils.go
@@ -3,11 +3,10 @@ package snaps
 import (
 	"errors"
 	"os"
+	"path/filepath"
 	"runtime"
 	"strings"
 	"sync"
-	"unicode"
-	"unicode/utf8"
 
 	"github.com/gkampitakis/ciinfo"
 )
@@ -75,52 +74,29 @@ func baseCaller(skip int) string {
 	var (
 		pc             uintptr
 		file, prevFile string
+		ok             bool
 	)
 
 	for i := skip + 1; ; i++ {
 		prevFile = file
-		pc, file, _, _ = runtime.Caller(i)
+		pc, file, _, ok = runtime.Caller(i)
+		if !ok {
+			return prevFile
+		}
 
 		f := runtime.FuncForPC(pc)
 		if f == nil {
-			break
+			return prevFile
 		}
 
-		funcName := f.Name()
-		if funcName == "testing.tRunner" ||
-			// handles godoc case
-			funcName == "reflect.Value.call" ||
-			// e.g. funcName golang.org/x/tools/go/packages/packagestest.TestAll.func1
-			strings.Contains(funcName, "packagestest") {
-			break
+		if f.Name() == "testing.tRunner" {
+			return prevFile
 		}
 
-		// special case handling test runners
-		// tested with testify/suite, and testcase
-		segments := strings.Split(funcName, ".")
-		for _, segment := range segments {
-			if isTest(segment, "Test") {
-				return file
-			}
+		if strings.HasSuffix(filepath.Base(file), "_test.go") {
+			return file
 		}
 	}
-
-	return prevFile
-}
-
-// Stolen from the `go test` tool
-//
-// isTest tells whether name looks like a test
-// It is a Test (say) if there is a character after Test that is not a lower-case letter
-func isTest(name, prefix string) bool {
-	if !strings.HasPrefix(name, prefix) {
-		return false
-	}
-	if len(name) == len(prefix) { // "Test" is ok
-		return true
-	}
-	r, _ := utf8.DecodeRuneInString(name[len(prefix):])
-	return !unicode.IsLower(r)
 }
 
 // shouldUpdateSingle returns if a single should be updated or not