lapis_lazuli 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 678920ee3f67c315ee099d4fa4e7d7d30f287265
-  data.tar.gz: 74f2220ac07fb93d431ebe44f18d11058c94b9b1
+  metadata.gz: acc1b88aff0413c88e8412acb1711d658ed95296
+  data.tar.gz: 975355ed0485937425bf8c7587f8307dc5f0c325
 SHA512:
-  metadata.gz: 84fb25b85cf65cc290b286f2d3aec0c97bb58bd5287844752513d2de52e863821fe4ea58a1cd302c48e29dfb9e2c5db500bd73599a99d4d10a8e1e6dffb8b02e
-  data.tar.gz: cc24ed22c6bf41293ebfbc789dc1b36d7f239499c5a53abb6211dfbea378e66778735f654226b968ece874c1f85615c432be226396fcbe9430b2cf48e2cb61dd
+  metadata.gz: e88f50559f3920ef4a84eed8e9814f1f0e74a0bfaff0ed6ff145d5acd56ae2fe09e5a57bf8c37590bc314c7bb5a362c47c076323850af07ec7be149b35030550
+  data.tar.gz: 07c4635c25047b9aeabe94826b8d4472178630dd8f878c953f3dc757105b540b9785fcd142607ffebd1f956bbf67dae5eb6b0d4dfad91455197d3e32c49b003e

data/lapis_lazuli.gemspec

@@ -48,7 +48,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rspec", "~> 3.5"
 
   # webdriver specifics
-  spec.add_dependency "selenium-webdriver", "~> 3"
+  spec.add_dependency "selenium-webdriver", ">= 2"
   spec.add_dependency "watir", "~> 6"
   spec.add_dependency "cucumber", "~> 2"
 

data/lib/lapis_lazuli/browser/wait.rb

@@ -114,9 +114,9 @@ module BrowserModule
           # Catch the default error and add the selectors to it.
           unless throw === false
             # Only raise an error if :throw is not false
-            raise "#{e.message} with selectors: #{options[:selectors]}"
+            raise LapisLazuli::TimeoutError, "#{e.message} with selectors: #{options[:selectors]}"
           end
-        rescue RuntimeError => err
+        rescue LapisLazuli::TimeoutError => err
           options[:exception] = err
           options[:message] = optional_message('Error in wait', options)
           world.error(options)
@@ -125,10 +125,17 @@ module BrowserModule
 
       # Filter out any nil results
       filter_results = results.select {|i| not i.nil?}
+      # Error handling
+      if not err.nil? and filter_results.empty?
+        options[:exception] = err
+        world.error(options)
+      end
 
       # Set if the underlying find function returns single results
       if has_single
-        return results[0]
+        # In chrome, somehow results can be no array, but still has_single is true
+        return results[0] if results.kind_of?(Array)
+        return results
       end
       return results
     end

data/lib/lapis_lazuli/generators/cucumber/template/config/cucumber.yml

@@ -1,4 +1,13 @@
+################################################################################
+# Copyright <%= config[:year] %> spriteCloud B.V. All rights reserved.
+# Generated by LapisLazuli, version <%= config[:lapis_lazuli][:version] %>
+# Author: "<%= config[:user] %>" <<%= config[:email] %>>
+#
+# Ask developer of testsuite to add profiles where desired.
+# This file defines predefined profiles that can be used.
+# Example > Cucumber -t @homepage -p default -p localhost
 
+<%% timestamp = Time.now.strftime("%Y%m%d_%H%M") %>
 
 ################################################################################
 # Type of testrun

data/lib/lapis_lazuli/version.rb

@@ -6,5 +6,4 @@
 # All rights reserved.
 #
 module LapisLazuli
-  VERSION = "1.0.1"
-end
+  VERSION = "1.0.2"end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lapis_lazuli
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Onno Steenbergen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -213,16 +213,16 @@ dependencies:
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: watir
   requirement: !ruby/object:Gem::Requirement