quke 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d94d8f089c2a7e1386bf52be42889b4a18bf8bca
-  data.tar.gz: 4546c88f278d7f1e19bf4f10cfb3de2cd294f430
+  metadata.gz: bf47841852a9adeb51e32e6cd9b1a072eb41ba51
+  data.tar.gz: 96a014d8e1637dada1a2502dee5e989a35df19b6
 SHA512:
-  metadata.gz: c221a3c871dd0bc9ac04468e4b68f9e13d0d708e08d637746b85118c26f74366cd022ab6a3a586f1fd33283d2911cd00158368a00d5780307f37029f7b89186d
-  data.tar.gz: 1723da3d054399594ffb377387ac17b0b0ae9fee84f701446d9219d1b1c26ecff446e10a2f26ea7279e171ab23fd343f03eebbb0777f9fdd4ee0c8c0a8f34ee1
+  metadata.gz: fbaa3c15400503eb11144537df0b5e42bce9d832590f96221e3f60fa2f232e27a633aa2ba571ed827a41c59d21a8a1ee373574d2e8139086274687e9d8e792b2
+  data.tar.gz: f54b7569ef1cc12c187798fcf2dd7af25e53833eb5bd7e606e22cc777fbaf37507f8bbb30236d2dcfd544d76981ad8f8ff9dec7b38e5d9c0b7e5b6a47b6655f8

data/.config.example.yml

@@ -33,6 +33,14 @@ stop_on_error: 1
 proxy:
   host: '10.10.2.70'
   port: 8080
+  # In some cases you may also need to tell the browser (driver) not to use the
+  # proxy for local or specific connections. For this simply provide a comma
+  # separated list of addresses.
+  #
+  # IMPORTANT NOTE! phantomjs does not currently support this option. If you
+  # have to go via a proxy server for external connections, but not local ones
+  # you will be limited to using either the Chrome or Firefox drivers.
+  no_proxy: '127.0.0.1,192.168.0.1'
 
 # If you select the browserstack driver, there are a number of options you
 # can pass through to setup your browserstack tests, username and auth_key

data/README.md

@@ -92,10 +92,6 @@ You should be aware of some default behaviours included in Quke.
 
 Capybara includes the ability to save the source of the current page at any point. Quke has been configured so that if you are not using the headless browser and a step should fail it will save the source to file and then use a tool called [Launchy](https://github.com/copiousfreetime/launchy) to open it in your default browser.
 
-### Early fail for CI
-
-When running using the default PhantomJS headless browser, as soon as there is a failure Quke will exit. This is because it is assumed when used in headless mode the key thing to know is *are there any failures*, to ensure fast feedback from your CI build server.
-
 ### Quit on 5 failures
 
 If you are running using Chrome or Firefox after the 5th failure Quke will automatically stop. This is to prevent scores of tabs being opened in the browser when an error is found, which may just be the result of an error in the test code.

data/lib/quke/configuration.rb

@@ -169,7 +169,8 @@ module Quke #:nodoc:
       data = {} if data.nil?
       data.merge(
         'host' => (data['host'] || '').downcase.strip,
-        'port' => (data['port'] || '0').to_s.downcase.strip.to_i
+        'port' => (data['port'] || '0').to_s.downcase.strip.to_i,
+        'no_proxy' => (data['no_proxy'] || '').downcase.strip
       )
     end
 

data/lib/quke/driver_configuration.rb

@@ -118,7 +118,10 @@ module Quke #:nodoc:
     #     Capybara::Selenium::Driver.new(
     #       app,
     #       browser: :chrome,
-    #       switches: ["--proxy-server=localhost:8080"]
+    #       switches: [
+    #         "--proxy-server=localhost:8080",
+    #         "--proxy-bypass-list=127.0.0.1,192.168.0.1"
+    #       ]
     #     )
     #
     # Rather than setting the switches manually Quke::DriverConfiguration.chrome
@@ -131,13 +134,20 @@ module Quke #:nodoc:
     #       switches: my_driver_config.chrome
     #     )
     #
+    # rubocop:disable Metrics/AbcSize
     def chrome
-      if config.use_proxy?
-        ["--proxy-server=#{config.proxy['host']}:#{config.proxy['port']}"]
-      else
-        []
-      end
+      result = []
+
+      host = config.proxy['host']
+      port = config.proxy['port']
+      no_proxy = config.proxy['no_proxy'].tr(',', ';')
+
+      result.push("--proxy-server=#{host}:#{port}") if config.use_proxy?
+      result.push("--proxy-bypass-list=#{no_proxy}") unless config.proxy['no_proxy'].empty?
+
+      result
     end
+    # rubocop:enable Metrics/AbcSize
 
     # Returns an instance of Selenium::WebDriver::Remote::Capabilities to be
     # used when registering an instance of Capybara::Selenium::Driver,
@@ -169,12 +179,16 @@ module Quke #:nodoc:
     def firefox
       profile = Selenium::WebDriver::Firefox::Profile.new
 
-      if config.use_proxy?
-        profile.proxy = Selenium::WebDriver::Proxy.new(
-          http: "#{config.proxy['host']}:#{config.proxy['port']}",
-          ssl: "#{config.proxy['host']}:#{config.proxy['port']}"
-        )
-      end
+      settings = {}
+      host = config.proxy['host']
+      port = config.proxy['port']
+      no_proxy = config.proxy['no_proxy']
+
+      settings[:http] = "#{host}:#{port}" if config.use_proxy?
+      settings[:ssl] = settings[:http] if config.use_proxy?
+      settings[:no_proxy] = no_proxy unless config.proxy['no_proxy'].empty?
+
+      profile.proxy = Selenium::WebDriver::Proxy.new(settings) if config.use_proxy?
 
       profile
     end

data/lib/quke/driver_registration.rb

@@ -43,6 +43,9 @@ module Quke #:nodoc:
     # poltergeist, and we can even pass on options to phantomjs to configure how
     # it runs.
     def phantomjs
+      # For future reference the options we pass through to phantomjs appear to
+      # mirror those you can actually supply on the command line.
+      # http://phantomjs.org/api/command-line.html
       Capybara.register_driver :phantomjs do |app|
         # We ignore the next line (and those like it in the subsequent methods)
         # from code coverage because we never actually execute them from Quke.
@@ -65,6 +68,8 @@ module Quke #:nodoc:
       # object.
       # https://github.com/SeleniumHQ/selenium/wiki/Ruby-Bindings#firefox
       # http://www.rubydoc.info/gems/selenium-webdriver/0.0.28/Selenium/WebDriver/Firefox/Profile
+      # http://www.seleniumhq.org/docs/04_webdriver_advanced.jsp
+      # http://preferential.mozdev.org/preferences.html
       Capybara.register_driver :firefox do |app|
         # :simplecov_ignore:
         Capybara::Selenium::Driver.new(app, profile: config.firefox)
@@ -81,6 +86,7 @@ module Quke #:nodoc:
       # Capybara to Selenium-webdriver, which in turn passes it to chromium
       # https://github.com/SeleniumHQ/selenium/wiki/Ruby-Bindings#chrome
       # http://peter.sh/experiments/chromium-command-line-switches/
+      # https://www.chromium.org/developers/design-documents/network-settings
       Capybara.register_driver :chrome do |app|
         # :simplecov_ignore:
         Capybara::Selenium::Driver.new(

data/lib/quke/version.rb

@@ -1,3 +1,3 @@
 module Quke #:nodoc:
-  VERSION = '0.2.6'.freeze
+  VERSION = '0.2.7'.freeze
 end

data/quke.gemspec

@@ -3,6 +3,9 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'quke/version'
 
+# Don't believe you would want to break this particular block up hence adding
+# the exception for rubocop.
+# rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |spec|
   spec.name          = 'quke'
   spec.version       = Quke::VERSION
@@ -10,7 +13,11 @@ Gem::Specification.new do |spec|
   spec.email         = ['alan.cruikshanks@environment-agency.gov.uk']
 
   spec.summary       = 'A gem to simplify creating acceptance tests using Cucumber'
+  # My attempts to break this line up to meet the 120 char limit we have set
+  # have proved fruitles so far!
+  # rubocop:disable Metrics/LineLength
   spec.description   = 'Quke tries to simplify the process of writing and running acceptance tests by setting up Cucumber for you. It handles the config to allow you to run your tests in Firefox and Chrome, or the headless browser PhantomJS. It also has out of the box setup for using Browserstack automate. This leaves you to focus on just your features and steps.'
+  # rubocop:enable Metrics/LineLength
   spec.homepage      = 'https://github.com/environmentagency/quke'
   spec.license       = 'Nonstandard'
 
@@ -91,3 +98,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.12'
   spec.add_development_dependency 'github_changelog_generator', '~> 1.13'
 end
+# rubocop:enable Metrics/BlockLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quke
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Alan Cruikshanks
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber