capybara-ng 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 272b3ae336ae30ce0cfc4a0b336f9e59a56d5f77
-  data.tar.gz: 259f32420faf615fe85b396b9cbe49913849440d
+  metadata.gz: d0fd3873f9fff7e7552e5a62b0a16a12cb8e960f
+  data.tar.gz: 03011c29b2d399748ca090482395bb0fb47e4820
 SHA512:
-  metadata.gz: 7ad84aeb366c9c2f9416fc5d61ba43b870ee7518325b0ec1d6d7c431fed0386fc22078dc211bce90dfcd0df9a9b1ab7afa9bea643352ab6e1c4b71aee660dcdc
-  data.tar.gz: 7a67b059a94349fa8e033bc337d8a966d9014826c47640cd8fc650a98cd0d44d0be37fb0aa503f88a116b4946087a85b8393fdb3f7081fc250dff13d784bdf8a
+  metadata.gz: 42bc6bbfb546dd007a27308146e4bec2e914ae99cb47a167bbfbf3a8bd35c0ca61d0676a68af1d456129eb2e312d21790145ac03b5e8f8ddf43f81b99624c51f
+  data.tar.gz: 2154e49664ff9d9a06c616b019383d0e14fff13755d95623f07aa69a6ff638180b57175b1963f6ec376e8c3e18fadb896fdef2c0bcd07da6979af8947606e103

data/.ruby-gemset

@@ -1 +1 @@
-capybara-angular
+capybara-ng

data/.travis.yml

@@ -0,0 +1,25 @@
+language: ruby
+rvm:
+  - 2.1.5
+sudo: false
+cache: bundler
+#  directories:
+#  - vendor/bundle
+#  - spec/dummy/vendor/bundl
+gemfile: spec/dummy/Gemfile
+branches:
+  only:
+    - master
+
+#before_install:
+#  - "export DISPLAY=:99.0"
+#  - "sh -e /etc/init.d/xvfb start"
+
+# @see https://github.com/travis-ci/travis-ci/issues/938
+before_install:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - curl -Lo chrome.zip https://download-chromium.appspot.com/dl/Linux_x64 && unzip chrome.zip
+
+before_script: travis/setup.sh
+script: travis/run.sh

data/README.md

@@ -41,6 +41,17 @@ RSpec.configure do |config|
 end
 ```
 
+## Examples
+
+### Example test cases
+
+````bash
+cd spec/dummy
+bundle
+bundle exec rake rspec
+bundle exec rake cucumber
+```
+
 ### Experimenting features
 
 @see https://github.com/kikonen/sampler/blob/master/dummy/spec/request/test_spec.rb

data/lib/angular/capybara_setup.rb

@@ -1,4 +1,8 @@
 # bind logic to capybara
 class Capybara::Session
   include ::Angular::DSL
+
+  def ng_session_options
+    @ng_session_options ||= {}
+  end
 end

data/lib/angular/dsl.rb

@@ -5,10 +5,11 @@ module DSL
   end
 
   def ng_root_selector(root_selector = nil)
+    opt = ng.page.ng_session_options
     if root_selector
-      @ng_root_selector = root_selector
+      opt[:root_selector] = root_selector
     end
-    @ng_root_selector || ::Angular.root_selector
+    opt[:root_selector] || ::Angular.root_selector
   end
 
   def ng_install
@@ -23,14 +24,14 @@ module DSL
   # @return current location absolute url
   #
   def ng_location_abs(opt = {})
-    selector = opt.delete(:rootSelector) || ng_root_selector
+    selector = opt.delete(:root_selector) || ng_root_selector
     ng.make_call :getLocationAbsUrl, [selector], opt
   end
 
   # @return current location absolute url
   #
   def ng_location(opt = {})
-    selector = opt.delete(:rootSelector) || ng_root_selector
+    selector = opt.delete(:root_selector) || ng_root_selector
     ng.make_call :getLocation, [selector], opt
   end
 
@@ -38,18 +39,18 @@ module DSL
   # @return current location
   #
   def ng_set_location(url, opt = {})
-    selector = opt.delete(:rootSelector) || ng_root_selector
+    selector = opt.delete(:root_selector) || ng_root_selector
     ng.make_call :setLocation, [selector, url], opt
   end
 
   #
   # @param opt
-  # - :rootSelector
+  # - :root_selector
   # - :wait
   # @return eval result
   #
   def ng_eval(expr, opt = {})
-    selector = opt.delete(:rootSelector) || ng_root_selector
+    selector = opt.delete(:root_selector) || ng_root_selector
     ng.make_call :evaluate, [selector, expr], opt
   end
 
@@ -59,7 +60,7 @@ module DSL
   # @param opt
   # - :exact
   # - :using
-  # - :rootSelector
+  # - :root_selector
   # - :wait
   # @return true | false
   #
@@ -77,11 +78,12 @@ module DSL
   # - :row
   # - :exact
   # - :using
-  # - :rootSelector
+  # - :root_selector
   # - :wait
   # @return nth node
   #
   def ng_binding(binding, opt = {})
+    opt[:root_selector] ||= ng_root_selector
     row = ng.row(opt)
     ng_bindings(binding, opt)[row]
   end
@@ -92,12 +94,13 @@ module DSL
   # @param opt
   # - :exact
   # - :using
-  # - :rootSelector
+  # - :root_selector
   # - :wait
   # @return [node, ...]
   #
   def ng_bindings(binding, opt = {})
-    ng.get_nodes :findBindings, [binding, opt[:exact]], opt
+    opt[:root_selector] ||= ng_root_selector
+    ng.get_nodes :findBindings, [binding, opt[:exact] == true], opt
   end
 
   #
@@ -105,7 +108,7 @@ module DSL
   #
   # @param opt
   # - :using
-  # - :rootSelector
+  # - :root_selector
   # - :wait
   # @return true | false
   #
@@ -122,11 +125,12 @@ module DSL
   # @param opt
   # - :row
   # - :using
-  # - :rootSelector
+  # - :root_selector
   # - :wait
   # @return nth node
   #
   def ng_model(model, opt = {})
+    opt[:root_selector] ||= ng_root_selector
     row = ng.row(opt)
     ng_models(model, opt)[row]
   end
@@ -136,11 +140,12 @@ module DSL
   #
   # @param opt
   # - :using
-  # - :rootSelector
+  # - :root_selector
   # - :wait
   # @return [node, ...]
   #
   def ng_models(model, opt = {})
+    opt[:root_selector] ||= ng_root_selector
     ng.get_nodes :findByModel, [model], opt
   end
 
@@ -149,11 +154,12 @@ module DSL
   #
   # @param opt
   # - :using
-  # - :rootSelector
+  # - :root_selector
   # - :wait
   # @return true | false
   #
   def has_ng_option?(options, opt = {})
+    opt[:root_selector] ||= ng_root_selector
     ng_options(options, opt)
     true
   rescue NotFound
@@ -166,11 +172,12 @@ module DSL
   # @param opt
   # - :row
   # - :using
-  # - :rootSelector
+  # - :root_selector
   # - :wait
   # @return nth node
   #
   def ng_option(options, opt = {})
+    opt[:root_selector] ||= ng_root_selector
     row = ng.row(opt)
     ng_options(options, opt)[row]
   end
@@ -180,11 +187,12 @@ module DSL
   #
   # @param opt
   # - :using
-  # - :rootSelector
+  # - :root_selector
   # - :wait
   # @return [node, ...]
   #
   def ng_options(options, opt = {})
+    opt[:root_selector] ||= ng_root_selector
     ng.get_nodes :findByOptions, [options], opt
   end
 
@@ -193,11 +201,12 @@ module DSL
   #
   # @param opt
   # - :using
-  # - :rootSelector
+  # - :root_selector
   # - :wait
   # @return true | false
   #
   def has_ng_repeater_row?(repeater, opt = {})
+    opt[:root_selector] ||= ng_root_selector
     ng.get_nodes(:findRepeaterRows, [repeater, 0], opt)
     true
   rescue NotFound
@@ -210,11 +219,12 @@ module DSL
   # @param opt
   # - :row
   # - :using
-  # - :rootSelector
+  # - :root_selector
   # - :wait
   # @return nth node
   #
   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.first
@@ -225,11 +235,12 @@ module DSL
   #
   # @param opt
   # - :using
-  # - :rootSelector
+  # - :root_selector
   # - :wait
   # @return [node, ...]
   #
   def ng_repeater_rows(repeater, opt = {})
+    opt[:root_selector] ||= ng_root_selector
     ng.get_nodes :findAllRepeaterRows, [repeater], opt
   end
 
@@ -239,11 +250,12 @@ module DSL
   # @param opt
   # - :row
   # - :using
-  # - :rootSelector
+  # - :root_selector
   # - :wait
   # @return nth node
   #
   def ng_repeater_column(repeater, binding, opt = {})
+    opt[:root_selector] ||= ng_root_selector
     row = ng.row(opt)
     ng_repeater_columns(repeater, binding, opt)[row]
   end
@@ -253,11 +265,12 @@ module DSL
   #
   # @param opt
   # - :using
-  # - :rootSelector
+  # - :root_selector
   # - :wait
   # @return [node, ...]
   #
   def ng_repeater_columns(repeater, binding, opt = {})
+    opt[:root_selector] ||= ng_root_selector
     ng.get_nodes :findRepeaterColumn, [repeater, binding], opt
   end
 
@@ -265,11 +278,12 @@ module DSL
   # @param opt
   # - :row
   # - :using
-  # - :rootSelector
+  # - :root_selector
   # - :wait
   # @return nth node
   #
   def ng_repeater_element(repeater, index, binding, opt = {})
+    opt[:root_selector] ||= ng_root_selector
     row = ng.row(opt)
     ng_repeater_elements(repeater, index, binding, opt)[row]
   end
@@ -277,11 +291,12 @@ module DSL
   #
   # @param opt
   # - :using
-  # - :rootSelector
+  # - :root_selector
   # - :wait
   # @return [node, ...]
   #
   def ng_repeater_elements(repeater, index, binding, opt = {})
+    opt[:root_selector] ||= ng_root_selector
     ng.get_nodes :findRepeaterElement, [repeater, index, binding], opt
   end
 end

data/lib/angular/setup.rb

@@ -20,14 +20,14 @@ module Angular
     #
     # @param opt
     # - :using
-    # - :rootSelector
+    # - :root_selector
     # - :wait
     #
     def get_nodes(method, params, opt = {})
       opt = {
         nodes: true,
         using: nil,
-        rootSelector: ::Angular.root_selector,
+        root_selector: ::Angular.root_selector,
       }.merge(opt)
       make_call(method, params, opt)
     end
@@ -46,7 +46,7 @@ module Angular
       ng_wait if opt[:wait]
 
       params << opt[:using] if opt.has_key?(:using)
-      params << opt[:rootSelector] if opt.has_key?(:rootSelector)
+      params << opt[:root_selector] if opt.has_key?(:root_selector)
       js_params = params.map do |p|
         if p.nil?
           'null'
@@ -77,6 +77,10 @@ module Angular
         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

data/lib/angular/version.rb

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

data/travis/run.sh

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

data/travis/setup.sh

@@ -0,0 +1,3 @@
+#cd spec/dummy
+#export BUNDLE_GEMFILE=$PWD/Gemfile
+#bundle install

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-ng
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - kari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,7 @@ files:
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -78,6 +79,8 @@ files:
 - lib/angular/version.rb
 - lib/angular/waiter.rb
 - lib/capybara-ng.rb
+- travis/run.sh
+- travis/setup.sh
 homepage: https://github.com/kikonen/capybara-ng
 licenses:
 - MIT