capybara-ng 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4751f5d1b3319c7ffdc1524119db8ae2af4ad77b
-  data.tar.gz: 8eb230d62a078b284fa5f04108f2fd26c229d754
+  metadata.gz: 9a4244f3f4b4efc807b67ad806ebab71b7a7a470
+  data.tar.gz: b844b0f756bbf73f3c6318f41c864aa7cce9121d
 SHA512:
-  metadata.gz: 7693856f13f3b8488998226acb849b265ae0e03b905ea8cde880a5fc3aa3424a7f430e6942304624b4c1c19e6ae200ba6152b066831e0c4c0652cb2d1f68912c
-  data.tar.gz: 7c2f25c8bb781d417e3b4011fa5356be4171253526394931609b203c1508cba3e4be18d933fb6e7d799a7cc54d3a1bb7d969761a1b134777474c34bee3b5c98e
+  metadata.gz: b7c4f1fbde0af58a31fd0e52a72bc59a7efbdf726c25ed17c4609c522eaade408388e1f1b3cd0b1be0cd6584daa30211b5361a97f8a7a20f9bb814d5f29929cd
+  data.tar.gz: 6f899d9f44d42f4e166554cc194ef13c72e7ab85715b7018edf15e6842d87f16932e144e9011e43cab8a070f58bc585b96b5d5382025718c4853b48e44b02f3b

data/README.md

@@ -12,6 +12,7 @@ Based into testing following drivers should work.
 
 - chrome
 - poltergeist
+- selenium (using firefox)
 - webkit
 
 ## Related Projects

data/lib/angular/dsl.rb

@@ -1,9 +1,23 @@
 module Angular
+#
+# common options (aka. "opt"):
+# - root_selector Allow overriding global/page per individual query
+# - wait If true wait for AngularJS to be ready before doing quer (default: true)
+#
 module DSL
   def ng
     Capybara.current_session.ng
   end
 
+  #
+  # Get or set selector to find ng-app for current capybara test session
+  #
+  # TIP: try using '[ng-app]', which will find ng-app as attribute anywhere.
+  #
+  # @param root_selector if nil then return current value without change
+  # @return test specific selector to find ng-app,
+  # by default global ::Angular.root_selector is used.
+  #
   def ng_root_selector(root_selector = nil)
     opt = ng.page.ng_session_options
     if root_selector
@@ -12,15 +26,25 @@ module DSL
     opt[:root_selector] || ::Angular.root_selector
   end
 
+  #
+  # Setup AngularJS test hooks in web page. In normal usage there is no need
+  # to use this
+  #
   def ng_install
     ng.install
   end
 
+  #
+  # Wait that AngularJS is ready
+  #
   def ng_wait
     ng.ng_wait
   end
 
   #
+  # @param opt
+  # - :root_selector
+  # - :wait
   # @return current location absolute url
   #
   def ng_location_abs(opt = {})
@@ -28,6 +52,10 @@ module DSL
     ng.make_call :getLocationAbsUrl, [selector], opt
   end
 
+  #
+  # @param opt
+  # - :root_selector
+  # - :wait
   # @return current location absolute url
   #
   def ng_location(opt = {})
@@ -36,6 +64,9 @@ module DSL
   end
 
   #
+  # @param opt
+  # - :root_selector
+  # - :wait
   # @return current location
   #
   def ng_set_location(url, opt = {})
@@ -59,7 +90,6 @@ module DSL
   #
   # @param opt
   # - :exact
-  # - :using
   # - :root_selector
   # - :wait
   # @return true | false
@@ -77,7 +107,6 @@ module DSL
   # @param opt
   # - :row
   # - :exact
-  # - :using
   # - :root_selector
   # - :wait
   # @return nth node
@@ -93,7 +122,6 @@ module DSL
   #
   # @param opt
   # - :exact
-  # - :using
   # - :root_selector
   # - :wait
   # @return [node, ...]
@@ -107,7 +135,6 @@ module DSL
   # Does model exist
   #
   # @param opt
-  # - :using
   # - :root_selector
   # - :wait
   # @return true | false
@@ -122,7 +149,6 @@ module DSL
   # Does model not exist
   #
   # @param opt
-  # - :using
   # - :root_selector
   # - :wait
   # @return true | false
@@ -136,7 +162,6 @@ module DSL
   #
   # @param opt
   # - :row
-  # - :using
   # - :root_selector
   # - :wait
   # @return nth node
@@ -151,7 +176,6 @@ module DSL
   # All nodes matching model
   #
   # @param opt
-  # - :using
   # - :root_selector
   # - :wait
   # @return [node, ...]
@@ -165,7 +189,6 @@ module DSL
   # Does option exist
   #
   # @param opt
-  # - :using
   # - :root_selector
   # - :wait
   # @return true | false
@@ -182,7 +205,6 @@ module DSL
   # Does option not exist
   #
   # @param opt
-  # - :using
   # - :root_selector
   # - :wait
   # @return true | false
@@ -196,7 +218,6 @@ module DSL
   #
   # @param opt
   # - :row
-  # - :using
   # - :root_selector
   # - :wait
   # @return nth node
@@ -211,7 +232,6 @@ module DSL
   # All option values matching option
   #
   # @param opt
-  # - :using
   # - :root_selector
   # - :wait
   # @return [node, ...]
@@ -225,7 +245,6 @@ module DSL
   # Does row exist
   #
   # @param opt
-  # - :using
   # - :root_selector
   # - :wait
   # @return true | false
@@ -241,7 +260,6 @@ module DSL
   # Does row not exist
   #
   # @param opt
-  # - :using
   # - :root_selector
   # - :wait
   # @return true | false
@@ -255,7 +273,6 @@ module DSL
   #
   # @param opt
   # - :row
-  # - :using
   # - :root_selector
   # - :wait
   # @return nth node
@@ -271,7 +288,6 @@ module DSL
   # All nodes matching repeater
   #
   # @param opt
-  # - :using
   # - :root_selector
   # - :wait
   # @return [node, ...]
@@ -286,7 +302,6 @@ module DSL
   #
   # @param opt
   # - :row
-  # - :using
   # - :root_selector
   # - :wait
   # @return nth node
@@ -301,7 +316,6 @@ module DSL
   # Node for column binding value in all rows
   #
   # @param opt
-  # - :using
   # - :root_selector
   # - :wait
   # @return [node, ...]
@@ -314,7 +328,6 @@ module DSL
   #
   # @param opt
   # - :row
-  # - :using
   # - :root_selector
   # - :wait
   # @return nth node
@@ -327,7 +340,6 @@ module DSL
 
   #
   # @param opt
-  # - :using
   # - :root_selector
   # - :wait
   # @return [node, ...]

data/lib/angular/log.rb

@@ -1,5 +1,5 @@
 module Log
   def logger
-    ::Rails.logger
+    ::Angular.logger
   end
 end

data/lib/angular/setup.rb

@@ -19,28 +19,11 @@ module Angular
 
     #
     # @param opt
-    # - :using
-    # - :root_selector
-    # - :wait
-    #
-    def get_nodes(method, params, opt = {})
-      opt = {
-        nodes: true,
-        using: nil,
-        root_selector: ::Angular.root_selector,
-      }.merge(opt)
-      make_call(method, params, opt)
-    end
-
-    #
-    # @param opt
-    # - :using
     # - :root_selector
     # - :wait
     #
     def get_nodes_2(method, params, opt = {})
       opt = {
-        nodes: false,
         using: nil,
         root_selector: ::Angular.root_selector,
       }.merge(opt)
@@ -49,6 +32,11 @@ module Angular
       make_nodes(ids, opt)
     end
 
+    #
+    # Find nodes matching 'capybara-ng-match' attributes using ids
+    #
+    # @return nodes matching ids
+    #
     def make_nodes(ids, opt)
       result = []
       ids.each do |id|
@@ -65,12 +53,13 @@ module Angular
 
     #
     # @param opt
-    # - :nodes
+    # - :root_selector
     # - :wait
     #
+    # @return result from page.evaluate_script
+    #
     def make_call(method, params, opt = {})
       opt = {
-        nodes: false,
         wait: true,
       }.merge(opt)
 
@@ -94,26 +83,7 @@ module Angular
       js_result = page.evaluate_script(js);
 #      logger.debug js_result
 
-      if opt[:nodes]
-        make_result method, params, js_result
-      else
-        js_result
-      end
-    end
-
-
-    def make_result(method, params, js_result)
-      if js_result.nil? || js_result.empty?
-        raise NotFound.new("#{method}: #{params.inspect}")
-      end
-
-      if js_result.is_a? String
-        raise js_result
-      end
-
-      js_result.map do |el|
-        el ? Capybara::Selenium::Node.new(page.driver, el) : nil
-      end
+      js_result
     end
 
     def angular_app?

data/lib/angular/version.rb

@@ -1,3 +1,3 @@
 module Angular
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/angular.rb

@@ -1,18 +1,32 @@
 require "angular/version"
 require 'capybara'
+require 'logger'
 
 module Angular
   class NotFound < StandardError
   end
 
+  #
+  # @return selector to find ng-app, by default 'body'
+  #
   def self.root_selector
     @root_slector ||= 'body'
   end
 
+  #
+  # Set global default selector for finding ng-app
+  #
   def self.root_selector=(root_selector)
     @root_selector = root_selector
   end
 
+  def self.logger
+    @logger ||=  defined?(::Rails) ? ::Rails.logger : Logger.new('capybara-ng.log')
+  end
+
+  def self.logger=(logger)
+    @logger = logger
+  end
 end
 
 require 'angular/log'

data/travis/run.sh

@@ -1,23 +1,45 @@
 cd spec/dummy
 export BUNDLE_GEMFILE=$PWD/Gemfile
 
+#
+# CUCUMBER
+#
 echo "cucumber - poltergeist"
 xvfb-run -a export CAPYBARA_DRIVER=poltergeist && bundle exec cucumber
-EXIT_1=$?
+EXIT_1_1=$?
 
 echo "cucumber - webkit"
 xvfb-run -a export CAPYBARA_DRIVER=webkit && bundle exec cucumber
-EXIT_2=$?
+EXIT_1_2=$?
 
+echo "cucumber - selenium"
+xvfb-run -a export CAPYBARA_DRIVER=selenium && bundle exec cucumber
+EXIT_1_3=$?
+
+#
+# RSPEC
+#
 echo "rspec - poltergeist"
 xvfb-run -a export CAPYBARA_DRIVER=poltergeist && bundle exec rspec
-EXIT_3=$?
+EXIT_2_1=$?
 
 echo "rspec - webkit"
 xvfb-run -a export CAPYBARA_DRIVER=webkit && bundle exec rspec
-EXIT_4=$?
+EXIT_2_2=$?
+
+echo "rspec - selenium"
+xvfb-run -a export CAPYBARA_DRIVER=selenium && bundle exec rspec
+EXIT_2_3=$?
+
+#
+# Exit check
+#
+if [[ $EXIT_1_1 != 0 || $EXIT_1_2 != 0 || $EXIT_1_3 != 0 ]]; then
+    echo "Cucumber Failed"
+    exit 1
+fi
 
-if [[ $EXIT_1 != 0 || $EXIT_2 != 0 || $EXIT_3 != 0 || $EXIT_4 != 0 ]]; then
-    echo "Failed"
+if [[ $EXIT_2_1 != 0 || $EXIT_2_2 != 0 || $EXIT_2_3 != 0 ]]; then
+    echo "Rspec Failed"
     exit 1
 fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-ng
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - kari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-19 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler