diff --git a/modules/nf-commons/src/test/nextflow/plugin/extension/PluginExtensionMethodsTest.groovy b/modules/nf-commons/src/test/nextflow/plugin/extension/PluginExtensionMethodsTest.groovy index 7c9f3107a6..25ec51be4e 100644 --- a/modules/nf-commons/src/test/nextflow/plugin/extension/PluginExtensionMethodsTest.groovy +++ b/modules/nf-commons/src/test/nextflow/plugin/extension/PluginExtensionMethodsTest.groovy @@ -17,19 +17,15 @@ package nextflow.plugin.extension -import nextflow.plugin.hello.HelloExtension - import java.nio.file.Path import nextflow.Channel import nextflow.exception.DuplicateModuleFunctionException import nextflow.plugin.Plugins import nextflow.plugin.TestPluginManager -import nextflow.plugin.extension.PluginExtensionProvider import spock.lang.Shared import spock.lang.TempDir import test.Dsl2Spec -import test.MockScriptRunner /** * * @author Jorge Aguilera @@ -202,7 +198,7 @@ class PluginExtensionMethodsTest extends Dsl2Spec { ''' when: - def result = dsl_eval(SCRIPT_TEXT) + dsl_eval(SCRIPT_TEXT) then: thrown(IllegalStateException) @@ -245,7 +241,7 @@ class PluginExtensionMethodsTest extends Dsl2Spec { ''' when: - def result = dsl_eval(SCRIPT_TEXT) + dsl_eval(SCRIPT_TEXT) then: thrown(IllegalStateException) @@ -338,7 +334,7 @@ class PluginExtensionMethodsTest extends Dsl2Spec { ''' when: - def result = new MockScriptRunner([:]).setScript(SCRIPT).execute() + def result = dsl_eval(SCRIPT) then: result.val == 'hi' @@ -407,7 +403,7 @@ class PluginExtensionMethodsTest extends Dsl2Spec { SCRIPT.text = SCRIPT_TEXT when: - def result = new MockScriptRunner([:]).setScript(SCRIPT).execute() + def result = dsl_eval(SCRIPT) then: result.val == EXPECTED @@ -445,7 +441,7 @@ class PluginExtensionMethodsTest extends Dsl2Spec { """.stripIndent() when: - new MockScriptRunner([:]).setScript(SCRIPT).execute() + dsl_eval(SCRIPT) then: thrown(DuplicateModuleFunctionException) @@ -491,7 +487,7 @@ class PluginExtensionMethodsTest extends Dsl2Spec { """.stripIndent() when: - new MockScriptRunner([:]).setScript(SCRIPT).execute() + dsl_eval(SCRIPT) then: thrown(DuplicateModuleFunctionException)