lib/page-object/platforms/selenium/page_object.rb in page-object-0.2.4 vs lib/page-object/platforms/selenium/page_object.rb in page-object-0.2.5

@@ -91,17 +91,18 @@
         
         #
         # platform method to handle attaching to a running window
         # See PageObject#attach_to_window
         #
-        def attach_to_window(identifier)
+        def attach_to_window(identifier, &block)
+          match = identifier.values.first
           handles = @browser.window_handles
           handles.each do |handle|
             @browser.switch_to.window handle
-            if identifier.keys.first == :title
-              return if @browser.title == identifier.values.first
-            elsif identifier.keys.first == :url
-              return if @browser.current_url == identifier.values.first
+            if identifier.keys.first == :title and @browser.title == match
+              return @browser.switch_to.window handle, &block
+            elsif identifier.keys.first == :url and @browser.current_url == match
+              return @browser.switch_to.window handle, &block
             end
           end
         end
         
         #