capybara-widgets 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e196b230cb55720ba9f662b0c2b8ee8d6a18971e
-  data.tar.gz: 63b356fc9d51fa05057123d99285935910d090f1
+  metadata.gz: e98613481eaf9e01a0d306a6be1bfe3cbb9a5ebb
+  data.tar.gz: 5e0a51ef2c632f47fed8f3314524b6223231783e
 SHA512:
-  metadata.gz: 42fe69573483dee2b0b15d4ed193a3dd8ae1230c5f672c453963eeef6f4cb124cd5eb1e9b8b77c67a723059d547906c2cb0aa230a5716b30892350bd7183a51e
-  data.tar.gz: 0a92d4cb0a543b119b0c664b9cf009137264fb187989a503d531c0f0e82fce047ec0bf355922783868ebd0d6a62b80ae96316e11ace9e3c0355421c73b27e15e
+  metadata.gz: bcbf75f3df259f41e0c0c3f5da5b9d9cbde2fb58c8777a3f9cb26add867ca519d9a7e3c3729d6c7f03f74751a29ce842e01517f62781d1a2736e3c46166cef87
+  data.tar.gz: 9b029d11cdfe3f98c90c7efaeef5ec0840c16e44aa2855b3bfe33e801165611fd66fa546bfa48e6eb38fa1bd046e4fb601222fc4a4e9826aaceee96a24ccdc65

data/lib/capybara/widgets/core/page.rb

@@ -1,11 +1,14 @@
 require_relative 'widget'
 require_relative 'page_collection'
+require_relative '../helpers/async_helper'
 require 'active_support/core_ext/class/attribute'
 
 module Capybara
   module Widgets
     class Page < Widget
 
+      include Capybara::Widgets::AsyncHelper
+
       class_attribute :path
       class_attribute :path_matcher
 
@@ -26,7 +29,13 @@ module Capybara
       end
 
       def opened?
-        current_path =~ %r{#{Regexp.quote(self.path)}}
+        eventually do
+          result = self.path_matcher? ?
+              current_path =~ self.path_matcher :
+              current_path =~ %r{#{Regexp.quote(self.path)}}
+          raise "#{self.class.name} is not opened" unless result
+          result
+        end
       end
 
       def reload!

data/lib/capybara/widgets/core/page_collection.rb

@@ -18,14 +18,18 @@ module Capybara
       def current_page_class
         load_classes unless @loaded
         klass = registry.detect do |page_class|
-          if page_class.path_matcher
+          if page_class.path_matcher?
             if page_class.path_matcher.is_a?(Regexp)
               Capybara.current_path =~ page_class.path_matcher
             elsif page_class.path_matcher.is_a?(String)
               Capybara.current_path.include?(page_class.path_matcher)
             end
           else
-            Capybara.current_path.include?(page_class.path)
+            if page_class.path?
+              Capybara.current_path.include?(page_class.path)
+            else
+              false
+            end
           end
         end
         raise "Not found" if klass.nil?

data/lib/capybara/widgets/core/widget.rb

@@ -50,12 +50,14 @@ module Capybara
 
         def element(name, *query)
           define_method("#{name}!") { root.find(*query).click }
+          define_method(name) { root.find(*query) }
           define_method("#{name}=") { |arg| root.find(*query).set(arg) }
-          define_method("has_#{name}?") { root.has_selector?(*query) }
+          define_method("has_#{name}?"){|*args| root.has_selector?(*query, *args) }
+          define_method("has_no_#{name}?"){|*args| root.has_no_selector?(*query, *args) }
         end
 
         def required_element(*element_names)
-          define_method(:elements_loaded?) { element_names.each {|name| self.send("has_#{name}?")} }
+          define_method(:elements_loaded?) { element_names.map {|name| self.send("has_#{name}?")}.count(false) == 0 }
         end
 
         alias_method :required_elements, :required_element

data/lib/capybara/widgets/cucumber/page_steps.rb

@@ -7,19 +7,19 @@ World Capybara::Widgets::StringHelpers
 World Capybara::Widgets::AsyncHelper
 World Capybara::Widgets::DSL
 
-Given(/^I am on a (.* page)/) do |page_name|
+Given(/^I am on (?:a\s|an\s)?(.* page)/) do |page_name|
   within_widget(to_widget_class(page_name)) do |page|
     page.open!
   end
 end
 
-When(/^I navigate to a (.* page)/) do |page_name|
+When(/^I navigate to (?:a\s|an\s)?(.* page)/) do |page_name|
   within_widget(to_widget_class(page_name)) do |page|
     page.open!
   end
 end
 
-Then(/^I should be on a (.* page)/) do |page_name|
+Then(/^I should be on (?:a\s|an\s)?(.* page)/) do |page_name|
   within_widget(to_widget_class(page_name)) do |page|
     eventually { expect(page).to be_loaded }
   end
@@ -33,3 +33,13 @@ When(/^I set "([^"]*)" to "([^"]*)"$/) do |field_name, value|
   current_page.send(to_widget_action(field_name, '='), value)
 end
 
+And(/^I should( not)? see( \d+)? "([^"]*)" ([^"]*s?)$/) do |negated, count, content, widget_action|
+  negation_prefix = (negated && negated.length > 0) ? 'no_' : ''
+  expected_count = (count && count.length > 0) ? count.strip.to_i : 1
+  if expected_count > 1
+    expect(current_page).to send("have_#{negation_prefix}#{to_widget_action(widget_action)}", content, count)
+  else
+    expect(current_page).to send("have_#{negation_prefix}#{to_widget_action(widget_action)}", content)
+  end
+end
+

data/lib/capybara/widgets/cucumber/widget_steps.rb

@@ -37,9 +37,9 @@ end
 # I open "My Report" from a "Reports page"
 # is mapped to:
 # ReportsPage.new.open!("My Report")
-When(/^I (.*) "([^"]*)" from a "([^"]*)"$/) do |action_name, action_param, widget_path|
+When(/^I open "([^"]*)" from a "([^"]*)"$/) do |action_param, widget_path|
   target_widget = resolve_widget(widget_path)
-  target_widget.send(to_widget_action(action_name, '!'), action_param)
+  target_widget.open!(action_param)
 end
 
 
@@ -57,8 +57,9 @@ end
 # is mapped to: expect(MyWidget.new).to have_no_action("Do it")
 # I should see "Do it" value in a "My page -> page component"
 # is mapped to: expect(MyPage.new.page_component).to have_value("Do it")
-And(/^I should( not)? see "([^"]*)" (.*) (?:in|on) a "([^"]*)"$/) do |negated, content, widget_action, widget_path|
+And(/^I should( not)? see( \d+)? "([^"]*)" (.*) (?:in|on) a "([^"]*)"$/) do |negated, count, content, widget_action, widget_path|
   negation_prefix = (negated && negated.length > 0) ? 'no_' : ''
+  expected_count = (count && count.length > 0) ? count.strip.to_i : 1
   target_widget = resolve_widget(widget_path)
   expect(target_widget).to send("have_#{negation_prefix}#{to_widget_action(widget_action)}", content)
 end
@@ -72,14 +73,19 @@ When(/^I fill in the following in a "([^"]*)"$/) do |widget_name, table|
   end
 end
 
-And(/^the "([^"]*)" should be "([^"]*)" in a "([^"]*)"$/) do |field_name, expected, widget_name|
+And(/^the "([^"]*)" should( not)? be "([^"]*)" in a "([^"]*)"$/) do |field_name, negated, expected, widget_name|
   within_widget(to_widget_class(widget_name)) do |widget|
     action = to_widget_action(field_name)
-    if widget.respond_to? "has_#{action}?"
-      expect(widget.send("has_#{action}?", expected)).to be_true
+    negation_prefix = (negated && negated.length > 0) ? 'no_' : ''
+    if widget.respond_to? "has_#{negation_prefix}#{action}?"
+      expect(widget.send("has_#{negation_prefix}#{action}?", expected)).to be_truthy
     else
       actual = widget.send(action)
-      expect(actual).to eq(expected)
+      if (negated && negated.length > 0)
+        expect(actual).not_to eq(expected)
+      else
+        expect(actual).to eq(expected)
+      end
     end
   end
 end

data/lib/capybara/widgets/helpers/async_helper.rb

@@ -2,7 +2,7 @@ module Capybara
   module Widgets
     module AsyncHelper
       def eventually(options = {})
-        timeout = options[:timeout] || 10
+        timeout = options[:timeout] || Capybara.default_max_wait_time
         interval = options[:interval] || 0.1
         time_limit = Time.now + timeout
         loop do

data/lib/capybara/widgets/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Widgets
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-widgets
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Vitalii Grygoruk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler