lapis_lazuli 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22cff56fd000a9ccf437846de02561f1ff8bfb2e
-  data.tar.gz: 3ae215a6148881660f32bb7d9e056f798c9be725
+  metadata.gz: 2bebf64aeca1c948f45544ac60273db8c0c8fabe
+  data.tar.gz: 1777385b63b22f4c3f50fdbd9d16a56b59446dd8
 SHA512:
-  metadata.gz: bb45c59449e0993eb39b2029bf992ac556fb7c5a7a93386c6e52eb1eb299087130db2c08a92f4045ebd1ce7da1c23ae637c34a9a4518b3035fca840955a58f98
-  data.tar.gz: d144400c890563e1671c811f3d86288b59e1aad132672c5d0cf0b9248b81a4a5e970e527bbe3789efb95850f8d4bd5b32e4daa4a3807eabb7d4e51dde0d32436
+  metadata.gz: 5152719d302e2bfe8bee2c05824f399d1b4c1bc2cf16f338b9c86dc83cfd37ba73e25d1f695e06e7799abe7c6786f18dd747934b6762a08630985116fc2b5ca7
+  data.tar.gz: de3bf954373b2e550b39f49e908d2a1d989753746cf5f56a983ed947f990b0a230f97884a03b4a5f422e6fc674682aee5d12f153abfb3cfd6c6e710fee12a719

data/lib/lapis_lazuli/browser.rb

@@ -6,10 +6,6 @@
 # All rights reserved.
 #
 
-require 'selenium-webdriver'
-require 'watir-webdriver'
-require "watir-webdriver/extensions/alerts"
-
 require "lapis_lazuli/ast"
 
 # Modules
@@ -50,7 +46,7 @@ module LapisLazuli
       def browsers
         return @@browsers
       end
-      
+
       def add_browser(b)
         # Add destructor for all browsers
         Runtime.instance.set_if(self, :browsers, LapisLazuli::Browser.method(:close_all))
@@ -267,6 +263,15 @@ module LapisLazuli
       # Create a new browser depending on settings
       # Always cached the supplied arguments
       def create_driver(browser_wanted=nil, optional_data=nil)
+        # Run-time dependency.
+        begin
+          require 'selenium-webdriver'
+          require 'watir-webdriver'
+          require "watir-webdriver/extensions/alerts"
+        rescue LoadError => err
+          raise LoadError, "#{err}: you need to add 'watir-webdriver', 'watir-webdriver-performance' and 'watir-scroll' to your Gemfile before using the browser."
+        end
+
         # No browser? Does the config have a browser? Default to firefox
         if browser_wanted.nil?
           browser_wanted = world.env_or_config('browser', 'firefox')
@@ -276,29 +281,29 @@ module LapisLazuli
         case browser_wanted.to_s.downcase
           when 'chrome'
             # Check Platform running script
-            b = :chrome
+            b = [:chrome]
           when 'safari'
-            b = :safari
+            b = [:safari]
           when 'ie'
             require 'rbconfig'
             if (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
-              b = :ie
+              b = [:ie]
             else
               world.error("You can't run IE tests on non-Windows machine")
             end
           when 'ios'
             if RUBY_PLATFORM.downcase.include?("darwin")
-              b = :iphone
+              b = [:iphone]
             else
               world.error("You can't run IOS tests on non-mac machine")
             end
           when 'remote'
-            b = :remote
+            b = [:remote]
           else
-            b = :firefox
+            b = [:firefox, marionette: true]
         end
 
-        args = [b]
+        args = b
         @browser_name = b.to_s
         if b == :remote
           # Get the config

data/lib/lapis_lazuli/generators/cucumber/template/Gemfile

@@ -1,16 +1,9 @@
 source 'http://rubygems.org'
 
-
 # Add following two lines to your ~/.gemrc or /etc/gemrc:
 # install: --no-rdoc --no-ri
 # update:  --no-rdoc --no-ri
 
-# Install helper libraries
-gem 'rspec'
-gem 'gherkin'
-gem 'xml-simple'
-gem 'mechanize'
-
 # Debuggers
 platforms :ruby_18, :ruby_19 do
   gem 'debugger'
@@ -26,7 +19,6 @@ platforms :mswin, :mingw do
   gem 'term-ansicolor'
 end
 
-
 # Install all the webdriver gems and cucumber
 gem 'watir-webdriver'
 gem 'watir-webdriver-performance'

data/lib/lapis_lazuli/generators/cucumber/template/README.md

@@ -16,10 +16,9 @@ Author: "<%= config[:user] %>" <<%= config[:email] %>>
 
     $ bundle install
 
-- Run cucumber or regressinator through bundler:
+- Run cucumber through bundler:
 
     $ bundle exec cucumber
-    $ bundle exec regressinator legacy cucumber
 
 # Contributing
 

data/lib/lapis_lazuli/generators/cucumber/template/features/step_definitions/interaction_steps.rb

@@ -17,4 +17,5 @@ Given(/^I search for "(.*?)"$/) do |query|
   searchbox = browser.find(:text_field => {:name => "q"})
   searchbox.clear rescue log.debug "Could not clear searchbox"
   searchbox.send_keys(query)
+  searchbox.send_keys(:enter)
 end

data/lib/lapis_lazuli/generators/cucumber/template/features/support/env.rb

@@ -6,7 +6,4 @@ require 'lapis_lazuli'
 require 'lapis_lazuli/cucumber'
 
 LapisLazuli::WorldModule::Config.config_file = "config/config.yml"
-World(LapisLazuli)
-
-# Transition function from old codebase to new
-load 'features/support/transition.rb'
+World(LapisLazuli)

data/lib/lapis_lazuli/version.rb

@@ -6,5 +6,5 @@
 # All rights reserved.
 #
 module LapisLazuli
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

data/lib/lapis_lazuli/world/config.rb

@@ -50,11 +50,6 @@ module WorldModule
 
       load_config(Config.config_file)
 
-      if @config.nil?
-        warn "Could not load configuration from: #{Config.config_file}"
-        @config = {}
-      end
-
       @metadata = Runtime.instance.set_if(self, :metadata) do
         log.debug "Creating metadata storage"
         Storage.new("metadata")
@@ -152,6 +147,12 @@ module WorldModule
         raise "Error loading file: #{filename} #{err}"
       end
 
+      # Fix up empty files
+      if @config.nil? or @config == false
+        warn "Could not load configuration from '#{Config.config_file}'; it might be empty or malformed."
+        @config = {}
+      end
+
       # If we have an environment this config should have it
       if not @env.nil? and not self.has_config?(@env)
         raise "Environment doesn't exist in config file"

data/test/Gemfile

@@ -29,7 +29,6 @@ end
 
 # Install all the webdriver gems and cucumber
 gem 'watir-webdriver'
-gem 'watir-webdriver-performance'
 gem 'watir-scroll'
 # For testing old versions of cucumber, swap the two lines below
 gem 'cucumber', '>1.3.19'
@@ -37,6 +36,9 @@ gem 'cucumber', '>1.3.19'
 
 # Testing related
 gem 'simplecov'
+gem 'test-unit'
 
-# LapisLazul itself
-gem 'lapis_lazuli', :github => 'spriteCloud/lapis-lazuli', :branch => 'sjieg-patch-1'
+# LapisLazul itself; test code should point to the current repo and branch
+repo = `git config --get remote.origin.url`
+branch = `git rev-parse --abbrev-ref HEAD`
+gem 'lapis_lazuli', :git => repo, :branch => branch

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lapis_lazuli
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Onno Steenbergen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -225,7 +225,6 @@ files:
 - lib/lapis_lazuli/generators/cucumber/template/features/step_definitions/interaction_steps.rb
 - lib/lapis_lazuli/generators/cucumber/template/features/step_definitions/validation_steps.rb
 - lib/lapis_lazuli/generators/cucumber/template/features/support/env.rb
-- lib/lapis_lazuli/generators/cucumber/template/features/support/transition.rb
 - lib/lapis_lazuli/generic/assertions.rb
 - lib/lapis_lazuli/generic/xpath.rb
 - lib/lapis_lazuli/options.rb

data/lib/lapis_lazuli/generators/cucumber/template/features/support/transition.rb

@@ -1,12 +0,0 @@
-##
-# All function in this file SHOULD not be used.
-# There only included for backwards compatibility
-#
-
-##
-# Creating a link for easy debugging afterwards
-def create_link(name, url)
-  log.info("[DEPRECATED] [feature/support/transition.rb] create_link")
-  #Lets just send the url without the parameters to prevent html display problems
-  "<a href='#{url}' target='_blank'>#{name}</a>"
-end