test: more test cleanup

Author: matrei

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

@@ -32,34 +32,23 @@ abstract class AbstractSecuritySpec extends ContainerGebSpec {
 	@Shared boolean reset = false
 
 	void setup() {
-		if ( !reset ) {
-			go 'testData/reset'
+		if (!reset) {
+			go('testData/reset')
 			reset = true
 		}
 		logout()
 	}
 
 	protected void login(String user) {
-		to LoginPage
-		username = user
-		password = 'password'
-		loginButton.click()
+		to(LoginPage).with {
+			username = user
+			password = 'password'
+			loginButton.click()
+		}
 	}
 
 	protected void logout() {
-		go 'logout'
-		browser.clearCookies()
-	}
-
-	protected boolean contentContains(String expected) {
-		browser.driver.pageSource.contains(expected)
-	}
-
-	protected void assertContentContains(String expected) {
-		assert contentContains(expected)
-	}
-
-	protected void assertContentDoesNotContain(String unexpected) {
-		assert !contentContains(unexpected)
+		go('logout')
+		clearCookies()
 	}
 }

plugin-acl/examples/functional-test-app/src/integration-test/groovy/test/User1FunctionalSpec.groovy

@@ -32,152 +32,152 @@ import spock.lang.Stepwise
 @Integration
 class User1FunctionalSpec extends AbstractSecuritySpec {
 
-	// user1 has admin on 11,12 and read on 1-67
+	// user1 has admin on 11-12 and read on 1-67
 
 	void setup() {
-		login 'user1'
+		login('user1')
 	}
 
 	void 'check tags'() {
 		when:
-		go 'tagLibTest/test'
+		go('tagLibTest/test')
 
 		then:
-		assertContentContains 'test 1 true 1'
-		assertContentContains 'test 2 true 1'
-		assertContentContains 'test 3 true 1'
-		assertContentContains 'test 4 true 1'
-		assertContentContains 'test 5 true 1'
-		assertContentContains 'test 6 true 1'
-
-		assertContentContains 'test 1 true 13'
-		assertContentContains 'test 2 true 13'
-		assertContentContains 'test 3 true 13'
-		assertContentContains 'test 4 true 13'
-		assertContentContains 'test 5 true 13'
-		assertContentContains 'test 6 true 13'
-
-		assertContentContains 'test 1 false 80'
-		assertContentContains 'test 2 false 80'
-		assertContentContains 'test 3 false 80'
-		assertContentContains 'test 4 false 80'
-		assertContentContains 'test 5 false 80'
-		assertContentContains 'test 6 false 80'
+		pageSource.contains('test 1 true 1')
+		pageSource.contains('test 2 true 1')
+		pageSource.contains('test 3 true 1')
+		pageSource.contains('test 4 true 1')
+		pageSource.contains('test 5 true 1')
+		pageSource.contains('test 6 true 1')
+
+		pageSource.contains('test 1 true 13')
+		pageSource.contains('test 2 true 13')
+		pageSource.contains('test 3 true 13')
+		pageSource.contains('test 4 true 13')
+		pageSource.contains('test 5 true 13')
+		pageSource.contains('test 6 true 13')
+
+		pageSource.contains('test 1 false 80')
+		pageSource.contains('test 2 false 80')
+		pageSource.contains('test 3 false 80')
+		pageSource.contains('test 4 false 80')
+		pageSource.contains('test 5 false 80')
+		pageSource.contains('test 6 false 80')
 	}
 
 	void 'view all (1-67)'() {
 		when:
-		go "report/show?number=$i"
+		go("report/show?number=$i")
 
 		then:
-		assertContentContains "report$i"
+		pageSource.contains("report$i")
 
 		where:
 		i << (1..67)
 	}
 
 	void 'view all (68-100)'() {
 		when:
-		go "report/show?number=$i"
+		go("report/show?number=$i")
 
 		then:
-		assertContentContains 'Access Denied'
+		pageSource.contains('Access Denied')
 
 		where:
 		i << (68..100)
 	}
 
 	void 'edit report 11'() {
 		when:
-		go 'report/edit?number=11'
+		go('report/edit?number=11')
+		def editPage = at(EditReportPage)
 
 		then:
-		at EditReportPage
 		$('form').name == 'report11'
 
 		when:
 		name = 'report11_new'
-		updateButton.click()
+		editPage.updateButton.click()
 
 		then:
-		at ShowReportPage
-		assertContentContains 'report11_new'
+		at(ShowReportPage)
+		pageSource.contains('report11_new')
 	}
 
 	void 'delete report 11'() {
 		when:
-		go 'report/delete?number=11'
+		go('report/delete?number=11')
+		def listPage = at(ListReportPage)
 
 		then:
-		at ListReportPage
-		message == "Report 11 deleted"
-		reportRows.size() == 66
+		message == 'Report 11 deleted'
+		listPage.reportRows.size() == 66
 	}
 
 	void 'grant edit 12'() {
 		when:
-		go 'report/grant?number=12'
+		go('report/grant?number=12')
+		def grantPage = at(ReportGrantPage)
 
 		then:
-		at ReportGrantPage
-		assertContentContains 'Grant permission for report12'
+		pageSource.contains('Grant permission for report12')
 
 		when:
 		recipient = 'user2'
 		permission = BasePermission.READ.mask.toString()
-		grantButton.click()
+		grantPage.grantButton.click()
 
 		then:
-		at ShowReportPage
-		assertContentContains "Permission $BasePermission.READ.mask granted on Report 12 to user2"
+		at(ShowReportPage)
+		pageSource.contains("Permission $BasePermission.READ.mask granted on Report 12 to user2")
 
 		when:
-		go 'report/grant?number=12'
+		go('report/grant?number=12')
+		grantPage = at(ReportGrantPage)
 
 		then:
-		at ReportGrantPage
-		assertContentContains 'Grant permission for report12'
+		pageSource.contains('Grant permission for report12')
 
 		when:
 		recipient = 'user2'
 		permission = BasePermission.WRITE.mask.toString()
-		grantButton.click()
+		grantPage.grantButton.click()
 
 		then:
-		at ShowReportPage
-		assertContentContains "Permission $BasePermission.WRITE.mask granted on Report 12 to user2"
+		at(ShowReportPage)
+		pageSource.contains("Permission $BasePermission.WRITE.mask granted on Report 12 to user2")
 	}
 
 	void 'grant edit 13'() {
 		when:
-		go 'report/grant?number=13'
+		go('report/grant?number=13')
+		def grantPage = at(ReportGrantPage)
 
 		then:
-		at ReportGrantPage
-		assertContentContains 'Grant permission for report13'
+		pageSource.contains('Grant permission for report13')
 
 		when:
 		recipient = 'user2'
 		permission = BasePermission.WRITE.mask.toString()
-		grantButton.click()
+		grantPage.grantButton.click()
 
 		then:
-		assertContentContains 'Access Denied'
+		pageSource.contains('Access Denied')
 	}
 
 	void 'edit report 20'() {
 		when:
-		go 'report/edit?number=20'
+		go('report/edit?number=20')
+		def editPage = at(EditReportPage)
 
 		then:
-		at EditReportPage
 		$('form').name == 'report20'
 
 		when:
 		name = 'report20_new'
-		updateButton.click()
+		editPage.updateButton.click()
 
 		then:
-		assertContentContains 'Access Denied'
+		pageSource.contains('Access Denied')
 	}
 }