Rebase from master

Vampire · Vampire · commit 0e52358da80b · 2026-07-28T16:46:53.000+02:00
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataAstSpec/where_block_variables.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataAstSpec/where_block_variables.groovy
@@ -15,7 +15,7 @@ public void $spock_feature_0_0(java.lang.Object name, java.lang.Object greeting)
     catch (java.lang.Throwable $spock_condition_throwable) {
         org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'greeting == \"Hello, world\"', 1, 83, null, $spock_condition_throwable)}
     org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
-    this.getSpecificationContext().getMockController().leaveScope()
+    this.getSpecificationContext().getMockController().verifyLastScope()
 }
 
 @org.spockframework.runtime.model.DataProviderMetadata(line = 4, dataVariables = ['name'])
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataAstSpec/where_block_variables_combined_with_data_table__data_pipe__derived_variables__cross_multiplication_and_filter.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataAstSpec/where_block_variables_combined_with_data_table__data_pipe__derived_variables__cross_multiplication_and_filter.groovy
@@ -14,7 +14,7 @@ public void $spock_feature_0_0(java.lang.Object x, java.lang.Object y, java.lang
     catch (java.lang.Throwable $spock_condition_throwable) {
         org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'true', 2, 5, null, $spock_condition_throwable)}
     org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
-    this.getSpecificationContext().getMockController().leaveScope()
+    this.getSpecificationContext().getMockController().verifyLastScope()
 }
 
 public java.lang.Object $spock_feature_0_0prov0(java.lang.Object base, java.lang.Object sep) {
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataAstSpec/where_block_variables_with_multiple_assignment-groovy3_4.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataAstSpec/where_block_variables_with_multiple_assignment-groovy3_4.groovy
@@ -15,7 +15,7 @@ public void $spock_feature_0_0(java.lang.Object name, java.lang.Object greeting)
     catch (java.lang.Throwable $spock_condition_throwable) {
         org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'greeting == \"Hello, world!\"', 1, 83, null, $spock_condition_throwable)}
     org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
-    this.getSpecificationContext().getMockController().leaveScope()
+    this.getSpecificationContext().getMockController().verifyLastScope()
 }
 
 @org.spockframework.runtime.model.DataProviderMetadata(line = 4, dataVariables = ['name'])
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataAstSpec/where_block_variables_with_multiple_assignment-groovy5.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataAstSpec/where_block_variables_with_multiple_assignment-groovy5.groovy
@@ -15,7 +15,7 @@ public void $spock_feature_0_0(java.lang.Object name, java.lang.Object greeting)
     catch (java.lang.Throwable $spock_condition_throwable) {
         org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'greeting == \"Hello, world!\"', 1, 83, null, $spock_condition_throwable)}
     org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
-    this.getSpecificationContext().getMockController().leaveScope()
+    this.getSpecificationContext().getMockController().verifyLastScope()
 }
 
 @org.spockframework.runtime.model.DataProviderMetadata(line = 4, dataVariables = ['name'])

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public void $spock_feature_0_0(java.lang.Object name, java.lang.Object greeting)`
`15`	`15`	`catch (java.lang.Throwable $spock_condition_throwable) {`
`16`	`16`	`org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'greeting == \"Hello, world\"', 1, 83, null, $spock_condition_throwable)}`
`17`	`17`	`org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)`
`18`		`- this.getSpecificationContext().getMockController().leaveScope()`
	`18`	`+ this.getSpecificationContext().getMockController().verifyLastScope()`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@org.spockframework.runtime.model.DataProviderMetadata(line = 4, dataVariables = ['name'])`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public void $spock_feature_0_0(java.lang.Object x, java.lang.Object y, java.lang`
`14`	`14`	`catch (java.lang.Throwable $spock_condition_throwable) {`
`15`	`15`	`org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'true', 2, 5, null, $spock_condition_throwable)}`
`16`	`16`	`org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)`
`17`		`- this.getSpecificationContext().getMockController().leaveScope()`
	`17`	`+ this.getSpecificationContext().getMockController().verifyLastScope()`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public java.lang.Object $spock_feature_0_0prov0(java.lang.Object base, java.lang.Object sep) {`