Remove ReportingGebSpec

grails · Dec 16, 2024 · 891308e · 891308e
1 parent a1da663
commit 891308e
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 11 deletions.
diff --git a/...nctional-test-app/src/integration-test/groovy/specs/AbstractHyphenatedSecuritySpec.groovy b/...nctional-test-app/src/integration-test/groovy/specs/AbstractHyphenatedSecuritySpec.groovy
@@ -1,5 +1,8 @@
 package specs
 
+import grails.testing.mixin.integration.Integration
+
+@Integration
 abstract class AbstractHyphenatedSecuritySpec extends AbstractSecuritySpec {
 
 	protected void resetDatabase() {

diff --git a/examples/functional-test-app/src/integration-test/groovy/specs/AbstractSecuritySpec.groovy b/examples/functional-test-app/src/integration-test/groovy/specs/AbstractSecuritySpec.groovy
@@ -1,33 +1,26 @@
 package specs
 
 import com.testapp.TestDataService
+import functional.test.app.Application
 import geb.driver.CachingDriverFactory
-import geb.spock.GebReportingSpec
+import grails.plugin.geb.ContainerGebSpec
 import grails.plugin.springsecurity.SpringSecurityCoreGrailsPlugin
 import grails.plugin.springsecurity.SpringSecurityUtils
 import grails.testing.mixin.integration.Integration
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.security.crypto.password.MessageDigestPasswordEncoder
 import pages.LoginPage
 import spock.lang.Shared
-import spock.lang.Stepwise
 
-@Integration(applicationClass = functional.test.app.Application)
-@Stepwise
-abstract class AbstractSecuritySpec extends GebReportingSpec {
+@Integration(applicationClass = Application)
+abstract class AbstractSecuritySpec extends ContainerGebSpec {
 
 	private @Shared boolean databaseReset = false
 
 	@Autowired
 	TestDataService testDataService
 
 	void setup() {
-		if ( hasProperty('serverPort') ) {
-			browser.baseUrl = "http://localhost:${getProperty('serverPort')}/"
-		} else {
-			browser.baseUrl = 'http://localhost:8080/'
-		}
-
 		logout()
 
 		// call resetDatabase() once per suite, before the first test; would

diff --git a/examples/functional-test-app/src/integration-test/groovy/specs/AnnotationSecuritySpec.groovy b/examples/functional-test-app/src/integration-test/groovy/specs/AnnotationSecuritySpec.groovy
@@ -1,5 +1,6 @@
 package specs
 
+import grails.testing.mixin.integration.Integration
 import pages.IndexPage
 import pages.LoginPage
 import pages.role.CreateRolePage
@@ -10,6 +11,7 @@ import pages.user.ListUserPage
 import pages.user.ShowUserPage
 import spock.lang.IgnoreIf
 
+@Integration
 @IgnoreIf({ System.getProperty('TESTCONFIG') != 'annotation' })
 class AnnotationSecuritySpec extends AbstractSecuritySpec {
 

diff --git a/examples/functional-test-app/src/integration-test/groovy/specs/BCryptSpec.groovy b/examples/functional-test-app/src/integration-test/groovy/specs/BCryptSpec.groovy
@@ -1,10 +1,12 @@
 package specs
 
+import grails.testing.mixin.integration.Integration
 import pages.user.CreateUserPage
 import pages.user.ListUserPage
 import pages.user.ShowUserPage
 import spock.lang.IgnoreIf
 
+@Integration
 @IgnoreIf({ System.getProperty('TESTCONFIG') != 'bcrypt' })
 class BCryptSpec extends AbstractSecuritySpec {
 

diff --git a/...ctional-test-app/src/integration-test/groovy/specs/BasicAuthCacheUsersSecuritySpec.groovy b/...ctional-test-app/src/integration-test/groovy/specs/BasicAuthCacheUsersSecuritySpec.groovy
@@ -1,5 +1,6 @@
 package specs
 
+import grails.testing.mixin.integration.Integration
 import org.springframework.security.core.userdetails.UserCache
 import pages.LoginPage
 import pages.role.CreateRolePage
@@ -10,6 +11,7 @@ import pages.user.ListUserPage
 import pages.user.ShowUserPage
 import spock.lang.IgnoreIf
 
+@Integration
 @IgnoreIf({ System.getProperty('TESTCONFIG') != 'basicCacheUsers' })
 class BasicAuthCacheUsersSecuritySpec extends AbstractSecuritySpec {
 

diff --git a/examples/functional-test-app/src/integration-test/groovy/specs/BasicAuthSecuritySpec.groovy b/examples/functional-test-app/src/integration-test/groovy/specs/BasicAuthSecuritySpec.groovy
@@ -1,5 +1,6 @@
 package specs
 
+import grails.testing.mixin.integration.Integration
 import pages.LoginPage
 import pages.role.CreateRolePage
 import pages.role.ListRolePage
@@ -9,6 +10,7 @@ import pages.user.ListUserPage
 import pages.user.ShowUserPage
 import spock.lang.IgnoreIf
 
+@Integration
 @IgnoreIf({ System.getProperty('TESTCONFIG') != 'basic' })
 class BasicAuthSecuritySpec extends AbstractSecuritySpec {
 

diff --git a/examples/functional-test-app/src/integration-test/groovy/specs/DisableSpec.groovy b/examples/functional-test-app/src/integration-test/groovy/specs/DisableSpec.groovy
@@ -1,8 +1,11 @@
 package specs
 
+import grails.testing.mixin.integration.Integration
 import pages.IndexPage
 import spock.lang.IgnoreIf
 
+
+@Integration
 @IgnoreIf({ System.getProperty('TESTCONFIG') != 'misc' })
 class DisableSpec extends AbstractHyphenatedSecuritySpec {
 

diff --git a/...ples/functional-test-app/src/integration-test/groovy/specs/InheritanceSecuritySpec.groovy b/...ples/functional-test-app/src/integration-test/groovy/specs/InheritanceSecuritySpec.groovy
@@ -1,9 +1,11 @@
 package specs
 
+import grails.testing.mixin.integration.Integration
 import pages.IndexPage
 import pages.LoginPage
 import spock.lang.IgnoreIf
 
+@Integration
 @IgnoreIf({ System.getProperty('TESTCONFIG') != 'annotation' })
 class InheritanceSecuritySpec extends AbstractSecuritySpec {
 

diff --git a/examples/functional-test-app/src/integration-test/groovy/specs/MiscSpec.groovy b/examples/functional-test-app/src/integration-test/groovy/specs/MiscSpec.groovy
@@ -1,11 +1,13 @@
 package specs
 
 import geb.module.TextInput
+import grails.testing.mixin.integration.Integration
 import org.springframework.security.crypto.password.PasswordEncoder
 import pages.IndexPage
 import spock.lang.IgnoreIf
 import spock.lang.Issue
 
+@Integration
 @IgnoreIf({ System.getProperty('TESTCONFIG') != 'misc' })
 class MiscSpec extends AbstractHyphenatedSecuritySpec {
 

diff --git a/examples/functional-test-app/src/integration-test/groovy/specs/NamespaceSecuritySpec.groovy b/examples/functional-test-app/src/integration-test/groovy/specs/NamespaceSecuritySpec.groovy
@@ -1,11 +1,13 @@
 package specs
 
+import grails.testing.mixin.integration.Integration
 import groovy.json.JsonSlurper
 import pages.IndexPage
 import pages.LoginPage
 import spock.lang.IgnoreIf
 import spock.lang.Unroll
 
+@Integration
 @IgnoreIf({ System.getProperty('TESTCONFIG') != 'annotation' })
 class NamespaceSecuritySpec extends AbstractSecuritySpec {
 

diff --git a/examples/functional-test-app/src/integration-test/groovy/specs/RequestmapSecuritySpec.groovy b/examples/functional-test-app/src/integration-test/groovy/specs/RequestmapSecuritySpec.groovy
@@ -1,6 +1,7 @@
 package specs
 
 import com.testapp.TestDataService
+import grails.testing.mixin.integration.Integration
 import pages.IndexPage
 import pages.LoginPage
 import pages.requestmap.CreateRequestmapPage
@@ -14,6 +15,7 @@ import pages.user.ListUserPage
 import pages.user.ShowUserPage
 import spock.lang.IgnoreIf
 
+@Integration
 @IgnoreIf({ System.getProperty('TESTCONFIG') != 'requestmap' })
 class RequestmapSecuritySpec extends AbstractSecuritySpec {
 

diff --git a/examples/functional-test-app/src/integration-test/groovy/specs/RequestmapSpec.groovy b/examples/functional-test-app/src/integration-test/groovy/specs/RequestmapSpec.groovy
@@ -1,12 +1,14 @@
 package specs
 
 import com.testapp.TestDataService
+import grails.testing.mixin.integration.Integration
 import pages.requestmap.CreateRequestmapPage
 import pages.requestmap.EditRequestmapPage
 import pages.requestmap.ListRequestmapPage
 import pages.requestmap.ShowRequestmapPage
 import spock.lang.IgnoreIf
 
+@Integration
 @IgnoreIf({ System.getProperty('TESTCONFIG') != 'requestmap' })
 class RequestmapSpec extends AbstractSecuritySpec {
 

diff --git a/examples/functional-test-app/src/integration-test/groovy/specs/RoleSpec.groovy b/examples/functional-test-app/src/integration-test/groovy/specs/RoleSpec.groovy
@@ -1,11 +1,13 @@
 package specs
 
+import grails.testing.mixin.integration.Integration
 import pages.role.CreateRolePage
 import pages.role.EditRolePage
 import pages.role.ListRolePage
 import pages.role.ShowRolePage
 import spock.lang.IgnoreIf
 
+@Integration
 @IgnoreIf({ !(
 		System.getProperty('TESTCONFIG') == 'annotation' ||
         System.getProperty('TESTCONFIG') == 'basic' ||

diff --git a/examples/functional-test-app/src/integration-test/groovy/specs/StaticSecuritySpec.groovy b/examples/functional-test-app/src/integration-test/groovy/specs/StaticSecuritySpec.groovy
@@ -1,5 +1,6 @@
 package specs
 
+import grails.testing.mixin.integration.Integration
 import pages.IndexPage
 import pages.role.CreateRolePage
 import pages.role.ListRolePage
@@ -9,6 +10,7 @@ import pages.user.ListUserPage
 import pages.user.ShowUserPage
 import spock.lang.IgnoreIf
 
+@Integration
 @IgnoreIf({ System.getProperty('TESTCONFIG') != 'static' })
 class StaticSecuritySpec extends AbstractSecuritySpec {
 

diff --git a/examples/functional-test-app/src/integration-test/groovy/specs/UserSpec.groovy b/examples/functional-test-app/src/integration-test/groovy/specs/UserSpec.groovy
@@ -1,11 +1,13 @@
 package specs
 
+import grails.testing.mixin.integration.Integration
 import pages.user.CreateUserPage
 import pages.user.EditUserPage
 import pages.user.ListUserPage
 import pages.user.ShowUserPage
 import spock.lang.IgnoreIf
 
+@Integration
 @IgnoreIf({ !(
 		System.getProperty('TESTCONFIG') == 'annotation' ||
 				System.getProperty('TESTCONFIG') == 'basic' ||