Fix error handling for missing contracts in config file

flowkit/tests/resources.go

@@ -376,6 +376,23 @@ var TestScriptWithImport = Resource{
 	`),
 }
 
+var TestScriptWithMissingContract = Resource{
+	Filename: "testScriptWithImport.cdc",
+	Source: []byte(`
+        import Test
+        import "ApprovalVoting"
+
+        pub fun setup() {
+            let err = Test.deployContract(
+                name: "ApprovalVoting",
+                path: "ApprovalVoting.cdc",
+                arguments: []
+            )
+            Test.expect(err, Test.beNil())
+        }
+	`),
+}
+
 var TestScriptWithHelperImport = Resource{
 	Filename: "testScriptWithHelperImport.cdc",
 	Source: []byte(`

internal/test/test.go

@@ -229,10 +229,12 @@ func importResolver(scriptPath string, state *flowkit.State) cdcTests.ImportReso
 				}
 			}
 
-		default:
+		}
+
+		if contract == nil {
 			return "", fmt.Errorf(
 				"cannot find contract with location '%s' in configuration",
-				scriptPath,
+				location,
 			)
 		}
 

internal/test/test_test.go

@@ -160,16 +160,40 @@ func TestExecutingTests(t *testing.T) {
 		assert.NoError(t, result.Results[script.Filename][0].Error)
 	})
 
-	t.Run("with missing contract location from config", func(t *testing.T) {
+	t.Run("with missing contract in config", func(t *testing.T) {
+		t.Parallel()
+
+		// Setup
+		_, state, _ := util.TestMocks(t)
+
+		// Execute script
+		script := tests.TestScriptWithMissingContract
+		testFiles := map[string][]byte{
+			script.Filename: script.Source,
+		}
+		_, err := testCode(testFiles, state, flagsTests{})
+
+		require.Error(t, err)
+		assert.ErrorContains(
+			t,
+			err,
+			"cannot find contract with location 'ApprovalVoting' in configuration",
+		)
+	})
+
+	t.Run("with missing testing alias in config", func(t *testing.T) {
 		t.Parallel()
 
 		// Setup
 		_, state, _ := util.TestMocks(t)
 
 		c := config.Contract{
 			Name:     tests.ContractHelloString.Name,
-			Location: "SomeHelloContract.cdc",
-			Aliases:  aliases,
+			Location: tests.ContractHelloString.Filename,
+			Aliases: config.Aliases{{
+				Network: "emulator",
+				Address: flow.HexToAddress("0x0000000000000007"),
+			}},
 		}
 		state.Contracts().AddOrUpdate(c)
 
@@ -181,10 +205,10 @@ func TestExecutingTests(t *testing.T) {
 		_, err := testCode(testFiles, state, flagsTests{})
 
 		require.Error(t, err)
-		assert.Error(
+		assert.ErrorContains(
 			t,
 			err,
-			"cannot find contract with location 'contractHello.cdc' in configuration",
+			"unable to find 'testing' alias for contract: Hello",
 		)
 	})