site_prism 2.12 → 2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 486bfe34bc7f4ab7dedc373ffdb850d146c731d8
-  data.tar.gz: 324a724708c627fbc2242bc783ac80a1626472e0
+  metadata.gz: 4c6e366dcebe267faac30347ca1d1df9083a35a8
+  data.tar.gz: 073d46c7c242f29985a11f788d4647be3f1d0aa0
 SHA512:
-  metadata.gz: 62687b2613246d5f2a9afc1623d961ec43249439dbb9f7d391758c723832a587524cd617e4893bdf53405ac42aed942656892eb4269d7a1092d08245573e2796
-  data.tar.gz: c8065b3bb3cd831bb3ee12e975c701e9b29d998a45d8e640bca5b15c895fe4bfb18012c6fa24dba3ed40af9a53100424ffbc23c9ea212755a7a73bf195fcd60a
+  metadata.gz: cd48654ba019e204f5631b571f25e81d2a6dcdf4b8dda728fc40c1a1d8e26f74255cdd2b49dbf12dacd4dca489bc843b20c00cb711884b05cc43b0c94ee14c23
+  data.tar.gz: 1422a9b00a5a7a891e043d749bddb47efc1c65d85a01c2481d6bc420079171ea89a9ff63e289afd1a2bf4d91a888a9330d7508c7c8008d93bebf8ece9fc52e0f

data/README.md

@@ -9,13 +9,19 @@ Find the pretty documentation here: http://rdoc.info/gems/site_prism/frames
 
 Make sure to add your project/company to https://github.com/natritmeyer/site_prism/wiki/Who-is-using-SitePrism
 
+## Developing / Contributing to SitePrism
+
+We love it when people want to get involved with our Open Source Project.
+
+We have a brief set of setup docs [HERE](https://github.com/natritmeyer/site_prism/development_setup.md)
+
 ## Supported Rubies / Browsers
 
-SitePrism is built and tested to work on Ruby 2.1 - 2.4. There is also some limited support for the Ruby 1.9/2.0 series.
+SitePrism is built and tested to work on Ruby 2.1 - 2.5. There is also some limited support for Ruby 2.0.0.
 
-SitePrism should run on all major browsers. The gem's integration tests are ran on the latest version of Firefox.
+SitePrism should run on all major browsers. The gem's integration tests are ran on the latest versions of Chrome and Firefox.
 
-If you find your browser isn't working correctly with SitePrism, please open an [issue request](https://github.com/natritmeyer/site_prism/issues/new)
+If you find your browser doesn't integrate nicely with SitePrism, please open an [issue request](https://github.com/natritmeyer/site_prism/issues/new)
 
 ## Synopsis
 
@@ -60,35 +66,35 @@ end
 
 # now for some tests
 
-When /^I navigate to the google home page$/ do
+When(/^I navigate to the google home page$/) do
   @home = Home.new
   @home.load
 end
 
-Then /^the home page should contain the menu and the search form$/ do
+Then(/^the home page should contain the menu and the search form$/) do
   @home.wait_for_menu # menu loads after a second or 2, give it time to arrive
   expect(@home).to have_menu
   expect(@home).to have_search_field
   expect(@home).to have_search_button
 end
 
-When /^I search for Sausages$/ do
+When(/^I search for Sausages$/) do
   @home.search_field.set "Sausages"
   @home.search_button.click
 end
 
-Then /^the search results page is displayed$/ do
+Then(/^the search results page is displayed$/) do
   @results_page = SearchResults.new
   expect(@results_page).to be_displayed
 end
 
-Then /^the search results page contains 10 individual search results$/ do
+Then(/^the search results page contains 10 individual search results$/) do
   @results_page.wait_for_search_results
-  expect(@results_page).to have_search_results count: 10
+  expect(@results_page).to have_search_results(count: 10)
 end
 
-Then /^the search results contain a link to the wikipedia sausages page$/ do
-  expect(@results_page.search_result_links).to include "http://en.wikipedia.org/wiki/Sausage"
+Then(/^the search results contain a link to the wikipedia sausages page$/) do
+  expect(@results_page.search_result_links).to include('http://en.wikipedia.org/wiki/Sausage')
 end
 ```
 
@@ -166,7 +172,7 @@ you'll need to set its URL. Here's how:
 
 ```ruby
 class Home < SitePrism::Page
-  set_url "http://www.google.com"
+  set_url 'http://www.google.com'
 end
 ```
 
@@ -174,7 +180,7 @@ If you've set Capybara's `app_host` then you can set the URL as follows:
 
 ```ruby
 class Home < SitePrism::Page
-  set_url "/home.htm"
+  set_url '/home.htm'
 end
 ```
 
@@ -261,9 +267,9 @@ The following test code would pass:
 
 ```ruby
 @account_page = Account.new
-@account_page.load(id: 22, query: { token: "ca2786616a4285bc" })
+@account_page.load(id: 22, query: { token: 'ca2786616a4285bc' })
 
-expect(@account_page.current_url).to end_with "/accounts/22?token=ca2786616a4285bc"
+expect(@account_page.current_url).to end_with('/accounts/22?token=ca2786616a4285bc')
 expect(@account_page).to be_displayed
 ```
 
@@ -299,10 +305,10 @@ when comparing your page's URL template to the current_url:
 
 ```ruby
 @account_page = Account.new
-@account_page.load(id: 22, query: { token: "ca2786616a4285bc", color: 'irrelevant' })
+@account_page.load(id: 22, query: { token: 'ca2786616a4285bc', color: 'irrelevant' })
 
 expect(@account_page).to be_displayed(id: 22)
-expect(@account_page.url_matches['query']['token']).to eq "ca2786616a4285bc"
+expect(@account_page.url_matches['query']['token']).to eq('ca2786616a4285bc')
 ```
 
 #### Falling back to basic regexp matchers
@@ -341,7 +347,7 @@ end
 @account = Account.new
 #...
 @account.current_url #=> "http://www.example.com/account/123"
-expect(@account.current_url).to include 'example.com/account/'
+expect(@account.current_url).to include('example.com/account/')
 ```
 
 ### Page Title
@@ -496,6 +502,19 @@ end
 @home.wait_for_search_field(10) #will wait for 10 seconds for the search field to appear
 ```
 
+#### Waiting for an element to not exist on a page
+
+Another method added by calling `element` is the `wait_for_no_<element_name>` method.
+Calling the method will cause the test to wait for the Capybara's
+default wait time for the element to not exist. It is also possible to use a
+custom amount of time to wait. Using the same example as above:
+
+```ruby
+@home.wait_for_no_search_field
+# or...
+@home.wait_for_no_search_field(10) #will wait for 10 seconds for the search field to disappear
+```
+
 #### Waiting for an element to become visible
 
 Another method added by calling `element` is the
@@ -559,6 +578,8 @@ end
 @home.has_no_search_field?
 @home.wait_for_search_field
 @home.wait_for_search_field(10)
+@home.wait_for_no_search_field
+@home.wait_for_no_search_field(10)
 @home.wait_until_search_field_visible
 @home.wait_until_search_field_visible(10)
 @home.wait_until_search_field_invisible
@@ -651,10 +672,12 @@ end
 #### Waiting for the element collection
 
 Just like for an individual element, the tests can be told to wait for
-the existence of the element collection. The `elements` method adds a
-`wait_for_<element collection name>` method that will wait for
+the existence or non-existence of the element collection. The `elements`
+method adds `wait_for_<element collection name>` and
+`wait_for_no_<element collection name>` methods that will wait for
 Capybara's default wait time until at least 1 element is found that
-matches the selector. For example, with the following page:
+matches the selector, or no elements are found that match the selector,
+respectively. For example, with the following page:
 
 ```ruby
 class Friends < SitePrism::Page
@@ -663,17 +686,24 @@ end
 
 ```
 
-... you can wait for the existence of a list of names like this:
+... you can also wait for the existence of a list of names like this:
 
 ```ruby
 @friends_page.wait_for_names
 ```
 
+or wait for the non-existence of a list of names like this:
+
+```ruby
+@friends_page.wait_for_no_names
+```
+
 Again, you can customise the wait time by supplying a number of seconds
 to wait for:
 
 ```ruby
 @friends_page.wait_for_names(10)
+@friends_page.wait_for_no_names(10)
 ```
 
 #### Waiting for the elements to be visible or invisible
@@ -788,18 +818,18 @@ is added is one that returns an instance of the section, the method name
 being the first argument to the `section` method. Here's an example:
 
 ```ruby
-# the section:
+# the section
 
 class MenuSection < SitePrism::Section
 end
 
-# the page that includes the section:
+# the page that includes the section
 
 class Home < SitePrism::Page
   section :menu, MenuSection, '#gbx3'
 end
 
-# the page and section in action:
+# the page and section in action
 
 @home = Home.new
 @home.menu #=> <MenuSection...>
@@ -879,7 +909,7 @@ end
 ```ruby
 Then /^the home page menu contains a link to the various search functions$/ do
   expect(@home.menu).to have_search
-  expect(@home.menu.search['href']).to include "google.com"
+  expect(@home.menu.search['href']).to include('google.com')
   expect(@home.menu).to have_images
   expect(@home.menu).to have_maps
 end
@@ -894,7 +924,7 @@ Some of this test code can be made a little prettier by simply passing a block i
 Then /^the home page menu contains a link to the various search functions$/ do
   @home.menu do |menu|
     expect(menu).to have_search
-    expect(menu.search['href']).to include "google.com"
+    expect(menu.search['href']).to include('google.com')
     expect(menu).to have_images
     expect(menu).to have_maps
   end
@@ -991,11 +1021,12 @@ expect(@home).not_to have_menu
 
 #### Waiting for a section to exist
 
-Another method added to the page or section by the `section` method is
-`wait_for_<section name>`. Similar to what `element` does, this method
-waits for the section to appear - the test will wait up to capybara's
-default wait time until the root node of the element exists on the
-page/section that our section was added to. Given the following setup:
+Additional methods added to the page or section by the `section` method are
+`wait_for_<section name>` and `wait_for_no_<section name>`. Similar to what
+`element` does, these methods wait for the section to appear or disappear,
+respectively - the test will wait up to capybara's
+default wait time until the `root_element` of the section exists or does
+not exist on the page/section that our section was added to. Given the following setup:
 
 ```ruby
 class MenuSection < SitePrism::Section
@@ -1016,6 +1047,13 @@ end
 @home.wait_for_menu(10) # waits for 10 seconds instead of capybara's default timeout
 ```
 
+... and we can wait for the menu section to disappear on the page like this:
+
+```ruby
+@home.wait_for_no_menu
+@home.wait_for_no_menu(10) # waits for 10 seconds instead of capybara's default timeout
+```
+
 #### Waiting for a section to become visible or invisible
 
 Like an element, it is possible to wait for a section to become visible
@@ -1080,8 +1118,8 @@ Then /^I sign in$/ do
   @home.wait_for_login_and_registration
   expect(@home).to have_login_and_registration
   expect(@home.login_and_registration).to have_username
-  @home.login_and_registration.login.username.set "bob"
-  @home.login_and_registration.login.password.set "p4ssw0rd"
+  @home.login_and_registration.login.username.set 'bob'
+  @home.login_and_registration.login.password.set 'p4ssw0rd'
   @home.login_and_registration.login.sign_in.click
 end
 
@@ -1092,7 +1130,7 @@ When /^I enter my name into the home page's registration form$/ do
   @home.load
   expect(@home.login_and_registration).to have_first_name
   expect(@home.login_and_registration).to have_last_name
-  @home.login_and_registration.first_name.set "Bob"
+  @home.login_and_registration.first_name.set 'Bob'
   # ...
 end
 ```
@@ -1233,10 +1271,11 @@ end
 
 #### Waiting for sections to appear
 
-The final method added by `sections` to the page/section we're adding
-our sections to is `wait_for_<sections name>`. It will wait for
-capybara's default wait time for there to be at least one instance of
-the section in the array of sections. For example:
+The last methods added by `sections` to the page/section we're adding
+our sections to are `wait_for_<sections name>` and `wait_for_no_<sections name>`.
+They will wait for capybara's default wait time for there to be at least one instance of
+the section in the array of sections or no instances of the section in the array
+of sections, respectively. For example:
 
 ```ruby
 class SearchResultSection < SitePrism::Section
@@ -1258,6 +1297,15 @@ end
 @results_page.wait_for_search_results(10) #=> waits for 10 seconds instead of the default capybara timeout
 ```
 
+... and how to wait for the sections to disappear
+
+```ruby
+@results_page = SearchResults.new
+# ...
+@results_page.wait_for_no_search_results
+@results_page.wait_for_no_search_results(10) #=> waits for 10 seconds instead of the default capybara timeout
+```
+
 ## Load Validations
 
 Load validations enable common validations to be abstracted and performed on a Page or Section to determine
@@ -1432,11 +1480,12 @@ The method calls below will succeed, provided the elements appear on the page wi
 ```ruby
 @results_page = SearchResults.new
 # ...
-@results_page.has_search_results? :count => 25
+@results_page.has_search_results?(count: 25)
 # OR
-@results_page.search_results :count => 25
+@results_page.search_results(count: 25)
 # OR
-@results_page.wait_for_search_results nil, :count => 25 # wait_for_<element_name> expects a timeout value to be passed as the first parameter or nil to use the default timeout value.
+@results_page.wait_for_search_results(nil, :count => 25)
+# Note that wait_for_<element_name> expects a timeout value to be passed as the first parameter or nil to use the default timeout value.
 ```
 
 Now we can write pretty, non-failing tests without hard coding these options
@@ -1444,7 +1493,7 @@ into our page and section classes:
 
 ```ruby
 Then /^there are search results on the page$/ do
-  expect(@results.page).to have_search_results :count => 25
+  expect(@results.page).to have_search_results(count: 25)
 end
 ```
 
@@ -1464,12 +1513,13 @@ end
 The following element methods allow Capybara options to be passed as arguments to the method:
 
 ```ruby
-@results_page.<element_or_section_name> :text => "Welcome!"
-@results_page.has_<element_or_section_name>? :count => 25
-@results_page.has_no_<element_or_section_name>? :text => "Logout"
-@results_page.wait_for_<element_or_section_name> :count => 25
-@results_page.wait_until_<element_or_section_name>_visible :text => "Some ajaxy text appears!"
-@results_page.wait_until_<element_or_section_name>_invisible :text => "Some ajaxy text disappears!"
+@results_page.<element_or_section_name>(text: 'Welcome!')
+@results_page.has_<element_or_section_name>?(count: 25)
+@results_page.has_no_<element_or_section_name>?(text: 'Logout')
+@results_page.wait_for_<element_or_section_name>(nil, count: 25)
+@results_page.wait_for_no_<element_or_section_name>(nil, count: 25)
+@results_page.wait_until_<element_or_section_name>_visible(text: 'Some ajaxy text appears!')
+@results_page.wait_until_<element_or_section_name>_invisible(text: 'Some ajaxy text disappears!')
 ```
 
 ## Test views with Page objects
@@ -1557,12 +1607,14 @@ expect(@page).to have_my_iframe
 ### Waiting for an iframe
 
 Like an element or section, it is possible to wait for an iframe to
-exist by using the `wait_for_<iframe_name>` method. For example:
+exist or not exist by using the `wait_for_<iframe_name>` and
+`wait_for_no_<iframe_name>` methods. For example:
 
 ```ruby
 @page = PageContainingIframe.new
 # ...
 @page.wait_for_my_iframe
+@page.wait_for_no_my_iframe
 ```
 
 ### Interacting with an iframe's contents:
@@ -1653,7 +1705,7 @@ all over the place. Here's an example of this common problem:
 ```ruby
 @home = Home.new # <-- noise
 @home.load
-@home.search_field.set "Sausages"
+@home.search_field.set 'Sausages'
 @home.search_field.search_button.click
 @results_page = SearchResults.new # <-- noise
 expect(@results_page).to have_search_result_items
@@ -1697,20 +1749,20 @@ class App
   end
 end
 
-# and here's how to use it:
+# and here's how to use it
 
 #first line of the test...
-Given /^I start on the home page$/ do
+Given(/^I start on the home page$/) do
   @app = App.new
   @app.home.load
 end
 
-When /^I search for Sausages$/ do
-  @app.home.search_field.set "sausages"
+When(/^I search for Sausages$/) do
+  @app.home.search_field.set 'Sausages'
   @app.home.search_button.click
 end
 
-Then /^I am on the results page$/ do
+Then(/^I am on the results page$/) do
   expect(@app.results_page).to be_displayed
 end
 

data/lib/site_prism/element_container.rb

@@ -5,8 +5,8 @@ module SitePrism
     attr_reader :mapped_items, :expected_items
 
     def element(element_name, *find_args)
-      build element_name, *find_args do
-        define_method element_name.to_s do |*runtime_args, &element_block|
+      build(element_name, *find_args) do
+        define_method(element_name.to_s) do |*runtime_args, &element_block|
           self.class.raise_if_block(self, element_name.to_s, !element_block.nil?)
           find_first(*find_args, *runtime_args)
         end
@@ -14,8 +14,8 @@ module SitePrism
     end
 
     def elements(collection_name, *find_args)
-      build collection_name, *find_args do
-        define_method collection_name.to_s do |*runtime_args, &element_block|
+      build(collection_name, *find_args) do
+        define_method(collection_name.to_s) do |*runtime_args, &element_block|
           self.class.raise_if_block(self, collection_name.to_s, !element_block.nil?)
           find_all(*find_args, *runtime_args)
         end
@@ -28,8 +28,8 @@ module SitePrism
     end
 
     def section(section_name, *args, &block)
-      section_class, find_args = extract_section_options args, &block
-      build section_name, *find_args do
+      section_class, find_args = extract_section_options(args, &block)
+      build(section_name, *find_args) do
         define_method section_name do |*runtime_args, &runtime_block|
           section_class.new self, find_first(*find_args, *runtime_args), &runtime_block
         end
@@ -37,12 +37,12 @@ module SitePrism
     end
 
     def sections(section_collection_name, *args, &block)
-      section_class, find_args = extract_section_options args, &block
-      build section_collection_name, *find_args do
-        define_method section_collection_name do |*runtime_args, &element_block|
+      section_class, find_args = extract_section_options(args, &block)
+      build(section_collection_name, *find_args) do
+        define_method(section_collection_name) do |*runtime_args, &element_block|
           self.class.raise_if_block(self, section_collection_name.to_s, !element_block.nil?)
           find_all(*find_args, *runtime_args).map do |element|
-            section_class.new self, element
+            section_class.new(self, element)
           end
         end
       end
@@ -51,11 +51,9 @@ module SitePrism
     def iframe(iframe_name, iframe_page_class, *args)
       element_find_args = deduce_iframe_element_find_args(args)
       scope_find_args = deduce_iframe_scope_find_args(args)
-      add_to_mapped_items iframe_name
-      create_existence_checker iframe_name, *element_find_args
-      create_nonexistence_checker iframe_name, *element_find_args
-      create_waiter iframe_name, *element_find_args
-      define_method iframe_name do |&block|
+      add_to_mapped_items(iframe_name)
+      add_iframe_helper_methods(iframe_name, *element_find_args)
+      define_method(iframe_name) do |&block|
         within_frame(*scope_find_args) do
           block.call iframe_page_class.new
         end
@@ -77,25 +75,33 @@ module SitePrism
 
     def build(name, *find_args)
       if find_args.empty?
-        create_no_selector name
+        create_no_selector(name)
       else
-        add_to_mapped_items name
+        add_to_mapped_items(name)
         yield
       end
-      add_helper_methods name, *find_args
+      add_helper_methods(name, *find_args)
     end
 
     def add_helper_methods(name, *find_args)
-      create_existence_checker name, *find_args
-      create_nonexistence_checker name, *find_args
-      create_waiter name, *find_args
-      create_visibility_waiter name, *find_args
-      create_invisibility_waiter name, *find_args
+      create_existence_checker(name, *find_args)
+      create_nonexistence_checker(name, *find_args)
+      create_waiter(name, *find_args)
+      create_nonexistence_waiter(name, *find_args)
+      create_visibility_waiter(name, *find_args)
+      create_invisibility_waiter(name, *find_args)
+    end
+
+    def add_iframe_helper_methods(name, *find_args)
+      create_existence_checker(name, *find_args)
+      create_nonexistence_checker(name, *find_args)
+      create_waiter(name, *find_args)
+      create_nonexistence_waiter(name, *find_args)
     end
 
     def create_helper_method(proposed_method_name, *find_args)
       if find_args.empty?
-        create_no_selector proposed_method_name
+        create_no_selector(proposed_method_name)
       else
         yield
       end
@@ -103,10 +109,10 @@ module SitePrism
 
     def create_existence_checker(element_name, *find_args)
       method_name = "has_#{element_name}?"
-      create_helper_method method_name, *find_args do
-        define_method method_name do |*runtime_args|
-          wait_time = SitePrism.use_implicit_waits ? Waiter.default_wait_time : 0
-          Capybara.using_wait_time wait_time do
+      create_helper_method(method_name, *find_args) do
+        define_method(method_name) do |*runtime_args|
+          wait_time = SitePrism.use_implicit_waits ? Capybara.default_max_wait_time : 0
+          Capybara.using_wait_time(wait_time) do
             element_exists?(*find_args, *runtime_args)
           end
         end
@@ -115,10 +121,10 @@ module SitePrism
 
     def create_nonexistence_checker(element_name, *find_args)
       method_name = "has_no_#{element_name}?"
-      create_helper_method method_name, *find_args do
-        define_method method_name do |*runtime_args|
-          wait_time = SitePrism.use_implicit_waits ? Waiter.default_wait_time : 0
-          Capybara.using_wait_time wait_time do
+      create_helper_method(method_name, *find_args) do
+        define_method(method_name) do |*runtime_args|
+          wait_time = SitePrism.use_implicit_waits ? Capybara.default_max_wait_time : 0
+          Capybara.using_wait_time(wait_time) do
             element_does_not_exist?(*find_args, *runtime_args)
           end
         end
@@ -127,21 +133,33 @@ module SitePrism
 
     def create_waiter(element_name, *find_args)
       method_name = "wait_for_#{element_name}"
-      create_helper_method method_name, *find_args do
-        define_method method_name do |timeout = nil, *runtime_args|
-          timeout = timeout.nil? ? Waiter.default_wait_time : timeout
-          Capybara.using_wait_time timeout do
+      create_helper_method(method_name, *find_args) do
+        define_method(method_name) do |timeout = nil, *runtime_args|
+          timeout = timeout.nil? ? Capybara.default_max_wait_time : timeout
+          Capybara.using_wait_time(timeout) do
             element_exists?(*find_args, *runtime_args)
           end
         end
       end
     end
 
+    def create_nonexistence_waiter(element_name, *find_args)
+      method_name = "wait_for_no_#{element_name}"
+      create_helper_method(method_name, *find_args) do
+        define_method(method_name) do |timeout = nil, *runtime_args|
+          timeout = timeout.nil? ? Waiter.default_wait_time : timeout
+          Capybara.using_wait_time(timeout) do
+            element_does_not_exist?(*find_args, *runtime_args)
+          end
+        end
+      end
+    end
+
     def create_visibility_waiter(element_name, *find_args)
       method_name = "wait_until_#{element_name}_visible"
-      create_helper_method method_name, *find_args do
-        define_method method_name do |timeout = Waiter.default_wait_time, *runtime_args|
-          Timeout.timeout timeout, SitePrism::TimeOutWaitingForElementVisibility do
+      create_helper_method(method_name, *find_args) do
+        define_method(method_name) do |timeout = Capybara.default_max_wait_time, *runtime_args|
+          Timeout.timeout(timeout, SitePrism::TimeOutWaitingForElementVisibility) do
             Capybara.using_wait_time 0 do
               sleep 0.05 until element_exists?(*find_args, *runtime_args, visible: true)
             end
@@ -152,9 +170,9 @@ module SitePrism
 
     def create_invisibility_waiter(element_name, *find_args)
       method_name = "wait_until_#{element_name}_invisible"
-      create_helper_method method_name, *find_args do
-        define_method method_name do |timeout = Waiter.default_wait_time, *runtime_args|
-          Timeout.timeout timeout, SitePrism::TimeOutWaitingForElementInvisibility do
+      create_helper_method(method_name, *find_args) do
+        define_method(method_name) do |timeout = Capybara.default_max_wait_time, *runtime_args|
+          Timeout.timeout(timeout, SitePrism::TimeOutWaitingForElementInvisibility) do
             Capybara.using_wait_time 0 do
               sleep 0.05 while element_exists?(*find_args, *runtime_args, visible: true)
             end
@@ -164,7 +182,7 @@ module SitePrism
     end
 
     def create_no_selector(method_name)
-      define_method method_name do
+      define_method(method_name) do
         raise SitePrism::NoSelectorForElement.new, "#{self.class.name} => :#{method_name} needs a selector"
       end
     end
@@ -195,7 +213,7 @@ module SitePrism
       if args.first.is_a?(Class)
         section_class = args.shift
       elsif block_given?
-        section_class = Class.new SitePrism::Section, &block
+        section_class = Class.new(SitePrism::Section, &block)
       else
         raise ArgumentError, 'You should provide section class either as a block, or as the second argument.'
       end

data/lib/site_prism/exceptions.rb

@@ -11,7 +11,13 @@ module SitePrism
   end
 
   class NoSelectorForElement < StandardError; end
-  class TimeoutException < StandardError; end
+
+  class TimeoutException < StandardError
+    def message
+      "Timed out after #{super}s while waiting for block to evaluate as true."
+    end
+  end
+
   class TimeOutWaitingForElementVisibility < StandardError; end
   class TimeOutWaitingForElementInvisibility < StandardError; end
 

data/lib/site_prism/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SitePrism
-  VERSION = '2.12'.freeze
+  VERSION = '2.13'.freeze
 end

data/lib/site_prism/waiter.rb

@@ -2,18 +2,21 @@
 
 module SitePrism
   class Waiter
-    def self.wait_until_true(wait_time_seconds = default_wait_time)
+    def self.wait_until_true(wait_time = Capybara.default_max_wait_time)
       start_time = Time.now
+
       loop do
         return true if yield
-        break unless Time.now - start_time <= wait_time_seconds
+        break if Time.now - start_time > wait_time
         sleep(0.05)
       end
-      raise SitePrism::TimeoutException, 'Timed out while waiting for block to return true'
+
+      raise SitePrism::TimeoutException, wait_time
     end
 
     def self.default_wait_time
-      Capybara.respond_to?(:default_max_wait_time) ? Capybara.default_max_wait_time : Capybara.default_wait_time
+      warn 'default_wait_time is now deprecated. This will be removed in an upcoming release.'
+      Capybara.default_max_wait_time
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: site_prism
 version: !ruby/object:Gem::Version
-  version: '2.12'
+  version: '2.13'
 platform: ruby
 authors:
 - Nat Ritmeyer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -45,42 +45,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ dependencies:
         version: 3.4.0
     - - "<="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
         version: 3.4.0
     - - "<="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -133,16 +133,16 @@ dependencies:
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 description: |-
   SitePrism gives you a simple, clean and semantic DSL for describing your site.
   SitePrism implements the Page Object Model pattern on top of Capybara.
@@ -177,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="