Fix a MissingMethodException when Browser.withFrame(Navigator, Class<…

…P>, Closure<T>) is called. Fixes geb/issues#591
geb · Oct 18, 2019 · 8877c7e · 8877c7e
1 parent 0795008
commit 8877c7e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/doc/manual/src/docs/asciidoc/140-project.adoc b/doc/manual/src/docs/asciidoc/140-project.adoc
@@ -91,6 +91,7 @@ This page lists the high level changes between versions of Geb.
 
 * Unexpected pages are now only checked after checking that none of the pages passed to `Browser.page()` methods taking a list match. [issue:595[]]
 * Fix global atCheckWaiting in combination with to:[...] leading to potentially long delays. [issue:594[]]
+* Fix a MissingMethodException when `Browser.withFrame(Navigator, Class<P>, Closure<T>)` is called. [issue:591[]]
 
 === 3.1
 

diff --git a/module/geb-core/src/main/groovy/geb/frame/DefaultFrameSupport.groovy b/module/geb-core/src/main/groovy/geb/frame/DefaultFrameSupport.groovy
@@ -33,15 +33,15 @@ class DefaultFrameSupport implements FrameSupport {
     }
 
     public <P extends Page, T> T withFrame(frame, @DelegatesTo.Target Class<P> page, @DelegatesTo(strategy = DELEGATE_FIRST, genericTypeIndex = 0) Closure<T> block) {
-        executeWithFrame(frame, createPage(page), block)
+        withFrame(frame, createPage(page), block)
     }
 
     public <P extends Page, T> T withFrame(frame, @DelegatesTo.Target P page, @DelegatesTo(strategy = DELEGATE_FIRST) Closure<T> block) {
         executeWithFrame(frame, page, block)
     }
 
     public <P extends Page, T> T withFrame(Navigator frameNavigator, @DelegatesTo.Target Class<P> page, @DelegatesTo(strategy = DELEGATE_FIRST, genericTypeIndex = 0) Closure<T> block) {
-        executeWithFrame(frameNavigator, createPage(page), block)
+        withFrame(frameNavigator, createPage(page), block)
     }
 
     public <P extends Page, T> T withFrame(Navigator frameNavigator, @DelegatesTo.Target P page, @DelegatesTo(strategy = DELEGATE_FIRST) Closure<T> block) {
@@ -78,7 +78,7 @@ class DefaultFrameSupport implements FrameSupport {
         }
     }
 
-    private <T> T executeWithFrame(Navigator frameNavigator, def page, Closure<T> block) {
+    private <T> T executeWithFrame(Navigator frameNavigator, Page page, Closure<T> block) {
         WebElement element = frameNavigator.firstElement()
         if (element == null) {
             throw new NoSuchFrameException("No elements for given content: ${frameNavigator}")

diff --git a/module/geb-core/src/test/groovy/geb/frame/FrameSupportSpec.groovy b/module/geb-core/src/test/groovy/geb/frame/FrameSupportSpec.groovy
@@ -210,6 +210,14 @@ class FrameSupportSpec extends BaseFrameSupportSpec {
         frameFactory << [{ 'header' }, { 0 }, { $('#header-id') }, { page.footer }]
     }
 
+    def "no method dispatch errors happen when passing page content instance and root Page class to withFrame"() {
+        when:
+        withFrame(footer, Page) {}
+
+        then:
+        notThrown(MissingMethodException)
+    }
+
     private boolean isInFramesContext() {
         title == 'frames'
     }