lapis_lazuli 0.8.9 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 775e67328e31c61c47ca10fb266c1a9df0f16767
-  data.tar.gz: 62257d244b3d17da116336ca5a4f7b2c98c7f5d4
+  metadata.gz: 69ecad4834664da669d77a7df4e33aeaf78599f1
+  data.tar.gz: 8c8c532e1dcf5858a2d6a4e122b77596c50617dd
 SHA512:
-  metadata.gz: 2c2ce085c18600b998f9c338137eeba49f92d42b6f13644994d826897d049881d7e9c87ca9d94249847e55edfdc3b9f0e6dc8f092decc6230f09b3faa0fd8ae4
-  data.tar.gz: 0d567ffa3e99b58a305b4e25e52a27dbb9cd8bf71c941827ed664138d6b99dd54cc7019413ee77255cde1e276f220ca94e47ff8ff276afc584a8c9daa78069f8
+  metadata.gz: 0feef2515e1dd72ab4d7d815c0776a6feb1f05985eaf49f31fa1feb768c0e7e25f0a73af220b42ac2a50cea84a1beaf6c7f330c90cbb66923a5101f686ec1f96
+  data.tar.gz: 9957ee6a24b7c780527f6fa48e2f5a855d649c3a29e77aac292a3485bced58f1d0050cba7c22b1c1459d9bc645f4ec9c52280e70a6432bd551f38ce8a1730ce5

data/lib/lapis_lazuli/browser.rb

@@ -123,6 +123,8 @@ module LapisLazuli
         @browser = init(*args)
         # Add this browser to the list of all browsers
         LapisLazuli::Browser.add_browser(self)
+        # Making sure all browsers are gracefully closed when the exit event is triggered.
+        at_exit { LapisLazuli::Browser::close_all 'exit event trigger' }
       end
     end
 
@@ -168,20 +170,19 @@ module LapisLazuli
     def close_after_scenario(scenario)
       # Determine the config
       close_browser_after = world.env_or_config("close_browser_after")
-
       case close_browser_after
-      when "scenario"
-        # We always close it
-        LapisLazuli::Browser.close_all close_browser_after
-      when "never"
-        # Do nothing: party time, excellent!
-      when "end"
-        # Also ignored here - this is handled  in World.browser_destroy
-      else
-        if is_last_scenario?(scenario)
-          # Close it
+        when "scenario"
+          # We always close it
           LapisLazuli::Browser.close_all close_browser_after
-        end
+        when "never"
+          # Do nothing: party time, excellent!
+        when "feature"
+          if is_last_scenario?(scenario)
+            # Close it
+            LapisLazuli::Browser.close_all close_browser_after
+          end
+        else # close after 'end' is now default
+          # Also ignored here - this is handled  in World.browser_destroy
       end
     end
 
@@ -230,125 +231,125 @@ module LapisLazuli
     end
 
     private
-      ##
-      # The main browser window for testing
-      def init(browser_wanted=(no_browser_wanted=true;nil), optional_data=(no_optional_data=true;nil))
-        # Store the optional data so on restart of the browser it still has the
-        # correct configuration
-        if no_optional_data and optional_data.nil? and @@cached_browser_options.has_key?(:optional_data) and (browser_wanted.nil? or browser_wanted == @@cached_browser_options[:browser])
-          optional_data = @@cached_browser_options[:optional_data]
-        elsif optional_data.nil?
-          optional_data = {}
-        end
-
-        # Do the same caching stuff for the browser
-        if no_browser_wanted and browser_wanted.nil? and @@cached_browser_options.has_key?(:browser)
-          browser_wanted = @@cached_browser_options[:browser]
-        end
+    ##
+    # The main browser window for testing
+    def init(browser_wanted=(no_browser_wanted=true; nil), optional_data=(no_optional_data=true; nil))
+      # Store the optional data so on restart of the browser it still has the
+      # correct configuration
+      if no_optional_data and optional_data.nil? and @@cached_browser_options.has_key?(:optional_data) and (browser_wanted.nil? or browser_wanted == @@cached_browser_options[:browser])
+        optional_data = @@cached_browser_options[:optional_data]
+      elsif optional_data.nil?
+        optional_data = {}
+      end
 
+      # Do the same caching stuff for the browser
+      if no_browser_wanted and browser_wanted.nil? and @@cached_browser_options.has_key?(:browser)
+        browser_wanted = @@cached_browser_options[:browser]
+      end
 
-        if !@@cached_browser_options.has_key? :browser
-          @@cached_browser_options[:browser] = browser_wanted
-          # Duplicate the data as Webdriver modifies it
-          @@cached_browser_options[:optional_data] = optional_data.dup
-        end
 
-        @browser_wanted = browser_wanted
-        @optional_data = optional_data
-        # Create the browser
-        create_driver(@browser_wanted, @optional_data)
+      if !@@cached_browser_options.has_key? :browser
+        @@cached_browser_options[:browser] = browser_wanted
+        # Duplicate the data as Webdriver modifies it
+        @@cached_browser_options[:optional_data] = optional_data.dup
       end
 
-      ##
-      # 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'
-        rescue LoadError => err
-          raise LoadError, "#{err}: you need to add 'watir' to your Gemfile before using the browser."
-        end
+      @browser_wanted = browser_wanted
+      @optional_data = optional_data
+      # Create the browser
+      create_driver(@browser_wanted, @optional_data)
+    end
 
-        # No browser? Does the config have a browser? Default to firefox
-        if browser_wanted.nil?
-          browser_wanted = world.env_or_config('browser', 'firefox')
-        end
+    ##
+    # 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'
+      rescue LoadError => err
+        raise LoadError, "#{err}: you need to add 'watir' to your Gemfile before using the browser."
+      end
 
-        # Select the correct browser
-        case browser_wanted.to_s.downcase
-          when 'chrome'
-            # Check Platform running script
-            b = :chrome
-          when 'safari'
-            b = :safari
-          when 'ie'
-            require 'rbconfig'
-            if (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
-              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
-            else
-              world.error("You can't run IOS tests on non-mac machine")
-            end
-          when 'remote'
-            b = :remote
-          else
-            b = :firefox
-        end
+      # No browser? Does the config have a browser? Default to firefox
+      if browser_wanted.nil?
+        browser_wanted = world.env_or_config('browser', 'firefox')
+      end
 
-        args = [b]
-        @browser_name = b.to_s
-        if b == :remote
-          # Get the config
-          remote_config = world.env_or_config("remote", {})
+      # Select the correct browser
+      case browser_wanted.to_s.downcase
+        when 'chrome'
+          # Check Platform running script
+          b = :chrome
+        when 'safari'
+          b = :safari
+        when 'ie'
+          require 'rbconfig'
+          if (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+            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
+          else
+            world.error("You can't run IOS tests on non-mac machine")
+          end
+        when 'remote'
+          b = :remote
+        else
+          b = :firefox
+      end
 
-          # The settings we are going to use to create the browser
-          remote_settings = {}
+      args = [b]
+      @browser_name = b.to_s
+      if b == :remote
+        # Get the config
+        remote_config = world.env_or_config("remote", {})
 
-          # Add the config to the settings using downcase string keys
-          remote_config.each{|k,v| remote_settings[k.to_s.downcase] = v}
+        # The settings we are going to use to create the browser
+        remote_settings = {}
 
-          if optional_data.is_a? Hash
-            # Convert the optional data to downcase string keys
-            string_hash = Hash.new
-            optional_data.each{|k,v| string_hash[k.to_s.downcase] = v}
+        # Add the config to the settings using downcase string keys
+        remote_config.each { |k, v| remote_settings[k.to_s.downcase] = v }
 
-            # Merge them with the settings
-            remote_settings.merge! string_hash
-          end
+        if optional_data.is_a? Hash
+          # Convert the optional data to downcase string keys
+          string_hash = Hash.new
+          optional_data.each { |k, v| string_hash[k.to_s.downcase] = v }
 
-          args.push(remote_browser_config(remote_settings))
-        elsif not optional_data.nil? and not optional_data.empty?
-          world.log.debug("Got optional data: #{optional_data}")
-          args.push(optional_data)
-        elsif world.has_proxy?
-          # Create a session if needed
-          if !world.proxy.has_session?
-            world.proxy.create()
-          end
+          # Merge them with the settings
+          remote_settings.merge! string_hash
+        end
 
-          proxy_url = "#{world.proxy.ip}:#{world.proxy.port}"
-          if b == :firefox
-            world.log.debug("Configuring Firefox proxy: #{proxy_url}")
-            profile = Selenium::WebDriver::Firefox::Profile.new
-            profile.proxy = Selenium::WebDriver::Proxy.new :http => proxy_url, :ssl => proxy_url
-            args.push({:profile => profile})
-          end
+        args.push(remote_browser_config(remote_settings))
+      elsif not optional_data.nil? and not optional_data.empty?
+        world.log.debug("Got optional data: #{optional_data}")
+        args.push(optional_data)
+      elsif world.has_proxy?
+        # Create a session if needed
+        if !world.proxy.has_session?
+          world.proxy.create()
         end
 
-        begin
-          browser_instance = Watir::Browser.new(*args)
-        rescue Selenium::WebDriver::Error::UnknownError => err
-          raise err
+        proxy_url = "#{world.proxy.ip}:#{world.proxy.port}"
+        if b == :firefox
+          world.log.debug("Configuring Firefox proxy: #{proxy_url}")
+          profile = Selenium::WebDriver::Firefox::Profile.new
+          profile.proxy = Selenium::WebDriver::Proxy.new :http => proxy_url, :ssl => proxy_url
+          args.push({:profile => profile})
         end
-        return browser_instance
       end
+
+      begin
+        browser_instance = Watir::Browser.new(*args)
+      rescue Selenium::WebDriver::Error::UnknownError => err
+        raise err
+      end
+      return browser_instance
+    end
   end
 
 end

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

@@ -4,21 +4,6 @@ source 'http://rubygems.org'
 # install: --no-rdoc --no-ri
 # update:  --no-rdoc --no-ri
 
-# Debuggers
-platforms :ruby_18, :ruby_19 do
-  gem 'debugger'
-end
-platforms :ruby_20, :ruby_21 do
-  gem 'byebug'
-  gem 'rb-readline'
-end
-
-# Windows specific
-platforms :mswin, :mingw do
-  gem 'win32console'
-  gem 'term-ansicolor'
-end
-
 # Install all the webdriver gems and cucumber
 gem 'watir'
 gem 'cucumber'

data/lib/lapis_lazuli/options.rb

@@ -9,7 +9,7 @@ module LapisLazuli
   ##
   # Configuration options and their default values
   CONFIG_OPTIONS = {
-    "close_browser_after" => ["feature", "Close the browser after every scenario, feature, etc. Possible values are 'feature', 'scenario', 'end' and 'never'."],
+    "close_browser_after" => ["end", "Close the browser after every scenario, feature, etc. Possible values are 'feature', 'scenario', 'end' and 'never'."],
     "error_strings" => [nil, "List of strings that indicate errors when detected on a web page."],
     "default_env" => [nil, "Indicates which environment specific configuration to load when no test environment is provided explicitly."],
     "test_env" => [nil, "Indicates which environment specific configuration to load in this test run."],

data/lib/lapis_lazuli/version.rb

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

data/lib/lapis_lazuli/world/browser.rb

@@ -61,8 +61,8 @@ module WorldModule
             "browser",
             {
               "name" => brow.driver.capabilities[:browser_name],
-              "version" => brow.driver.capabilities[:version],
-              "platform" => brow.driver.capabilities[:platform],
+              "version" => brow.driver.capabilities[:browser_version] || brow.driver.capabilities[:version],
+              "platform" => brow.driver.capabilities[:platform_name] || brow.driver.capabilities[:platform],
             }
           )
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lapis_lazuli
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.9.0
 platform: ruby
 authors:
 - Onno Steenbergen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler