Skip to content

Commit 354200c

Browse files
committed
fixed failing tests
1 parent 896fcf2 commit 354200c

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

grails-plugin-filters/src/main/groovy/org/codehaus/groovy/grails/plugins/web/filters/FilterConfig.groovy

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,14 @@ class FilterConfig extends ControllersApi {
8484
}
8585

8686
def getWiredFiltersDefinition() {
87-
final grailsFilter = grailsApplication.getArtefact(FiltersConfigArtefactHandler.TYPE, filtersDefinition.class.name)
88-
applicationContext."${grailsFilter.fullName}"
87+
final webRequest = GrailsWebRequest.lookup()
88+
final grailsFilter = webRequest ? grailsApplication.getArtefact(FiltersConfigArtefactHandler.TYPE, filtersDefinition.class.name) : null
89+
if (grailsFilter) {
90+
applicationContext.getBean(grailsFilter.fullName)
91+
}
92+
else {
93+
return filtersDefinition
94+
}
8995
}
9096

9197
/**

grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/plugins/web/filters/DefaultGrailsFilterClassTests.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package org.codehaus.groovy.grails.plugins.web.filters
22

3+
import org.codehaus.groovy.grails.web.servlet.mvc.AbstractGrailsControllerTests
4+
35
/**
46
* @author Graeme Rocher
57
* @since 1.0
68
*/
7-
class DefaultGrailsFilterClassTests extends GroovyTestCase {
9+
class DefaultGrailsFilterClassTests extends AbstractGrailsControllerTests {
810

911
GroovyClassLoader gcl = new GroovyClassLoader()
1012

grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/plugins/web/filters/FilterConfigTests.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@
1515
*/
1616
package org.codehaus.groovy.grails.plugins.web.filters
1717

18+
import org.codehaus.groovy.grails.web.servlet.mvc.AbstractGrailsControllerTests
19+
1820
/**
1921
* Test case for {@link FilterConfig}.
2022
*
2123
* @author pledbrook
2224
*/
23-
class FilterConfigTests extends GroovyTestCase {
25+
class FilterConfigTests extends AbstractGrailsControllerTests {
2426
private static final int INT_PROP_VALUE = 1000
2527
private static final String STRING_PROP_VALUE = 'Test property'
2628

0 commit comments

Comments
 (0)