capybara-ng 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0fd3873f9fff7e7552e5a62b0a16a12cb8e960f
-  data.tar.gz: 03011c29b2d399748ca090482395bb0fb47e4820
+  metadata.gz: 4751f5d1b3319c7ffdc1524119db8ae2af4ad77b
+  data.tar.gz: 8eb230d62a078b284fa5f04108f2fd26c229d754
 SHA512:
-  metadata.gz: 42bc6bbfb546dd007a27308146e4bec2e914ae99cb47a167bbfbf3a8bd35c0ca61d0676a68af1d456129eb2e312d21790145ac03b5e8f8ddf43f81b99624c51f
-  data.tar.gz: 2154e49664ff9d9a06c616b019383d0e14fff13755d95623f07aa69a6ff638180b57175b1963f6ec376e8c3e18fadb896fdef2c0bcd07da6979af8947606e103
+  metadata.gz: 7693856f13f3b8488998226acb849b265ae0e03b905ea8cde880a5fc3aa3424a7f430e6942304624b4c1c19e6ae200ba6152b066831e0c4c0652cb2d1f68912c
+  data.tar.gz: 7c2f25c8bb781d417e3b4011fa5356be4171253526394931609b203c1508cba3e4be18d933fb6e7d799a7cc54d3a1bb7d969761a1b134777474c34bee3b5c98e

data/README.md

@@ -3,9 +3,17 @@
 Basic bindings for AngularJS to be used with Capybara. Implementation is based into
 logic copied from Protractor.
 
-NOTE: At this point of development, I would classify DSL API "unstable". This means that
+*NOTE* At this point of development, I would classify DSL API "unstable". This means that
 DSL language may change in incompatible ways.
 
+## Supported drivers
+
+Based into testing following drivers should work.
+
+- chrome
+- poltergeist
+- webkit
+
 ## Related Projects
 
 - https://github.com/jnicklas/capybara

data/lib/angular/capybara_setup.rb

@@ -5,4 +5,9 @@ class Capybara::Session
   def ng_session_options
     @ng_session_options ||= {}
   end
+
+  def ng
+    opt = ng_session_options
+    opt[:ng] ||= ::Angular::Setup.new(self)
+  end
 end

data/lib/angular/client_script.rb

@@ -40,10 +40,12 @@ FN
 function(binding, exactMatch, using, rootSelector) {
   rootSelector = rootSelector || 'body';
   using = using || document.querySelector(rootSelector);
+
   if (angular.getTestability) {
     return angular.getTestability(using).
         findBindings(using, binding, exactMatch);
   }
+
   var bindings = using.getElementsByClassName('ng-binding');
   var matches = [];
   for (var i = 0; i < bindings.length; ++i) {
@@ -67,6 +69,23 @@ function(binding, exactMatch, using, rootSelector) {
 };
 FN
 
+# /**
+#  * Find a list of element Ids in the page by their angular binding.
+#  *
+#  * @param {string} binding The binding, e.g. {{cat.name}}.
+#  * @param {boolean} exactMatch Whether the binding needs to be matched exactly
+#  * @param {Element} using The scope of the search.
+#  * @param {string} rootSelector The selector to use for the root app element.
+#  *
+#  * @return {Array.<Element>} The elements containing the binding.
+#  */
+  FN_findBindingsIds = <<-FN
+function(binding, exactMatch, using, rootSelector) {
+  var elements = findBindings(binding, exactMatch, using, rootSelector);
+  return createCapybaraNgMatches(elements);
+};
+FN
+
 # /**
 #  * Find an array of elements matching a row within an ng-repeat.
 #  * Always returns an array of only one element for plain old ng-repeat.
@@ -120,7 +139,27 @@ function(repeater, index, using, rootSelector) {
     }
   }
   return [rows[index]].concat(multiRows[index]);
- };
+};
+FN
+
+# /**
+#  * Find an array of element ids matching a row within an ng-repeat.
+#  * Always returns an array of only one element for plain old ng-repeat.
+#  * Returns an array of all the elements in one segment for ng-repeat-start.
+#  *
+#  * @param {string} repeater The text of the repeater, e.g. 'cat in cats'.
+#  * @param {number} index The row index.
+#  * @param {Element} using The scope of the search.
+#  * @param {string} rootSelector The selector to use for the root app element.
+#  *
+#  * @return {Array.<Element>} The row of the repeater, or an array of elements
+#  *     in the first row in the case of ng-repeat-start.
+#  */
+  FN_findRepeaterRowsIds = <<-FN
+function(repeater, index, using, rootSelector) {
+  var elements = findRepeaterRows(repeater, index, using, rootSelector);
+  return createCapybaraNgMatches(elements);
+};
 FN
 
  # /**
@@ -167,7 +206,23 @@ function(repeater, using, rootSelector) {
     }
   }
   return rows;
- };
+};
+FN
+
+ # /**
+ # * Find all rows ids of an ng-repeat.
+ # *
+ # * @param {string} repeater The text of the repeater, e.g. 'cat in cats'.
+ # * @param {Element} using The scope of the search.
+ # * @param {string} rootSelector The selector to use for the root app element.
+ # *
+ # * @return {Array.<Element>} All rows of the repeater.
+ # */
+  FN_findAllRepeaterRowsIds = <<-FN
+function(repeater, using, rootSelector) {
+  var elements = findAllRepeaterRows(repeater, using, rootSelector);
+  return createCapybaraNgMatches(elements);
+};
 FN
 
 # /**
@@ -270,6 +325,24 @@ function(repeater, index, binding, using, rootSelector) {
 };
 FN
 
+# /**
+#  * Find an element ids within an ng-repeat by its row and column.
+#  *
+#  * @param {string} repeater The text of the repeater, e.g. 'cat in cats'.
+#  * @param {number} index The row index.
+#  * @param {string} binding The column binding, e.g. '{{cat.name}}'.
+#  * @param {Element} using The scope of the search.
+#  * @param {string} rootSelector The selector to use for the root app element.
+#  *
+#  * @return {Array.<Element>} The element in an array.
+#  */
+  FN_findRepeaterElementIds = <<-FN
+function(repeater, index, binding, using, rootSelector) {
+  var elements = findRepeaterElement(repeater, index, binding, using, rootSelector);
+  return createCapybaraNgMatches(elements);
+};
+FN
+
 # /**
 #  * Find the elements in a column of an ng-repeat.
 #  *
@@ -367,6 +440,23 @@ function(repeater, binding, using, rootSelector) {
 };
 FN
 
+# /**
+#  * Find the elements in a column of an ng-repeat.
+#  *
+#  * @param {string} repeater The text of the repeater, e.g. 'cat in cats'.
+#  * @param {string} binding The column binding, e.g. '{{cat.name}}'.
+#  * @param {Element} using The scope of the search.
+#  * @param {string} rootSelector The selector to use for the root app element.
+#  *
+#  * @return {Array.<Element>} The elements in the column.
+#  */
+  FN_findRepeaterColumnIds = <<-FN
+function(repeater, binding, using, rootSelector) {
+  var elements = findRepeaterColumn(repeater, binding, using, rootSelector);
+  return createCapybaraNgMatches(elements);
+};
+FN
+
 # /**
 #  * Find elements by model name.
 #  *
@@ -385,6 +475,7 @@ function(model, using, rootSelector) {
     return angular.getTestability(using).
         findModels(using, model, true);
   }
+
   var prefixes = ['ng-', 'ng_', 'data-ng-', 'x-ng-', 'ng\\\\:'];
   for (var p = 0; p < prefixes.length; ++p) {
     var selector = '[' + prefixes[p] + 'model="' + model + '"]';
@@ -396,6 +487,22 @@ function(model, using, rootSelector) {
 };
 FN
 
+# /**
+#  * Find element ids by model name.
+#  *
+#  * @param {string} model The model name.
+#  * @param {Element} using The scope of the search.
+#  * @param {string} rootSelector The selector to use for the root app element.
+#  *
+#  * @return {Array.<Element>} The matching elements.
+#  */
+  FN_findByModelIds = <<-FN
+function(model, using, rootSelector) {
+  var elements = findByModel(model, using, rootSelector);
+  return createCapybaraNgMatches(elements);
+};
+FN
+
 # /**
 #  * Find elements by options.
 #  *
@@ -422,6 +529,23 @@ function(optionsDescriptor, using, rootSelector) {
 };
 FN
 
+# /**
+#  * Find elements by options.
+#  *
+#  * @param {string} optionsDescriptor The descriptor for the option
+#  *     (i.e. fruit for fruit in fruits).
+#  * @param {Element} using The scope of the search.
+#  * @param {string} rootSelector The selector to use for the root app element.
+#  *
+#  * @return {Array.<Element>} The matching elements.
+#  */
+  FN_findByOptionsIds = <<-FN
+function(optionsDescriptor, using, rootSelector) {
+  var elements = findByOptions(optionsDescriptor, using, rootSelector);
+  return createCapybaraNgMatches(elements);
+};
+FN
+
 # /**
 #  * Find buttons by textual content.
 #  *

data/lib/angular/dsl.rb

@@ -1,7 +1,7 @@
 module Angular
 module DSL
   def ng
-    @ng ||= ::Angular::Setup.new(Capybara.current_session)
+    Capybara.current_session.ng
   end
 
   def ng_root_selector(root_selector = nil)
@@ -100,7 +100,7 @@ module DSL
   #
   def ng_bindings(binding, opt = {})
     opt[:root_selector] ||= ng_root_selector
-    ng.get_nodes :findBindings, [binding, opt[:exact] == true], opt
+    ng.get_nodes_2 :findBindingsIds, [binding, opt[:exact] == true], opt
   end
 
   #
@@ -118,6 +118,18 @@ module DSL
   rescue NotFound
     false
   end
+  #
+  # Does model not exist
+  #
+  # @param opt
+  # - :using
+  # - :root_selector
+  # - :wait
+  # @return true | false
+  #
+  def has_no_ng_model?(model, opt = {})
+    !has_ng_model?(model, opt)
+  end
 
   #
   # Node for nth model match
@@ -146,7 +158,7 @@ module DSL
   #
   def ng_models(model, opt = {})
     opt[:root_selector] ||= ng_root_selector
-    ng.get_nodes :findByModel, [model], opt
+    ng.get_nodes_2 :findByModelIds, [model], opt
   end
 
   #
@@ -158,7 +170,7 @@ module DSL
   # - :wait
   # @return true | false
   #
-  def has_ng_option?(options, opt = {})
+  def has_ng_options?(options, opt = {})
     opt[:root_selector] ||= ng_root_selector
     ng_options(options, opt)
     true
@@ -166,6 +178,19 @@ module DSL
     false
   end
 
+  #
+  # Does option not exist
+  #
+  # @param opt
+  # - :using
+  # - :root_selector
+  # - :wait
+  # @return true | false
+  #
+  def has_no_ng_options?(options, opt = {})
+    !has_ng_options?(options, opt)
+  end
+
   #
   # Node for nth option
   #
@@ -193,7 +218,7 @@ module DSL
   #
   def ng_options(options, opt = {})
     opt[:root_selector] ||= ng_root_selector
-    ng.get_nodes :findByOptions, [options], opt
+    ng.get_nodes_2(:findByOptionsIds, [options], opt)
   end
 
   #
@@ -206,13 +231,25 @@ module DSL
   # @return true | false
   #
   def has_ng_repeater_row?(repeater, opt = {})
-    opt[:root_selector] ||= ng_root_selector
-    ng.get_nodes(:findRepeaterRows, [repeater, 0], opt)
+    ng_repeater_row(repeater, opt)
     true
   rescue NotFound
     false
   end
 
+  #
+  # Does row not exist
+  #
+  # @param opt
+  # - :using
+  # - :root_selector
+  # - :wait
+  # @return true | false
+  #
+  def has_no_ng_repeater_row?(repeater, opt = {})
+    !has_ng_repeater_rows?(repeater, opt)
+  end
+
   #
   # Node for nth repeater row
   #
@@ -226,7 +263,7 @@ module DSL
   def ng_repeater_row(repeater, opt = {})
     opt[:root_selector] ||= ng_root_selector
     row = ng.row(opt)
-    data = ng.get_nodes(:findRepeaterRows, [repeater, row], opt)
+    data = ng.get_nodes_2(:findRepeaterRowsIds, [repeater, row], opt)
     data.first
   end
 
@@ -241,7 +278,7 @@ module DSL
   #
   def ng_repeater_rows(repeater, opt = {})
     opt[:root_selector] ||= ng_root_selector
-    ng.get_nodes :findAllRepeaterRows, [repeater], opt
+    ng.get_nodes_2 :findAllRepeaterRowsIds, [repeater], opt
   end
 
   #
@@ -271,7 +308,7 @@ module DSL
   #
   def ng_repeater_columns(repeater, binding, opt = {})
     opt[:root_selector] ||= ng_root_selector
-    ng.get_nodes :findRepeaterColumn, [repeater, binding], opt
+    ng.get_nodes_2 :findRepeaterColumnIds, [repeater, binding], opt
   end
 
   #
@@ -297,7 +334,7 @@ module DSL
   #
   def ng_repeater_elements(repeater, index, binding, opt = {})
     opt[:root_selector] ||= ng_root_selector
-    ng.get_nodes :findRepeaterElement, [repeater, index, binding], opt
+    ng.get_nodes_2 :findRepeaterElementIds, [repeater, index, binding], opt
   end
 end
 end

data/lib/angular/setup.rb

@@ -32,6 +32,37 @@ module Angular
       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)
+      ids = make_call(method, params, opt)
+     raise NotFound.new("#{method}: #{params} - #{opt.inspect}") if ids.nil? || ids.empty?
+      make_nodes(ids, opt)
+    end
+
+    def make_nodes(ids, opt)
+      result = []
+      ids.each do |id|
+        id = id.tr('"', '')
+        selector = "//*[@capybara-ng-match='#{id}']"
+        nodes = page.driver.find_xpath(selector)
+
+        raise NotFound.new("Failed to match found id to node") if nodes.empty?
+        result.concat(nodes)
+      end
+      page.evaluate_script("clearCapybaraNgMatches('#{opt[:root_selector]}')");
+      result
+    end
+
     #
     # @param opt
     # - :nodes
@@ -60,7 +91,6 @@ module Angular
 
       js = "#{method}(#{js_params.join(', ')});"
       logger.debug js
-
       js_result = page.evaluate_script(js);
 #      logger.debug js_result
 

data/lib/angular/version.rb

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

data/lib/angular/waiter.rb

@@ -33,8 +33,42 @@ module Angular
 
     def setup_waiter
       script = <<-JS
-        window.ngReady = false;
         (function() {
+          "use strict";
+
+          window.ngReady = false;
+
+          window.nextCapybaraId = function() {
+            window.capybaraId = window.capybaraId || 1;
+            return window.capybaraId++;
+          };
+
+          window.createCapybaraNgMatches = function(nodes) {
+            if (!nodes) {
+              return nodes;
+            }
+
+            var matches = [];
+            angular.forEach(nodes, function(node) {
+              if (node) {
+                var match = "cb_" + window.nextCapybaraId();
+                node.setAttribute('capybara-ng-match', match);
+                matches.push(match);
+              }
+            });
+            return matches;
+          };
+
+          window.clearCapybaraNgMatches = function(rootSelector) {
+            rootSelector = rootSelector || 'body';
+            var root = document.querySelector(rootSelector);
+
+            var nodes = root.querySelectorAll('[capybara-ng-match]');
+            angular.forEach(nodes, function(node) {
+              node.removeAttribute('capybara-ng-match');
+            });
+          };
+
           var app = angular.element(document.querySelector('[ng-app], [data-ng-app]'));
           var injector = app.injector();
           var callback = function() {

data/travis/run.sh

@@ -1,13 +1,23 @@
 cd spec/dummy
 export BUNDLE_GEMFILE=$PWD/Gemfile
 
-xvfb-run -a bundle exec cucumber
+echo "cucumber - poltergeist"
+xvfb-run -a export CAPYBARA_DRIVER=poltergeist && bundle exec cucumber
 EXIT_1=$?
 
-xvfb-run -a bundle exec rspec
+echo "cucumber - webkit"
+xvfb-run -a export CAPYBARA_DRIVER=webkit && bundle exec cucumber
 EXIT_2=$?
 
-if [[ $EXIT_1 != 0 || $EXIT_2 != 0 ]]; then
+echo "rspec - poltergeist"
+xvfb-run -a export CAPYBARA_DRIVER=poltergeist && bundle exec rspec
+EXIT_3=$?
+
+echo "rspec - webkit"
+xvfb-run -a export CAPYBARA_DRIVER=webkit && bundle exec rspec
+EXIT_4=$?
+
+if [[ $EXIT_1 != 0 || $EXIT_2 != 0 || $EXIT_3 != 0 || $EXIT_4 != 0 ]]; then
     echo "Failed"
     exit 1
 fi

metadata

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