test: cleanup

Author: matrei

plugin-core/examples/functional-test-app/src/integration-test/groovy/specs/AbstractSecuritySpec.groovy

@@ -63,36 +63,28 @@ abstract class AbstractSecuritySpec extends ContainerGebSpec {
 	}
 
 	protected String getContent(String url) {
-		go url
+		go(url)
 		$().text()
 	}
 
 	protected String getSessionValue(String name) {
-		getContent 'hack/getSessionValue?name=' + name
+		getContent("hack/getSessionValue?name=$name")
 	}
 
 	protected void login(String user, String pwd = 'password', boolean remember = false) {
-		to LoginPage
-		username = user
-		password = pwd
+		def loginPage = to(LoginPage)
+		loginPage.username = user
+		loginPage.password = pwd
 		if (remember) {
-			rememberMe.click()
+			loginPage.rememberMe.click()
 		}
-		loginButton.click()
+		loginPage.loginButton.click()
 	}
 
 	protected void logout() {
-		go SpringSecurityUtils.securityConfig.logout.filterProcessesUrl
+		go(SpringSecurityUtils.securityConfig.logout.filterProcessesUrl)
 		browser.clearCookies()
-		browser.go("/")
-	}
-
-	protected void assertContentContains(String expected) {
-		assert $().text().contains(expected)
-	}
-
-	protected void assertContentDoesNotContain(String unexpected) {
-		assert !$().text().contains(unexpected)
+		browser.go('/')
 	}
 
 	protected MessageDigestPasswordEncoder createSha256Encoder() {

plugin-core/examples/functional-test-app/src/integration-test/groovy/specs/AnnotationSecuritySpec.groovy

@@ -214,73 +214,73 @@ class AnnotationSecuritySpec extends AbstractSecuritySpec {
 		go 'secureAnnotated'
 
 		then:
-		assertContentContains 'you have ROLE_ADMIN'
+		pageSource.contains('you have ROLE_ADMIN')
 
 		when:
 		go 'secureAnnotated/index'
 
 		then:
-		assertContentContains 'you have ROLE_ADMIN'
+		pageSource.contains('you have ROLE_ADMIN')
 
 		when:
 		go 'secureAnnotated/adminEither'
 
 		then:
-		assertContentContains 'you have ROLE_ADMIN'
+		pageSource.contains('you have ROLE_ADMIN')
 
 		when:
 		go 'secureClassAnnotated'
 
 		then:
-		assertContentContains 'you have ROLE_ADMIN'
+		pageSource.contains('you have ROLE_ADMIN')
 
 		when:
 		go 'secureClassAnnotated/index'
 
 		then:
-		assertContentContains 'you have ROLE_ADMIN'
+		pageSource.contains('you have ROLE_ADMIN')
 
 		when:
 		go 'secureClassAnnotated/otherAction'
 
 		then:
-		assertContentContains 'you have ROLE_ADMIN'
+		pageSource.contains('you have ROLE_ADMIN')
 
 		when:
 		go 'secureClassAnnotated/admin2'
 
 		then:
-		assertContentContains "Sorry, you're not authorized to view this page."
+		pageSource.contains('Sorry, you\'re not authorized to view this page.')
 
 		when:
 		go 'secureAnnotated/expression'
 
 		then:
-		assertContentContains 'expression: OK'
+		pageSource.contains('expression: OK')
 
 		when:
 		go 'secureAnnotated/indexMethod'
 
 		then:
-		assertContentContains 'you have ROLE_ADMIN'
+		pageSource.contains('you have ROLE_ADMIN')
 
 		when:
 		go 'secureAnnotated/adminEitherMethod'
 
 		then:
-		assertContentContains 'you have ROLE_ADMIN'
+		pageSource.contains('you have ROLE_ADMIN')
 
 		when:
 		go 'secureAnnotated/expressionMethod'
 
 		then:
-		assertContentContains 'OK - method'
+		pageSource.contains('OK - method')
 
 		when:
 		go 'secureAnnotated/closureMethod'
 
 		then:
-		assertContentContains 'OK - closureMethod'
+		pageSource.contains('OK - closureMethod')
 	}
 
 	void 'check allowed for admin2'() {
@@ -295,73 +295,73 @@ class AnnotationSecuritySpec extends AbstractSecuritySpec {
 		go 'secureAnnotated'
 
 		then:
-		assertContentContains 'you have ROLE_ADMIN'
+		pageSource.contains('you have ROLE_ADMIN')
 
 		when:
 		go 'secureAnnotated/index'
 
 		then:
-		assertContentContains 'you have ROLE_ADMIN'
+		pageSource.contains('you have ROLE_ADMIN')
 
 		when:
 		go 'secureAnnotated/adminEither'
 
 		then:
-		assertContentContains 'you have ROLE_ADMIN'
+		pageSource.contains('you have ROLE_ADMIN')
 
 		when:
 		go 'secureClassAnnotated'
 
 		then:
-		assertContentContains 'index: you have ROLE_ADMIN'
+		pageSource.contains('index: you have ROLE_ADMIN')
 
 		when:
 		go 'secureClassAnnotated/index'
 
 		then:
-		assertContentContains 'index: you have ROLE_ADMIN'
+		pageSource.contains('index: you have ROLE_ADMIN')
 
 		when:
 		go 'secureClassAnnotated/otherAction'
 
 		then:
-		assertContentContains 'otherAction: you have ROLE_ADMIN'
+		pageSource.contains('otherAction: you have ROLE_ADMIN')
 
 		when:
 		go 'secureClassAnnotated/admin2'
 
 		then:
-		assertContentContains 'admin2: you have ROLE_ADMIN2'
+		pageSource.contains('admin2: you have ROLE_ADMIN2')
 
 		when:
 		go 'secureAnnotated/expression'
 
 		then:
-		assertContentContains "Sorry, you're not authorized to view this page."
+		pageSource.contains('Sorry, you\'re not authorized to view this page.')
 
 		when:
 		go 'secureAnnotated/indexMethod'
 
 		then:
-		assertContentContains 'you have ROLE_ADMIN'
+		pageSource.contains('you have ROLE_ADMIN')
 
 		when:
 		go 'secureAnnotated/adminEitherMethod'
 
 		then:
-		assertContentContains 'you have ROLE_ADMIN'
+		pageSource.contains('you have ROLE_ADMIN')
 
 		when:
 		go 'secureAnnotated/expressionMethod'
 
 		then:
-		assertContentContains "Sorry, you're not authorized to view this page."
+		pageSource.contains('Sorry, you\'re not authorized to view this page.')
 
 		when:
 		go 'secureAnnotated/closureMethod'
 
 		then:
-		assertContentContains "Sorry, you're not authorized to view this page."
+		pageSource.contains('Sorry, you\'re not authorized to view this page.')
 	}
 
 	void 'restful domains can be secured'() {

plugin-core/examples/functional-test-app/src/integration-test/groovy/specs/BasicAuthCacheUsersSecuritySpec.groovy

@@ -148,7 +148,7 @@ class BasicAuthCacheUsersSecuritySpec extends AbstractSecuritySpec {
 		login 'admin1', 'password1'
 
 		then:
-		assertContentContains 'you have ROLE_ADMIN'
+		pageSource.contains('you have ROLE_ADMIN')
 
 		and:
 		userCache.getUserFromCache('admin1')