capybara-widgets 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b6a90efedf17b2f0960750cc217dde6d049cb80
-  data.tar.gz: 73edd6777f2997aeafd5eed992def14d4f83d82f
+  metadata.gz: dc8ba6872d65c984e482da032b16bc77918c6847
+  data.tar.gz: e7f0e2119a36f16bbbca1c2e35b05ba6375f5229
 SHA512:
-  metadata.gz: b40f627cd2fadf8d5b1212ba77fd738429b1c2a080a76ab950fb2661c38739d76237fa7229963f7b5f2e5db23f57abb33445621ae2ba9bbc38b15e9676a0ade8
-  data.tar.gz: 16b63567da4888f5a77509d5d9aeaac1bd05f7d4742aeaa0e43b5194c17ff39beaf40c5d5680acaad07c92304f18b3e3123d4a26b6de01dd8c4ce786e0bb60ef
+  metadata.gz: 5552b63d66512fa9fe7f621c482094c2c94d4df939d3020bc38ade8775a16d1dc86f6ae191f86355b41a381e82b8d1f116ec621c3b510396448190354ca21f78
+  data.tar.gz: 12f25e3b3c24ed0e4935ff9a60ed3cd034aa7b6398676a6be1c68d082d271574b7242cd9c74efd38adb4dd9bd577cb68395bdab48b6e5a96a5e4b3cc5cf9f433

data/capybara-widgets.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Vitalii Grygoruk"]
   spec.email         = ["vitalii[dot]grygoruk[at]gmail[dot]com"]
   spec.summary       = %q{Page objects and page components for Capybara}
-  spec.description   = %q{Easily create well-structured page and ui component classes in your Capybara + Cucumber or Rspec tests}
+  spec.description   = %q{Easily create well-structured page and ui component classes in your Capybara, Cucumber/RSpec tests}
   spec.homepage      = ""
   spec.license       = "MIT"
 
@@ -20,9 +20,10 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.2"
-  spec.add_development_dependency "cucumber"
 
   spec.add_dependency "capybara", "~> 2.0"
   spec.add_dependency "activesupport"
+  spec.add_dependency "rspec", "~> 3.2"
+  spec.add_dependency "rspec-wait"
+  spec.add_development_dependency "cucumber"
 end

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

@@ -29,43 +29,51 @@ module Capybara
         @root
       end
 
-      # override this method if you need to narrow down search context for a particular UI widget / block
+      # @deprecated, use :root_element method instead
       def narrow
         @root
       end
 
-      def element(*query)
-        root.find(*query)
-      end
-
-      def has_element?(*query)
-        root.has_selector?(*query)
+      def resolve(*query_with_args)
+        query = query_with_args.shift
+        args = query_with_args
+        if query.is_a?(Proc)
+          # resolve lambda selector in scope of widget instance
+          return self.instance_exec(*args, &query)
+        else
+          return query, *args
+        end
       end
 
       class << self
+
+        ## override :narrow method if :root_element is used in a class
+        def root_element(*query)
+          define_method(:root_query) { resolve(*query) }
+          define_method(:narrow) { root.find(*resolve(*query)) }
+          define_method(:has_root_element?) { page.has_selector?(*resolve(*query))}
+          define_method(:has_no_root_element?) { page.has_no_selector?(*resolve(*query))}
+        end
+
         def component(name, klass, *query)
           define_method name do |*args|
-            component_root = query.length > 0 ? root.find(*query, *args) : root
+            component_root = query.length > 0 ? root.find(*resolve(*query, *args)) : root
             klass.new(component_root)
           end
-        end
-
-        def resolve(*query_with_args)
-          query = query_with_args.shift
-          args = query_with_args
-          if query.is_a?(Proc)
-            return query.(*args)
-          else
-            return query, *args
+          define_method "has_#{name}?".to_sym do |*args|
+            root.has_selector?(*resolve(*query, *args))
+          end
+          define_method "has_no_#{name}?" do |*args|
+            root.has_no_selector?(*resolve(*query, *args))
           end
         end
 
         def element(name, *query)
-          define_method("#{name}!") { |*args| root.find(*Widget.resolve(*query, *args)).click }
-          define_method(name) { |*args| root.find(*Widget.resolve(*query, *args)) }
-          define_method("#{name}=") { |arg| root.find(*Widget.resolve(*query)).set(arg) }
-          define_method("has_#{name}?") { |*args| root.has_selector?(*Widget.resolve(*query, *args)) }
-          define_method("has_no_#{name}?") { |*args| root.has_no_selector?(*Widget.resolve(*query, *args)) }
+          define_method("#{name}!") { |*args| root.find(*resolve(*query, *args)).click }
+          define_method(name) { |*args| root.find(*resolve(*query, *args)) }
+          define_method("#{name}=") { |arg| root.find(*resolve(*query)).set(arg) }
+          define_method("has_#{name}?") { |*args| root.has_selector?(*resolve(*query, *args)) }
+          define_method("has_no_#{name}?") { |*args| root.has_no_selector?(*resolve(*query, *args)) }
         end
 
         def required_element(*element_names)
@@ -90,10 +98,6 @@ module Capybara
         alias_method :required_components, :required_component
       end
 
-      def displayed?
-        root.visible?
-      end
-
       # delegate missing methods to the @root node
       def method_missing(method_sym, *arguments, &block)
         if root.respond_to? method_sym

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

@@ -21,12 +21,12 @@ When(/^I click "([^"]*)" [o|i]n a "([^"]*)"$/) do |action, widget_path|
   target_widget.send(to_widget_action(action, '!'))
 end
 
-Then(/^the "([^"]*)" should( not)? be displayed$/) do |widget_path, negated|
+Then(/^the "([^"]*)" should( not)? (be .*)$/) do |widget_path, negated, action|
   target_widget = resolve_widget(widget_path)
   if negated
-    expect(target_widget).to be_not_displayed, "#{target_widget} should not be displayed"
+    expect(target_widget).not_to send(to_widget_action(action))
   else
-    expect(target_widget).to be_displayed, "#{target_widget} should be displayed"
+    expect(target_widget).to send(to_widget_action(action))
   end
 end
 

data/lib/capybara/widgets/rspec.rb

@@ -21,6 +21,24 @@ module Capybara
           "Expected that '#{widget.class.name}' does not have '#{element}' element"
         end
       end
+
+      RSpec::Matchers.define :be_visible do
+        match do |widget|
+          widget.has_root_element?
+        end
+
+        match_when_negated do |widget|
+          widget.has_no_root_element?
+        end
+
+        failure_message do |widget|
+          "Expected that '#{widget.class.name}' to be visible"
+        end
+
+        failure_message_when_negated do |widget|
+          "Expected that '#{widget.class.name}' not to be visible"
+        end
+      end
     end
   end
 end

data/lib/capybara/widgets/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Widgets
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

data/spec/features/widget_spec.rb

@@ -5,7 +5,7 @@ describe Capybara::Widgets::Widget do
   let(:stub_node) { Capybara::Node::Base.new(nil, nil) }
 
   it 'has capybara page as a default root node' do
-    expect(subject.root).to eq(page)
+    expect(klass.new.root).to eq(page)
   end
 
   it 'can be initialized with Capybara::Node::Base' do
@@ -26,7 +26,7 @@ describe Capybara::Widgets::Widget do
 
   it 'can have lazy-initialized root node' do
     # Arrange 
-    class MyWidget < klass   
+    class MyWidget < Capybara::Widgets::Widget
       attr_accessor :loaded
       def initialize; self.loaded = false; end
       def narrow; self.loaded = true; @root; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-widgets
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Vitalii Grygoruk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,27 +39,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,21 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rspec-wait
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,8 +94,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Easily create well-structured page and ui component classes in your Capybara
-  + Cucumber or Rspec tests
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Easily create well-structured page and ui component classes in your Capybara,
+  Cucumber/RSpec tests
 email:
 - vitalii[dot]grygoruk[at]gmail[dot]com
 executables: []