Merge pull request cheezy#254 from leviwilson/expected_title

Fix #wait_for_expected_title?

lib/page-object/accessors.rb

@@ -66,20 +66,18 @@ def page_url(url)
     #
     def wait_for_expected_title(expected_title, timeout=::PageObject.default_element_wait)
       define_method("wait_for_expected_title?") do
-        page_title = title
-        has_expected_title = (expected_title === page_title)
-        if not has_expected_title and not timeout.nil?
-          wait_until(timeout, "Expected title '#{expected_title}' instead of '#{page_title}'") do 
-            has_expected_title = (expected_title === page_title)
-            has_expected_title
-          end
-        end
-        raise "Expected title '#{expected_title}' instead of '#{page_title}'" unless has_expected_title
+        error_message = lambda { "Expected title '#{expected_title}' instead of '#{title}'" }
+
+        has_expected_title = (expected_title === title)
+        wait_until(timeout, error_message.call) do
+          has_expected_title = (expected_title === title)
+        end unless has_expected_title
+
+        raise error_message.call unless has_expected_title
         has_expected_title
       end
     end
 
-
     #
     # Creates a method that compares the expected_title of a page against the actual.
     # @param [String] expected_title the literal expected title for the page

spec/page-object/accessors_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+class GenericPage
+  include PageObject
+
+  wait_for_expected_title 'expected title'
+end
+
+describe  'accessors' do
+  let(:browser) { mock_watir_browser }
+  let(:page) { GenericPage.new browser }
+
+  context '#wait_for_expected_title' do
+    before(:each) do
+      allow(browser).to receive(:wait_until).and_yield
+    end
+
+    it 'true if already there' do
+      allow(browser).to receive(:title).and_return 'expected title'
+      expect(page.wait_for_expected_title?).to be_truthy
+    end
+
+    it 'does not wait if it already is there' do
+      allow(browser).to receive(:title).and_return 'expected title'
+      expect(browser).to_not receive(:wait_until)
+
+      expect(page.wait_for_expected_title?).to be_truthy
+    end
+
+    it 'errors when it does not match' do
+      allow(browser).to receive(:title).and_return 'wrong title'
+      expect { page.wait_for_expected_title? }.to raise_error "Expected title 'expected title' instead of 'wrong title'"
+    end
+
+    it 'picks up when the title changes' do
+      allow(browser).to receive(:title).and_return 'wrong title', 'expected title'
+      expect(page.wait_for_expected_title?).to be_truthy
+    end
+  end
+end