From 67034d1c5cd4e968b061de264757dec0c6016855 Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Tue, 3 Nov 2015 15:31:02 +0000
Subject: [PATCH 01/62] bump version of capybara

---
 Gemfile.lock                | 59 ++++++++++++++++++++-----------------
 frameworks-capybara.gemspec |  2 +-
 spec/spec_helper.rb         |  1 -
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 04e1404..27f251c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    frameworks-capybara (2.3.1)
-      capybara
+    frameworks-capybara (2.4.0)
+      capybara (~> 2.5)
       capybara-mechanize
       cucumber
       json
@@ -14,32 +14,34 @@ GEM
   remote: https://rubygems.org/
   specs:
     builder (3.2.2)
-    capybara (2.4.4)
+    capybara (2.5.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-mechanize (1.4.0)
-      capybara (~> 2.4.4)
-      mechanize (~> 2.7.0)
-    childprocess (0.5.5)
+    capybara-mechanize (1.0.1)
+      capybara (~> 2.0, >= 2.0.1)
+      mechanize (~> 2.5)
+    childprocess (0.5.7)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.17)
+    cucumber (2.1.0)
       builder (>= 2.1.2)
+      cucumber-core (~> 1.3.0)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
+      gherkin3 (~> 3.1.0)
       multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.3.0)
+      gherkin3 (~> 3.1.0)
     diff-lcs (1.2.5)
-    domain_name (0.5.22)
+    domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
-    ffi (1.9.6)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
+    ffi (1.9.10)
+    gherkin3 (3.1.2)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    json (1.8.1)
+    json (1.8.3)
     mechanize (2.7.3)
       domain_name (~> 0.5, >= 0.5.1)
       http-cookie (~> 1.0)
@@ -49,17 +51,17 @@ GEM
       nokogiri (~> 1.4)
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (>= 0.0.9, < 0.2)
-    mime-types (2.4.3)
-    mini_portile (0.6.0)
-    multi_json (1.10.1)
-    multi_test (0.1.1)
+    mime-types (2.6.2)
+    mini_portile (0.6.2)
+    multi_json (1.11.2)
+    multi_test (0.1.2)
     net-http-digest_auth (1.4)
     net-http-persistent (2.9.4)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     ntlm-http (0.1.1)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (1.6.4)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rake (10.1.1)
     rspec (2.13.0)
@@ -70,20 +72,20 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
-    rubyzip (1.1.6)
-    selenium-webdriver (2.43.0)
+    rubyzip (1.1.7)
+    selenium-webdriver (2.48.1)
       childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.6)
+    unf_ext (0.0.7.1)
     w3c_validators (1.2)
       json
       nokogiri
     webrobots (0.1.1)
-    websocket (1.2.1)
+    websocket (1.2.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -94,3 +96,6 @@ DEPENDENCIES
   frameworks-capybara!
   rake
   rspec
+
+BUNDLED WITH
+   1.10.6
diff --git a/frameworks-capybara.gemspec b/frameworks-capybara.gemspec
index 45a7c21..563b437 100644
--- a/frameworks-capybara.gemspec
+++ b/frameworks-capybara.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
 
   s.add_runtime_dependency("selenium-webdriver")
-  s.add_runtime_dependency("capybara")  
+  s.add_runtime_dependency("capybara", '~> 2.5')  
   s.add_runtime_dependency("mechanize")
   s.add_runtime_dependency("capybara-mechanize")
   s.add_runtime_dependency("json")
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 5c6076d..675d0cb 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'bundler/setup'
-require 'gherkin'
 require 'cucumber/language_support/language_methods'
 require 'cucumber/rb_support/rb_language'
 require 'cucumber/runtime'

From b4f55e264b6c8580487021a9a45ec8bc2df3c521 Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Tue, 3 Nov 2015 16:17:05 +0000
Subject: [PATCH 02/62] adding more elaborate wait helpers

---
 README.rdoc            | 39 ++++++++++++++----
 lib/frameworks/wait.rb | 94 +++++++++++++++++++++++++++++++++---------
 spec/wait_spec.rb      | 61 ++++++++++++++++++---------
 3 files changed, 146 insertions(+), 48 deletions(-)

diff --git a/README.rdoc b/README.rdoc
index 4b27ae6..c009326 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -20,8 +20,8 @@ Below are the current drivers that can be registered:
 How to use this gem in your project:
 
 In your env.rb simply add:
-  
- require 'frameworks-capybara' 
+
+ require 'frameworks-capybara'
 
 The following environment variables can be set to configure your tests:
 
@@ -37,12 +37,12 @@ The following environment variables can be set to configure your tests:
   FIREFOX_PREFS - specify a json string of additional preferences e.g. FIREFOX_PREFS='{"javascript.enabled": false}'
   FIREFOX_CERT_PATH - specify optional directory containing Firefox profile certificate (.db) files
   FIREFOX_CERT_PREFIX - specify optional prefix for locating Firefox profile certificate files (e.g. <prefix>-<file>.db)
-  CREATE_NEW_FF_PROFILE - create a new Firefox profile with name provided by FIREFOX_PROFILE 
+  CREATE_NEW_FF_PROFILE - create a new Firefox profile with name provided by FIREFOX_PROFILE
   XVFB - (string - 'true', 'false') - determines whether XVFB is used to run browser (i.e. headless Firefox on *nix platform)
   FW_CERT_LOCATION - path to client certificate (combined pem)
   CHROME_SWITCHES - pass in any allowed switches for the Selenium chrome driver (http://peter.sh/experiments/chromium-command-line-switches/) e.g. CHROME_SWITCHES="--user-agent=Mozilla/5.0 (PLAYSTATION 3; 3.55)"
-  PROJECT_NAME - optional project name description which gets displayed in Cucumber html reports 
-  TEAM_NAME - optional team name description which gets displayed in Cucumber html reports 
+  PROJECT_NAME - optional project name description which gets displayed in Cucumber html reports
+  TEAM_NAME - optional team name description which gets displayed in Cucumber html reports
   BROWSER_CLI_ARGS - optional additional arguments to pass to local browser processes (individual arguments should be separated with spaces)
 
 The following environment variables are specific to running tests against a BrowserStack remote grid:
@@ -80,13 +80,37 @@ Here is a sample cucumber.yml:
 
 
 This gem also sets up a number of 'base urls' for you to use in your tests, these are set based on the ENVIRONMENT variable you set when running cucumber tests (either from the comand line or in cucumber.yml), the following URLs are set:
-  
+
   @base_url
   @base_static_url
   @base_open_url
 
 Finally this gem contains some useful monkey-patches to core libraries e.g. Capybara-Mechanize, Selenium-Webdriver and Cucumber.
 
+== Wait Helpers
+
+This gem provides some default wait helpers useful for when the 'out of the box' mechanisms provided by Capybara and/or SitePrism aren't quite enough.
+
+To use these include the +FrameworksCapybara+::+Wait+ module in your class.
+
++wait_for+ - simple wait for boolean condition
+   wait_for { (Random.rand(2) % 2) }
+
+
++wait_for_assertion+ - wait for rspec assertion to pass without raising exceptions
+
+   wait_for_assertion('Cannot find foo on page') do
+      expect(page).to have_content 'foo'
+   end
+
+
++wait_for_no_exception+ - wait for block to NOT raise provided exception
+
+    wait_for_no_exception('Author image not visible', SitePrism::TimeOutWaitingForElementVisibility) do
+       article.wait_until_author_image_visible
+    end
+
+
 == Release instructions
 
 * Run tests - 'rake'
@@ -105,7 +129,7 @@ You should see something like:
   Pushed frameworks-capybara 0.2.23 to rubygems.org
 
 == Contributing to frameworks-capybara
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project
@@ -117,4 +141,3 @@ You should see something like:
 == Copyright
 
 See LICENSE.txt for further details.
-
diff --git a/lib/frameworks/wait.rb b/lib/frameworks/wait.rb
index 5b4b97f..596bf38 100644
--- a/lib/frameworks/wait.rb
+++ b/lib/frameworks/wait.rb
@@ -1,25 +1,79 @@
 require 'time'
 
-class Wait
-  ##
-  # Execute a block until it returns true.
-  # Optionally pass a timeout (by default 5 seconds).
-  # 
-  # wait = Wait.new
-  # wait.until {
-  #   (Random.rand(2) % 2)
-  # }
-  # 
-  # wait.until(:timeout => 4) {
-  #   (Random.rand(2) % 2)
-  # }
-  # 
-  def Wait.until(options={:timeout => 5})
-    timeout = Time.new + options[:timeout].to_f
+module FrameworksCapybara
+  module Wait
+    ##
+    # Execute a block until it returns true.
+    # Optionally pass a timeout (by default 5 seconds).
+    #
+    # wait_for { (Random.rand(2) % 2) }
+    #
+    # wait_for(:timeout => 4) { (Random.rand(2) % 2) }
+    #
+    def wait_for(options={:timeout => 5})
+      timeout = Time.new + options[:timeout].to_f
 
-    while (Time.new < timeout)
-      return if (yield)
+      while (Time.new < timeout)
+        return if (yield)
+      end
+      raise 'Timeout exceeded for wait until.'
+    end
+
+    ##
+    # Execute a block containing RSpec assertion, catch failures and wait till it passes
+    # Pass an exception message to be outputted on failure and a block
+    # Optionally pass a timeout, sleep interval
+    #
+    # wait_for_assertion('Cannot find foo on page') do
+    #   expect(page).to have_content 'foo'
+    # end
+    #
+    def wait_for_assertion(exception_message, timeout = Capybara.default_max_wait_time, sleep_interval = 0.5, &block)
+      wait_for_no_exception(exception_message,
+                            RSpec::Expectations::ExpectationNotMetError,
+                            timeout, sleep_interval, &block)
+    end
+
+    ##
+    # Execute a block and catch a specific exception until timeout or no exception
+    # Pass an exception message to be outputted on failure and a block
+    # Optionally pass a timeout, sleep interval
+    #
+    # wait_for_no_exception('Author image not visible', SitePrism::TimeOutWaitingForElementVisibility) do
+    #   article.wait_until_author_image_visible
+    # end
+    #
+    def wait_for_no_exception(exception_message, exception, timeout = Capybara.default_max_wait_time, sleep_interval = 1, &block)
+      fail 'You need to provide a block' unless block_given?
+      test_exception = 'check did not return within timeout window.'
+      begin
+        Timeout.timeout(timeout) do
+          loop do
+            begin
+              block.call
+              return true
+            rescue exception => assertion_exception
+              puts "#{exception_message} - rescuing: #{exception.to_s} and trying to call block again!"
+              test_exception = assertion_exception
+              sleep sleep_interval
+            end
+          end
+        end
+      rescue TimeoutError
+        puts '********************************************************************'
+        puts "Timed out after waiting for #{timeout} seconds."
+        puts exception_message
+        puts "#{test_exception}"
+        puts '********************************************************************'
+        raise test_exception
+      rescue => standard_error
+        puts '********************************************************************'
+        puts "Got an unexpected exception type: #{standard_error.class}"
+        puts "#{standard_error}"
+        puts 'Check your code for puts!'
+        puts '********************************************************************'
+        raise standard_error
+      end
     end
-    raise 'Timeout exceeded for wait until.'
   end
-end
\ No newline at end of file
+end
diff --git a/spec/wait_spec.rb b/spec/wait_spec.rb
index c39cac0..0dc824f 100644
--- a/spec/wait_spec.rb
+++ b/spec/wait_spec.rb
@@ -1,27 +1,48 @@
 require 'frameworks/wait'
 
-describe Wait do
-  it "should exit silently if the block returns true" do
-    Wait.until(){
-    	true
-    }
+describe FrameworksCapybara::Wait do
+  let(:test) { Class.new { include FrameworksCapybara::Wait }.new }
+
+  describe 'wait_for' do
+    it "should exit silently if the block returns true" do
+      test.wait_for { true }
+    end
+
+    it "should raise an exception if the default timeout expires" do
+      start_time = Time.now
+      expect { test.wait_for { Time.now > (start_time + (6 * 60)) } }.to raise_error
+    end
+
+    it "should raise an exception if the specified timeout expires" do
+      start_time = Time.now
+      expect {
+        test.wait_for(timeout: 1) do
+          Time.now > (start_time + (2 * 60))
+        end
+      }.to raise_error
+    end
   end
 
-  it "should raise an exception if the default timeout expires" do
-    start_time = Time.now
-    expect {
-      Wait.until(){
-      	Time.now > (start_time + (6 * 60))
-      }
-    }.to raise_error
+  describe 'wait for an rspec assertion' do
+    it 'should allow us to wait for assertions' do
+      expect(test.wait_for_assertion('msg') { expect(true).to eql true }).to be true
+    end
+
+    it 'should raise rspec expectation error when condition is not met' do
+      error = RSpec::Expectations::ExpectationNotMetError
+      expect { test.wait_for_assertion('msg') { expect(true).to eql false } }.to raise_error(error)
+    end
   end
 
-  it "should raise an exception if the specified timeout expires" do
-    start_time = Time.now
-    expect {
-      Wait.until(options={:timeout => 1}) do
-        Time.now > (start_time + (2 * 60))
-      end
-    }.to raise_error
+  describe 'wait for an arbitrary assertion' do
+    it 'should catch provided exception until block no longer raises it' do
+      error = ZeroDivisionError
+      expect(test.wait_for_no_exception('msg', error) { 1/1 == 1 }).to eql true
+    end
+
+    it 'should catch provided exception until block no longer raises it or timeout' do
+      error = ZeroDivisionError
+      expect { test.wait_for_no_exception('msg', error) { expect(1/0).to eql 1 } }.to raise_error(error)
+    end
   end
-end
\ No newline at end of file
+end

From 509f964160c2cfaecb0dc323227121cdc4f2b198 Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Tue, 3 Nov 2015 16:17:23 +0000
Subject: [PATCH 03/62] ensure we use same ruby as forge

---
 .ruby-version | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .ruby-version

diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 0000000..68b3a4c
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+1.9.3-p551

From 4dc451540397ba3450b13d8a8d809d765b8a20af Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Tue, 3 Nov 2015 16:25:13 +0000
Subject: [PATCH 04/62] bump major version as introducting backwasrd
 incompatible api changes

---
 Gemfile.lock   | 2 +-
 lib/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 27f251c..2a4b588 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    frameworks-capybara (2.4.0)
+    frameworks-capybara (3.0.0)
       capybara (~> 2.5)
       capybara-mechanize
       cucumber
diff --git a/lib/version.rb b/lib/version.rb
index 95020c5..c0f8fe8 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -1,3 +1,3 @@
 module FrameworksCapybara
-  VERSION = '2.3.1'
+  VERSION = '3.0.0'
 end

From 5b830cfb97b2cbc32334c6c8f916f775ea1a91b8 Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Wed, 4 Nov 2015 16:35:23 +0000
Subject: [PATCH 05/62] adding appium support

---
 README.rdoc                      |  7 +++++++
 lib/frameworks/capybara.rb       | 34 +++++++++++++++++++++-----------
 spec/frameworks_capybara_spec.rb | 25 ++++++++++++++++++++++-
 3 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/README.rdoc b/README.rdoc
index c009326..d32c4c1 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -54,6 +54,13 @@ The following environment variables are specific to running tests against a Brow
   BS_PROJECT - allows the user to specify a name for a logical group of builds e.g. 'Project X'
   BS_RESOLUTION - set the browser resolution e.g. '1024x768'
 
+The following environment variables are specific to running tests against an Appium server:
+
+  APPIUM_PLATFORM - one of iOS, Android, or FirefoxOS
+  APPIUM_DEVICE - e.g. iPhone Simulator, iPad Simulator, iPhone Retina 4-inch, Android Emulator
+  APPIUM_BROWSER - e.g. chrome, safari
+  APPIUM_UDID - the device id, note you can find this by doing +adb devices+ if you are working on a local machine
+
 Here is a sample cucumber.yml:
 
   <%intenv='ENVIRONMENT=int'%>
diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index eb60f4c..6060820 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -41,10 +41,14 @@ def initialize
       :browserstack_device => ENV['BS_DEVICE'],
       :browserstack_device_orientation => ENV['BS_DEVICE_ORIENTATION'],
       :browserstack_project => ENV['BS_PROJECT'],
-      :browserstack_resolution => ENV['BS_RESOLUTION']
+      :browserstack_resolution => ENV['BS_RESOLUTION'],
+      :appium_platform => ENV['APPIUM_PLATFORM'],
+      :appium_device => ENV['APPIUM_DEVICE'],
+      :appium_browser => ENV['APPIUM_BROWSER'],
+      :appium_udid => ENV['APPIUM_UDID']
     }
 
-    validate_env_vars(capybara_opts.merge(selenium_remote_opts)) #validate environment variables set using cucumber.yml or passed via command line
+    validate_env_vars(capybara_opts.merge(selenium_remote_opts), custom_opts) #validate environment variables set using cucumber.yml or passed via command line
 
     if(capybara_opts[:http_proxy])
       proxy_uri = URI(capybara_opts[:http_proxy])
@@ -74,26 +78,23 @@ def initialize
 
   private
 
-  def validate_env_vars(opts)
-
+  def validate_env_vars(opts, custom_opts)
     msg1 = 'Please ensure following environment variables are set ENVIRONMENT [int|test|stage|live], BROWSER[headless|ie|chrome|firefox] and HTTP_PROXY (if required)'
     msg2 = 'Please ensure the following environment variables are set PLATFORM, REMOTE_URL, REMOTE_BROWSER (browser to use on remote machine), HTTP_PROXY (if required), REMOTE_BROWSER_PROXY (if required) and BROWSER_VERSION (if required)'
 
-    [:environment, :browser].each do |item|
-      !opts.has_key?(item) or opts[item]==nil ? raise(msg1) : '' 
-    end
+    [:environment, :browser].each { |item| !opts.has_key?(item) or opts[item]==nil ? raise(msg1) : '' }
 
-    if opts[:browser]=='remote'
-      [:url, :browser_name].each do |item|
-        !opts.has_key?(item) or opts[item]==nil ? raise(msg2) : '' 
-      end
+    if custom_opts[:appium_platform]
+      [:url].each { |item| !opts.has_key?(item) or opts[item]==nil ? raise(msg2) : '' }
+    elsif opts[:browser]=='remote'
+      [:url, :browser_name].each { |item| !opts.has_key?(item) or opts[item]==nil ? raise(msg2) : '' }
     end
   end
 
   # WARNING: This modifies the Firefox profile passed in the parameters
   def update_firefox_profile_with_certificates(profile, certificate_path, certificate_prefix = '')
     profile_path = profile.layout_on_disk
-    
+
     # Create links to the certificate files in the profile directory
     ['cert8.db', 'key3.db', 'secmod.db'].each do |cert_file|
       source_file = "#{certificate_prefix}#{cert_file}"
@@ -139,6 +140,8 @@ def register_selenium_driver(opts,remote_opts,custom_opts)
 
         add_browserstack_caps(caps, custom_opts) if remote_opts[:url].include? 'browserstack' #set browserstack specific parameters
 
+        add_appium_caps(caps, custom_opts) if custom_opts.keys.join.include?('appium')  #set appium specific parameters
+
         opts[:desired_capabilities] = caps
         opts[:http_client] = client
       end
@@ -164,6 +167,13 @@ def add_browserstack_caps(caps, custom_opts)
     caps[:'resolution'] = custom_opts[:browserstack_resolution] if custom_opts[:browserstack_resolution]
   end
 
+  def add_appium_caps(caps, custom_opts)
+    caps[:platformName] = custom_opts[:appium_platform] if custom_opts[:appium_platform]
+    caps[:deviceName] = custom_opts[:appium_device] if custom_opts[:appium_device]
+    caps[:browserName] = custom_opts[:appium_browser] if custom_opts[:appium_browser]
+    caps[:udid] = custom_opts[:appium_udid] if custom_opts[:appium_udid]
+  end
+
   def set_client_proxy(opts)
     Selenium::WebDriver::Proxy.new(:http => opts[:http_proxy]) if opts[:http_proxy] && opts[:webdriver_proxy_on] != 'false' #set proxy on client connection if required, note you may use ENV['HTTP_PROXY'] for setting in browser (ff profile) but not for client conection, hence allow for PROXY_ON=false
   end
diff --git a/spec/frameworks_capybara_spec.rb b/spec/frameworks_capybara_spec.rb
index e310dec..cbcf164 100644
--- a/spec/frameworks_capybara_spec.rb
+++ b/spec/frameworks_capybara_spec.rb
@@ -469,6 +469,29 @@ def delete_session
         end
         it_behaves_like "Selenium Driver Options Array"
       end
+
+      context "with Remote Selenium driver and specified Custom Capabilites for Appium" do
+        before do
+          ENV['BROWSER'] = 'remote'
+          ENV['REMOTE_URL'] = 'http://127.0.0.1:4273'
+          ENV['APPIUM_PLATFORM'] = 'Android'
+          ENV['APPIUM_DEVICE'] = 'android'
+          ENV['APPIUM_BROWSER'] = 'chrome'
+          ENV['APPIUM_UDID'] = 'abd234'
+        end
+
+        it "should be initialized correctly" do
+          Capybara.delete_session
+          CapybaraSetup.new.driver.should == :selenium
+          Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
+          Capybara.current_session.driver.options[:browser].should == :remote
+          Capybara.current_session.driver.options[:url].should == ENV['REMOTE_URL']
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
+          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
+        end
+        it_behaves_like "Selenium Driver Options Array"
+      end
     end
 
     describe "should allow Mechanize driver to be created" do
@@ -541,7 +564,7 @@ def compare_file_data(profile_path, file_name, expected_data)
 
             key3_data = write_random_data(@key3_db)
             secmod_data = write_random_data(@secmod_db)
-           
+
             an_exception = nil
             begin 
               CapybaraSetup.new.instance_exec(profile, @cert_dir) { |profile, certificate_path|

From b3eca80de2a3d1390d1365d428f852f73779e1b8 Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Tue, 17 Nov 2015 18:09:08 +0000
Subject: [PATCH 06/62] Adding poltergeist support

---
 Gemfile.lock                     | 10 +++++++
 README.rdoc                      |  2 ++
 frameworks-capybara.gemspec      |  1 +
 lib/frameworks/capybara.rb       | 48 ++++++++++++++++++++++++--------
 spec/frameworks_capybara_spec.rb | 28 +++++++++++++++++++
 5 files changed, 78 insertions(+), 11 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2a4b588..bb651fe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,6 +7,7 @@ PATH
       cucumber
       json
       mechanize
+      poltergeist
       selenium-webdriver
       w3c_validators
 
@@ -25,6 +26,7 @@ GEM
       mechanize (~> 2.5)
     childprocess (0.5.7)
       ffi (~> 1.0, >= 1.0.11)
+    cliver (0.3.2)
     cucumber (2.1.0)
       builder (>= 2.1.2)
       cucumber-core (~> 1.3.0)
@@ -60,6 +62,11 @@ GEM
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     ntlm-http (0.1.1)
+    poltergeist (1.7.0)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
+      multi_json (~> 1.0)
+      websocket-driver (>= 0.2.0)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -86,6 +93,9 @@ GEM
       nokogiri
     webrobots (0.1.1)
     websocket (1.2.2)
+    websocket-driver (0.6.2)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
diff --git a/README.rdoc b/README.rdoc
index d32c4c1..ce677d1 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -17,6 +17,8 @@ Below are the current drivers that can be registered:
 
 * Mechanize-Caybara: This can be used, by setting BROWSER=mechanize
 
+* Poltergeist: This can be used, by setting BROWSER=poltergeist
+
 How to use this gem in your project:
 
 In your env.rb simply add:
diff --git a/frameworks-capybara.gemspec b/frameworks-capybara.gemspec
index 563b437..d693cab 100644
--- a/frameworks-capybara.gemspec
+++ b/frameworks-capybara.gemspec
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("capybara", '~> 2.5')  
   s.add_runtime_dependency("mechanize")
   s.add_runtime_dependency("capybara-mechanize")
+  s.add_runtime_dependency("poltergeist")
   s.add_runtime_dependency("json")
   s.add_runtime_dependency("cucumber")
   s.add_runtime_dependency("w3c_validators")  
diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index 6060820..5e2dc6d 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -1,6 +1,7 @@
 require 'capybara'
 require 'capybara/cucumber'
 require 'capybara/mechanize'
+require 'capybara/poltergeist'
 require 'selenium-webdriver'
 require 'extensions/capybara-extensions'
 require 'extensions/capybara-mechanize-extensions'
@@ -66,9 +67,11 @@ def initialize
       opts.delete_if {|k,v| (v.nil? or k == :environment)}
     end
 
-    case capybara_opts[:browser] 
+    case capybara_opts[:browser]
     when :mechanize then
       @driver = register_mechanize_driver(capybara_opts)
+    when :poltergeist then
+      @driver = register_poltergeist_driver(capybara_opts)
     else
       @driver = register_selenium_driver(capybara_opts, selenium_remote_opts, custom_opts)
     end
@@ -104,14 +107,14 @@ def update_firefox_profile_with_certificates(profile, certificate_path, certific
         raise "Firefox cert db file #{source_path} does not exist."
       end
       FileUtils.cp(source_path, dest_path)
-    end 
+    end
 
     # Force the certificates to get pulled into the profile
     profile = Selenium::WebDriver::Firefox::Profile.new(profile_path)
 
     # Avoid Firefox certificate alerts
     profile["security.default_personal_cert"] = 'Select Automatically'
-    
+
     return profile
   end
 
@@ -136,7 +139,7 @@ def register_selenium_driver(opts,remote_opts,custom_opts)
         remote_opts['chrome.switches'] = opts.delete :switches if opts[:switches]
         caps = Selenium::WebDriver::Remote::Capabilities.new(remote_opts)
 
-        add_custom_caps(caps, custom_opts) if remote_opts[:url].include? 'saucelabs' #set sauce specific parameters - will this scupper other on sauce remote jobs? 
+        add_custom_caps(caps, custom_opts) if remote_opts[:url].include? 'saucelabs' #set sauce specific parameters - will this scupper other on sauce remote jobs?
 
         add_browserstack_caps(caps, custom_opts) if remote_opts[:url].include? 'browserstack' #set browserstack specific parameters
 
@@ -148,14 +151,14 @@ def register_selenium_driver(opts,remote_opts,custom_opts)
 
       clean_opts(opts, :http_proxy, :webdriver_proxy_on, :firefox_prefs)
       Capybara::Selenium::Driver.new(app,opts)
-    end   
+    end
     :selenium
   end
 
   def add_custom_caps(caps, custom_opts)
-    sauce_time_limit = custom_opts.delete(:max_duration).to_i #note nil.to_i == 0 
+    sauce_time_limit = custom_opts.delete(:max_duration).to_i #note nil.to_i == 0
     # This no longer works with the latest selenium-webdriver release
-    #caps.custom_capabilities({:'job-name' => (custom_opts[:job_name] or 'frameworks-unamed-job'), :'max-duration' => ((sauce_time_limit if sauce_time_limit != 0) or 1800)}) 
+    #caps.custom_capabilities({:'job-name' => (custom_opts[:job_name] or 'frameworks-unamed-job'), :'max-duration' => ((sauce_time_limit if sauce_time_limit != 0) or 1800)})
   end
 
   def add_browserstack_caps(caps, custom_opts)
@@ -185,11 +188,11 @@ def create_profile(profile_name = nil, additional_prefs = nil)
       profile.native_events = true
     elsif(profile_name == 'BBC_INTERNAL')
       profile = Selenium::WebDriver::Firefox::Profile.new
-      if(@proxy_host && @proxy_port) 
+      if(@proxy_host && @proxy_port)
         profile["network.proxy.type"] = 1
         profile["network.proxy.no_proxies_on"] = "*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk"
-        profile["network.proxy.http"] = @proxy_host 
-        profile["network.proxy.ssl"] = @proxy_host 
+        profile["network.proxy.http"] = @proxy_host
+        profile["network.proxy.ssl"] = @proxy_host
         profile["network.proxy.http_port"] = @proxy_port
         profile["network.proxy.ssl_port"] = @proxy_port
       end
@@ -213,7 +216,7 @@ def register_mechanize_driver(opts)
     app = Proc.new do |env|
       ['200', {'Content-Type' => 'text/html'}, ['A barebones rack app.']]
     end
-    Capybara.app = app 
+    Capybara.app = app
     Capybara.run_server = false
     Capybara.register_driver :mechanize do |app|
       Capybara.app_host = "http://www.bbc.co.uk"
@@ -223,6 +226,29 @@ def register_mechanize_driver(opts)
   end
 
 
+  def register_poltergeist_driver(opts)
+    ## Poltergiest needs a Rack application: create a dummy one
+    app = Proc.new do |env|
+      ['200', {'Content-Type' => 'text/html'}, ['A barebones rack app.']]
+    end
+    phantom_opts = %w(--ssl-protocol=tlsv1 --ignore-ssl-errors=yes)
+    phantom_opts.push "--proxy=#{@proxy_host}:#{@proxy_port}" if @proxy_host && @proxy_port
+    Capybara.app = app
+    Capybara.run_server = false
+    options = {
+      js_errors: false,
+      :timeout           => 120,
+      :window_size       => [1200, 1000],
+      :phantomjs_options => phantom_opts,
+      :default_wait_time => 30
+    }
+    Capybara.register_driver :poltergeist do |app|
+      Capybara.app_host = "http://www.bbc.co.uk"
+      Capybara::Poltergeist::Driver.new(app, options)
+    end
+    :poltergeist
+  end
+
   def clean_opts(opts, *args)
     args.each do |arg|
       opts.delete arg
diff --git a/spec/frameworks_capybara_spec.rb b/spec/frameworks_capybara_spec.rb
index cbcf164..22ec3ab 100644
--- a/spec/frameworks_capybara_spec.rb
+++ b/spec/frameworks_capybara_spec.rb
@@ -525,6 +525,34 @@ def delete_session
         end
       end
 
+    describe "should allow Poltergeist driver to be created" do
+      context "with minimal Poltergeist driver" do
+        before do
+          ENV['BROWSER'] = 'poltergeist'
+        end
+
+        it "should be initialized correctly" do
+          Capybara.delete_session
+          CapybaraSetup.new.driver.should == :poltergeist
+          Capybara.current_session.driver.should be_a_kind_of Capybara::Poltergeist::Driver
+        end
+
+        context "with maximal Poltergeist driver" do
+          before do
+            ENV['BROWSER'] = 'poltergeist'
+            ENV['ENVIRONMENT'] = 'test'
+            ENV['HTTP_PROXY'] = 'http://example.cache.co.uk:80'
+          end
+
+          it "should be initialized correctly" do
+            Capybara.delete_session
+            CapybaraSetup.new.driver.should == :poltergeist
+            Capybara.current_session.driver.should be_a_kind_of Capybara::Poltergeist::Driver
+          end
+        end
+      end
+    end
+
       describe "should permit certificate files to be incorporated into firefox profiles" do
 
         context "integration tests for update_firefox_profile_with_certificates() method" do

From 1ef0709b73d018333a45f3327ec958f7eb418f7f Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Wed, 2 Dec 2015 09:50:41 +0000
Subject: [PATCH 07/62] allow wait to recieve message

---
 lib/frameworks/wait.rb | 16 ++++++----------
 spec/wait_spec.rb      |  4 ++--
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/frameworks/wait.rb b/lib/frameworks/wait.rb
index 596bf38..f1ce191 100644
--- a/lib/frameworks/wait.rb
+++ b/lib/frameworks/wait.rb
@@ -4,19 +4,15 @@ module FrameworksCapybara
   module Wait
     ##
     # Execute a block until it returns true.
-    # Optionally pass a timeout (by default 5 seconds).
+    # Optionally pass a message and timeout (default 10 seconds).
     #
-    # wait_for { (Random.rand(2) % 2) }
+    # wait_for('checking divide by 2', timeout: 5) { (Random.rand(2) % 2) }
     #
-    # wait_for(:timeout => 4) { (Random.rand(2) % 2) }
-    #
-    def wait_for(options={:timeout => 5})
-      timeout = Time.new + options[:timeout].to_f
-
-      while (Time.new < timeout)
-        return if (yield)
+    def wait_for(message = '', options = { timeout: 5 })
+      Timeout.timeout(options[:timeout]) do
+        puts "In wait helper message is: #{message}"
+        sleep 1 until yield
       end
-      raise 'Timeout exceeded for wait until.'
     end
 
     ##
diff --git a/spec/wait_spec.rb b/spec/wait_spec.rb
index 0dc824f..c94338a 100644
--- a/spec/wait_spec.rb
+++ b/spec/wait_spec.rb
@@ -10,13 +10,13 @@
 
     it "should raise an exception if the default timeout expires" do
       start_time = Time.now
-      expect { test.wait_for { Time.now > (start_time + (6 * 60)) } }.to raise_error
+      expect { test.wait_for('foo') { true == false } }.to raise_error
     end
 
     it "should raise an exception if the specified timeout expires" do
       start_time = Time.now
       expect {
-        test.wait_for(timeout: 1) do
+        test.wait_for('',timeout: 1) do
           Time.now > (start_time + (2 * 60))
         end
       }.to raise_error

From 5f4b4c5db37c3f459c1569e042fd364a2bf10e1c Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Mon, 4 Jan 2016 16:28:10 +0000
Subject: [PATCH 08/62] add some useful rake tasks

---
 lib/tasks/parallel-tasks.rb | 110 ++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 lib/tasks/parallel-tasks.rb

diff --git a/lib/tasks/parallel-tasks.rb b/lib/tasks/parallel-tasks.rb
new file mode 100644
index 0000000..1bb92ad
--- /dev/null
+++ b/lib/tasks/parallel-tasks.rb
@@ -0,0 +1,110 @@
+class ParallelTasks
+  include Rake::DSL if defined? Rake::DSL
+
+  def install_tasks
+    require 'bundler/setup'
+    require 'parallel'
+    require 'rspec/core/rake_task'
+    require 'rubocop/rake_task'
+    require 'cucumber/rake/task'
+    require 'yard'
+
+    def run_rake_task(name)
+      puts "name is #{name}"
+      begin
+        Rake::Task[name].invoke
+      rescue Exception => e
+        puts "Exception running rake task: #{e}"
+        return false
+      end
+      true
+    end
+
+    def reports(name)
+      "--format pretty --format junit --out=reports/#{name} --strict --format html " \
+      "--out=reports/#{name}.html --format json --out=reports/#{name}.json"
+    end
+
+    def env
+      ENV['ENVIRONMENT'] ? "ENVIRONMENT=#{ENV['ENVIRONMENT']}" : 'ENVIRONMENT=live'
+    end
+
+    def tags
+      ENV['TAGS'] || ''
+    end
+
+    def get_thread_count
+      ENV['THREAD_COUNT'] ? ENV['THREAD_COUNT'].to_i : 2
+    end
+
+    desc 'Run all examples'
+    RSpec::Core::RakeTask.new(:spec) do |t|
+      t.rspec_opts = %w(--color -fprogress -fhtml -oreports/rspec.html)
+    end
+
+    desc 'Create some docs'
+    YARD::Rake::YardocTask.new do |t|
+      t.files   = ['lib/**/*.rb']
+      t.options = %w(--markup=markdown)
+    end
+
+    desc 'Make sure we are good rubyists'
+    RuboCop::RakeTask.new(:rubocop) do |t|
+      t.formatters = ['progress']
+      t.options = ['-fhtml', '-oreports/rubocop.html']
+      # don't abort rake on failure
+      t.fail_on_error = false
+    end
+
+    desc 'Run cukes on production in parallel with browserstack chrome'
+    task :parallel_cuke do |t|
+      sh "bundle exec parallel_cucumber -n #{get_thread_count} -o '#{tags} #{env}' features"
+    end
+
+    desc 'Rerun failed cukes on production with browserstack chrome'
+    Cucumber::Rake::Task.new(:rerun_browserstack) do |t|
+      t.cucumber_opts = %W(-p browserstack #{env} @reports/rerun.txt #{reports('junit_rerun')})
+    end
+
+    desc 'Run selenium and rerun failed tests'
+    task :tests_with_retry do
+      selenium_successful = run_rake_task('parallel_cuke')
+      rerun_successful = true
+      rerun_successful = run_rake_task('rerun_browserstack') unless selenium_successful
+      puts "result is #{selenium_successful} and  #{rerun_successful}"
+      fail 'Cucumber Failure' unless selenium_successful || rerun_successful
+    end
+
+    desc 'Remove all files from the ./reports and ./doc directory'
+    task :clean do
+      require 'fileutils'
+      FileUtils.rm_rf Dir.glob('reports/*')
+      FileUtils.rm_rf Dir.glob('doc/*')
+    end
+
+    desc 'Use Junit Merge to merge results from multiple threads'
+    task :junit_merge do
+      require 'fileutils'
+
+      report_dir = 'reports'
+      junit_dir = "#{report_dir}/junit_results"
+
+      (2..get_thread_count).each do |thread|
+        original_reports = Dir.entries junit_dir
+        thread_reports = Dir.entries "#{junit_dir}#{thread}"
+        thread_reports.reject { |f| File.directory?(f) }.each do |report|
+          if  original_reports.include?(report)
+            sh "junit_merge #{junit_dir}#{thread}/#{report} #{junit_dir}/#{report}"
+          else
+            puts  "copy #{junit_dir}#{thread}/#{report} to #{junit_dir}"
+            FileUtils.cp  "#{junit_dir}#{thread}/#{report}", junit_dir
+          end
+        end
+      end
+      junit_rerun = Dir.glob "#{report_dir}/junit_rerun/*xml"
+      sh "junit_merge #{report_dir}/junit_rerun #{junit_dir}" unless junit_rerun.empty?
+    end
+  end
+end
+
+ParallelTasks.new.install_tasks

From 8a019da726d10aaf1bbdf50b4ac9e9ceb0b1eecf Mon Sep 17 00:00:00 2001
From: Swati <swati.tabib.ext@bbc.co.uk>
Date: Mon, 11 Jan 2016 13:42:53 +0000
Subject: [PATCH 09/62] added task for feature documentation

---
 lib/tasks/parallel-tasks.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/tasks/parallel-tasks.rb b/lib/tasks/parallel-tasks.rb
index 1bb92ad..675c953 100644
--- a/lib/tasks/parallel-tasks.rb
+++ b/lib/tasks/parallel-tasks.rb
@@ -48,6 +48,11 @@ def get_thread_count
       t.options = %w(--markup=markdown)
     end
 
+    desc 'Create some docs'
+    YARD::Rake::YardocTask.new(:yarddoc) do |t|
+      t.files = ['features/*.feature', 'features/**/*.rb']
+    end
+
     desc 'Make sure we are good rubyists'
     RuboCop::RakeTask.new(:rubocop) do |t|
       t.formatters = ['progress']

From da02eb2cca320a42d65eeb9edfde8a8bee253185 Mon Sep 17 00:00:00 2001
From: Swati <swati.tabib.ext@bbc.co.uk>
Date: Mon, 11 Jan 2016 14:14:06 +0000
Subject: [PATCH 10/62] changing task desc

---
 lib/tasks/parallel-tasks.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/parallel-tasks.rb b/lib/tasks/parallel-tasks.rb
index 675c953..df332c8 100644
--- a/lib/tasks/parallel-tasks.rb
+++ b/lib/tasks/parallel-tasks.rb
@@ -48,7 +48,7 @@ def get_thread_count
       t.options = %w(--markup=markdown)
     end
 
-    desc 'Create some docs'
+    desc 'Feature documentation'
     YARD::Rake::YardocTask.new(:yarddoc) do |t|
       t.files = ['features/*.feature', 'features/**/*.rb']
     end

From be2c547e29a8e74b12f73e8b1d0659ff11dc4b8b Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Thu, 14 Jan 2016 12:27:06 +0000
Subject: [PATCH 11/62] move common code from projects into frameworks gem

---
 Gemfile.lock                | 48 ++++++++++++++++++++-------------
 frameworks-capybara.gemspec |  6 +++--
 lib/extensions/patches.rb   | 34 +++++++++++++++++++++++
 lib/frameworks-capybara.rb  |  2 ++
 lib/frameworks/logger.rb    | 42 +++++++++++++++++++++++++++++
 lib/frameworks/utils.rb     | 54 +++++++++++++++++++++++++++++++++++++
 spec/logger_spec.rb         | 27 +++++++++++++++++++
 spec/spec_helper.rb         |  5 ++--
 spec/utils_spec.rb          | 11 ++++++++
 9 files changed, 207 insertions(+), 22 deletions(-)
 create mode 100644 lib/extensions/patches.rb
 create mode 100644 lib/frameworks/logger.rb
 create mode 100644 lib/frameworks/utils.rb
 create mode 100644 spec/logger_spec.rb
 create mode 100644 spec/utils_spec.rb

diff --git a/Gemfile.lock b/Gemfile.lock
index bb651fe..498937a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,9 +6,11 @@ PATH
       capybara-mechanize
       cucumber
       json
+      logging
       mechanize
       poltergeist
       selenium-webdriver
+      show_me_the_cookies
       w3c_validators
 
 GEM
@@ -24,45 +26,53 @@ GEM
     capybara-mechanize (1.0.1)
       capybara (~> 2.0, >= 2.0.1)
       mechanize (~> 2.5)
-    childprocess (0.5.7)
+    childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
     cliver (0.3.2)
-    cucumber (2.1.0)
+    cucumber (2.3.0)
       builder (>= 2.1.2)
-      cucumber-core (~> 1.3.0)
+      cucumber-core (~> 1.4.0)
+      cucumber-wire (~> 0.0.1)
       diff-lcs (>= 1.1.3)
-      gherkin3 (~> 3.1.0)
+      event-bus (~> 0.1.0)
+      gherkin (~> 3.2.0)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    cucumber-core (1.3.0)
-      gherkin3 (~> 3.1.0)
+    cucumber-core (1.4.0)
+      gherkin (~> 3.2.0)
+    cucumber-wire (0.0.1)
     diff-lcs (1.2.5)
     domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
+    event-bus (0.1.0)
     ffi (1.9.10)
-    gherkin3 (3.1.2)
+    gherkin (3.2.0)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     json (1.8.3)
-    mechanize (2.7.3)
+    little-plugger (1.1.4)
+    logging (2.0.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
+    mechanize (2.7.4)
       domain_name (~> 0.5, >= 0.5.1)
       http-cookie (~> 1.0)
-      mime-types (~> 2.0)
+      mime-types (>= 1.17.2, < 3)
       net-http-digest_auth (~> 1.1, >= 1.1.1)
       net-http-persistent (~> 2.5, >= 2.5.2)
-      nokogiri (~> 1.4)
+      nokogiri (~> 1.6)
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (>= 0.0.9, < 0.2)
-    mime-types (2.6.2)
-    mini_portile (0.6.2)
+    mime-types (2.99)
+    mini_portile2 (2.0.0)
     multi_json (1.11.2)
     multi_test (0.1.2)
     net-http-digest_auth (1.4)
     net-http-persistent (2.9.4)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
     ntlm-http (0.1.1)
-    poltergeist (1.7.0)
+    poltergeist (1.8.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
@@ -80,20 +90,22 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
     rubyzip (1.1.7)
-    selenium-webdriver (2.48.1)
+    selenium-webdriver (2.49.0)
       childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
+    show_me_the_cookies (3.1.0)
+      capybara (~> 2.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
     w3c_validators (1.2)
       json
       nokogiri
-    webrobots (0.1.1)
+    webrobots (0.1.2)
     websocket (1.2.2)
-    websocket-driver (0.6.2)
+    websocket-driver (0.6.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     xpath (2.0.0)
diff --git a/frameworks-capybara.gemspec b/frameworks-capybara.gemspec
index d693cab..fd2cd27 100644
--- a/frameworks-capybara.gemspec
+++ b/frameworks-capybara.gemspec
@@ -21,13 +21,15 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
 
   s.add_runtime_dependency("selenium-webdriver")
-  s.add_runtime_dependency("capybara", '~> 2.5')  
+  s.add_runtime_dependency("capybara", '~> 2.5')
   s.add_runtime_dependency("mechanize")
   s.add_runtime_dependency("capybara-mechanize")
   s.add_runtime_dependency("poltergeist")
   s.add_runtime_dependency("json")
   s.add_runtime_dependency("cucumber")
-  s.add_runtime_dependency("w3c_validators")  
+  s.add_runtime_dependency("logging")
+  s.add_runtime_dependency("show_me_the_cookies")
+  s.add_runtime_dependency("w3c_validators")
   s.add_development_dependency("rake")
   s.add_development_dependency("rspec")
 end
diff --git a/lib/extensions/patches.rb b/lib/extensions/patches.rb
new file mode 100644
index 0000000..ed1e1f8
--- /dev/null
+++ b/lib/extensions/patches.rb
@@ -0,0 +1,34 @@
+require 'show_me_the_cookies'
+require 'capybara'
+require 'logger'
+# monkey patches live here - beware!
+module Capybara
+  # override behaviour of visit to surpress bbc survey
+  class Session
+    include ShowMeTheCookies
+    include FrameworksCapybara::Logger
+
+    alias_method :old_visit, :visit
+    def visit(url)
+      old_visit url
+      surpress_cookies_prompt unless Capybara.current_driver == :mechanize
+      reload_if_survey_appears unless Capybara.current_driver == :mechanize
+    end
+
+    def surpress_cookies_prompt
+      create_cookie('ckns_policy_exp', '9999999999999')
+      create_cookie('ckns_policy', '111')
+    end
+
+    def reload_if_survey_appears
+      reload = false
+      within_frame('edr_l_first') do
+        if has_selector?('#layer_wrap', wait: 1)
+          log.info 'Found survey, will now reload page - only true x browser solution for now'
+          reload = true
+        end
+      end
+      visit current_url if reload
+    end
+  end
+end
diff --git a/lib/frameworks-capybara.rb b/lib/frameworks-capybara.rb
index c7d9b80..c85c97c 100644
--- a/lib/frameworks-capybara.rb
+++ b/lib/frameworks-capybara.rb
@@ -1,5 +1,7 @@
 require 'frameworks/cucumber'
 require 'frameworks/capybara'
 require 'frameworks/wait'
+require 'frameworks/utils'
+require 'frameworks/logger'
 
 CapybaraSetup.new unless ENV['CAPYBARA_DISABLED']
diff --git a/lib/frameworks/logger.rb b/lib/frameworks/logger.rb
new file mode 100644
index 0000000..af943cc
--- /dev/null
+++ b/lib/frameworks/logger.rb
@@ -0,0 +1,42 @@
+require 'logging'
+
+module FrameworksCapybara
+  # configure logging
+  module Logger
+    def log_level
+      log_levels = %w(warn info debug)
+      env_log_level = (ENV['LOG_LEVEL'] || '').downcase
+      log_levels.include?(env_log_level) ? env_log_level.to_sym : :debug
+    end
+
+    def log
+      Logging.appenders.stdout(
+        'stdout',
+        layout: Logging.layouts.pattern(pattern: '[%d] %-7l %c: %m\n', color_scheme: default_style)
+      )
+      # rubocop:disable Style/GlobalVars
+      # global log acceptable
+      $log ||= new_log
+      # rubocop:enable Style/GlobalVars
+    end
+
+    def default_style
+      scheme = 'pldefault'
+      Logging.color_scheme(
+        scheme,
+        levels: { info:  :green, warn:  :yellow, error: :red },
+        date:    :cyan,
+        logger:  :cyan,
+        message: :cyan
+      )
+      scheme
+    end
+
+    def new_log
+      log = Logging.logger['Color::Log']
+      log.add_appenders 'stdout'
+      log.level = :info
+      log
+    end
+  end
+end
diff --git a/lib/frameworks/utils.rb b/lib/frameworks/utils.rb
new file mode 100644
index 0000000..978c485
--- /dev/null
+++ b/lib/frameworks/utils.rb
@@ -0,0 +1,54 @@
+# generic util methods
+module FrameworksCapybara
+  module Utils
+    def rubyize(english_string)
+      english_string.tr(' ', '_').downcase
+    end
+
+    def loweralpha(str)
+      str.downcase.scan(/[a-z]/).join
+    end
+
+    def clean_id_cookies
+      Capybara.current_session.delete_cookie 'IDENTITIY'
+      Capybara.current_session.delete_cookie 'IDENTITIY_ENV'
+    end
+
+    def browser
+      if Capybara.current_driver == :selenium
+        Capybara.current_session.driver.browser.manage
+        .instance_variable_get('@bridge')
+        .instance_variable_get('@capabilities')[:browser_name]
+      else
+        Capybara.current_driver
+      end
+    end
+
+    def check_expected_page_items(page, table)
+      table.raw.flatten.each do |table_item|
+        page_method = "have_#{rubyize(table_item)}"
+        expect(page).to send page_method
+      end
+    end
+
+    def check_expected_link_text(parent_body, table)
+      table.raw.flatten.each do |link_text|
+        expect(parent_body.has_link?(link_text)).to eq true
+      end
+    end
+
+    def check_expected_section_items(sections, table)
+      sections.each do |section|
+        table.raw.flatten.each do |section_item|
+          section_method = "have_#{rubyize(section_item)}"
+          expect(section).to send(section_method) unless section_item.include? '(optional)'
+        end
+      end
+    end
+
+    def switch_to_last_opened_window
+      Capybara.page.switch_to_window(Capybara.page.windows.last)
+      Capybara.page.windows.first.close
+    end
+  end
+end
diff --git a/spec/logger_spec.rb b/spec/logger_spec.rb
new file mode 100644
index 0000000..0738a01
--- /dev/null
+++ b/spec/logger_spec.rb
@@ -0,0 +1,27 @@
+require 'rspec'
+require_relative '../lib/frameworks/logger'
+
+describe FrameworksCapybara::Logger do
+  describe 'log levels' do
+    let(:test) { Class.new { include FrameworksCapybara::Logger }.new }
+
+    it 'sets a default log level of debug' do
+      expect(test.log_level).to eql :debug
+    end
+
+    it 'allows_log_level to be overwritten uppercase' do
+      ENV['LOG_LEVEL'] = 'WARN'
+      expect(test.log_level).to eql :warn
+    end
+
+    it 'allows_log_level to be overwritten lowercase' do
+      ENV['LOG_LEVEL'] = 'info'
+      expect(test.log_level).to eql :info
+    end
+
+    it 'ignores invalid log levels' do
+      ENV['LOG_LEVEL'] = 'FOOBAR'
+      expect(test.log_level).to eql :debug
+    end
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 675d0cb..07f6632 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'bundler/setup'
-require 'cucumber/language_support/language_methods'
+require 'cucumber/configuration'
 require 'cucumber/rb_support/rb_language'
 require 'cucumber/runtime'
 require 'rspec'
@@ -8,7 +8,8 @@
 
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift "#{dir}/../lib"
-Cucumber::RbSupport::RbLanguage.new(Cucumber::Runtime.new) #Need to load Cucumber runtime, so World is available 
+c = Cucumber::Configuration.new
+Cucumber::RbSupport::RbLanguage.new(Cucumber::Runtime.new, c) #Need to load Cucumber runtime, so World is available 
 
 require 'frameworks/capybara'
 require 'frameworks/cucumber'
diff --git a/spec/utils_spec.rb b/spec/utils_spec.rb
new file mode 100644
index 0000000..c573339
--- /dev/null
+++ b/spec/utils_spec.rb
@@ -0,0 +1,11 @@
+require 'rspec'
+require_relative '../lib/frameworks/utils'
+
+describe FrameworksCapybara::Utils do
+  describe 'generic util methods' do
+    let(:test) { Class.new { include FrameworksCapybara::Utils }.new }
+    it 'converts english to ruby method name' do
+      expect(test.rubyize('Hello Matt')).to eql 'hello_matt'
+    end
+  end
+end

From 4e9ad02dc5c7df8007b0d88599c921d978ab924b Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Thu, 14 Jan 2016 12:48:59 +0000
Subject: [PATCH 12/62] bug fix

---
 lib/extensions/patches.rb  | 2 +-
 lib/frameworks/capybara.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/extensions/patches.rb b/lib/extensions/patches.rb
index ed1e1f8..271ea1c 100644
--- a/lib/extensions/patches.rb
+++ b/lib/extensions/patches.rb
@@ -1,6 +1,6 @@
 require 'show_me_the_cookies'
 require 'capybara'
-require 'logger'
+require 'frameworks/logger'
 # monkey patches live here - beware!
 module Capybara
   # override behaviour of visit to surpress bbc survey
diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index 5e2dc6d..661b6f2 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -5,6 +5,7 @@
 require 'selenium-webdriver'
 require 'extensions/capybara-extensions'
 require 'extensions/capybara-mechanize-extensions'
+require 'extensions/patches'
 
 class CapybaraSetup
 

From dd352cfdcf49b780f6b940344ea3d32ad120d603 Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Fri, 15 Jan 2016 11:28:21 +0000
Subject: [PATCH 13/62] add task to merge cucumber json reports

---
 lib/tasks/merge_cucumber_json_reports.rb | 76 ++++++++++++++++++++++++
 lib/tasks/parallel-tasks.rb              |  9 +++
 2 files changed, 85 insertions(+)
 create mode 100644 lib/tasks/merge_cucumber_json_reports.rb

diff --git a/lib/tasks/merge_cucumber_json_reports.rb b/lib/tasks/merge_cucumber_json_reports.rb
new file mode 100644
index 0000000..58ee971
--- /dev/null
+++ b/lib/tasks/merge_cucumber_json_reports.rb
@@ -0,0 +1,76 @@
+require 'json'
+
+# class to merge cucumber json report
+class CucumberJSONMerger
+  attr_reader :master
+
+  def initialize
+    @reports = Dir.glob('reports/report*.json').map { |f| JSON.parse(File.read(f)) }
+    @master = @reports.shift
+  end
+
+  def run
+    @reports.each do |report|
+      report.each do |feature|
+        fname = feature.fetch 'uri'
+        update(fname, feature, report)
+      end
+    end
+  end
+
+  def update(fname, feature, report)
+    if feature_exists? fname
+      scenarios(report, fname).each do |scenario|
+        sname = scenario.fetch 'name'
+        scenario_exists?(sname, fname) ? replace_scenario(sname, scenario, fname) : append_scenario(scenario, fname)
+      end
+    else
+      append_feature feature
+    end
+  end
+
+  def rerun
+    @reports = [JSON.parse(File.read('reports/rerun.json'))]
+    run
+  end
+
+  private
+
+  def feature_names(report)
+    report.map { |f| f['uri'] }
+  end
+
+  def scenario_names(report, fname)
+    scenarios(report, fname).map { |s| s['name'] }
+  end
+
+  def scenarios(report, fname)
+    report.find { |f| f['uri'] == fname }['elements'].select { |e| e['keyword'] == 'Scenario' }.flatten
+  end
+
+  def feature_exists?(name)
+    feature_names(@master).include? name
+  end
+
+  def scenario_exists?(scenario, fname)
+    scenario_names(@master, fname).include? scenario
+  end
+
+  def replace_scenario(sname, scenario, feature)
+    puts "Replacing #{sname} in #{feature} in master"
+    @master.find { |f| f['uri'] == feature }['elements'].delete_if do |e|
+      e['keyword'] == 'Scenario' && e['name'] == sname
+    end
+    append_scenario(scenario, feature)
+  end
+
+  def append_scenario(scenario, feature)
+    puts "Need to append SCENARIO: #{scenario['name']} to FEATURE: #{feature} in master"
+    @master.find { |f| f['uri'] == feature }['elements'] << scenario
+  end
+
+  def append_feature(feature)
+    puts "Need to append FEATURE: '#{feature['name']}' in master"
+    @master.push feature
+  end
+end
diff --git a/lib/tasks/parallel-tasks.rb b/lib/tasks/parallel-tasks.rb
index df332c8..c315d1e 100644
--- a/lib/tasks/parallel-tasks.rb
+++ b/lib/tasks/parallel-tasks.rb
@@ -8,6 +8,7 @@ def install_tasks
     require 'rubocop/rake_task'
     require 'cucumber/rake/task'
     require 'yard'
+    require_relative 'merge_cucumber_json_reports'
 
     def run_rake_task(name)
       puts "name is #{name}"
@@ -109,6 +110,14 @@ def get_thread_count
       junit_rerun = Dir.glob "#{report_dir}/junit_rerun/*xml"
       sh "junit_merge #{report_dir}/junit_rerun #{junit_dir}" unless junit_rerun.empty?
     end
+
+    desc 'Merge Cucumber JSON reports'
+    task :json_merge do
+      c = CucumberJSONMerger.new
+      c.run
+      c.rerun
+      File.open('combined.json', 'w+').write c.master.to_json
+    end
   end
 end
 

From 30be334e0c33cda9fa7de4b739225f5ead59d314 Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Fri, 15 Jan 2016 11:46:06 +0000
Subject: [PATCH 14/62] update name of rerun reports

---
 lib/tasks/parallel-tasks.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/parallel-tasks.rb b/lib/tasks/parallel-tasks.rb
index c315d1e..3e4a920 100644
--- a/lib/tasks/parallel-tasks.rb
+++ b/lib/tasks/parallel-tasks.rb
@@ -22,7 +22,7 @@ def run_rake_task(name)
     end
 
     def reports(name)
-      "--format pretty --format junit --out=reports/#{name} --strict --format html " \
+      "--format pretty --format junit --out=reports/junit_#{name} --strict --format html " \
       "--out=reports/#{name}.html --format json --out=reports/#{name}.json"
     end
 
@@ -69,7 +69,7 @@ def get_thread_count
 
     desc 'Rerun failed cukes on production with browserstack chrome'
     Cucumber::Rake::Task.new(:rerun_browserstack) do |t|
-      t.cucumber_opts = %W(-p browserstack #{env} @reports/rerun.txt #{reports('junit_rerun')})
+      t.cucumber_opts = %W(-p browserstack #{env} @reports/rerun.txt #{reports('rerun')})
     end
 
     desc 'Run selenium and rerun failed tests'

From 5bac6a2773354b73fcfe5a54ae70451e679d5de9 Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Fri, 15 Jan 2016 12:38:38 +0000
Subject: [PATCH 15/62] handle case where no rerun json file

---
 lib/tasks/merge_cucumber_json_reports.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/merge_cucumber_json_reports.rb b/lib/tasks/merge_cucumber_json_reports.rb
index 58ee971..7326981 100644
--- a/lib/tasks/merge_cucumber_json_reports.rb
+++ b/lib/tasks/merge_cucumber_json_reports.rb
@@ -30,8 +30,13 @@ def update(fname, feature, report)
   end
 
   def rerun
-    @reports = [JSON.parse(File.read('reports/rerun.json'))]
-    run
+    json_rerun = Dir.glob "#{report_dir}/rerun.json"
+    if json_rerun.empty?
+      puts 'no rerun file found'
+    else
+      @reports = [JSON.parse(File.read('reports/rerun.json'))]
+      run
+    end
   end
 
   private

From 3109d5e3aa69927b07e443da809bd80bad792115 Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Sat, 16 Jan 2016 23:19:55 +0000
Subject: [PATCH 16/62] bug fix to json merge

---
 lib/tasks/merge_cucumber_json_reports.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/merge_cucumber_json_reports.rb b/lib/tasks/merge_cucumber_json_reports.rb
index 7326981..625e8de 100644
--- a/lib/tasks/merge_cucumber_json_reports.rb
+++ b/lib/tasks/merge_cucumber_json_reports.rb
@@ -30,7 +30,7 @@ def update(fname, feature, report)
   end
 
   def rerun
-    json_rerun = Dir.glob "#{report_dir}/rerun.json"
+    json_rerun = Dir.glob "reports/rerun.json"
     if json_rerun.empty?
       puts 'no rerun file found'
     else

From 8653fbb5d3ce88887190e6849d427175cc7e543d Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Mon, 18 Jan 2016 14:17:31 +0000
Subject: [PATCH 17/62] always register headless drivers even if they are not
 default

---
 lib/frameworks/capybara.rb | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index 661b6f2..1a9483c 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -68,11 +68,14 @@ def initialize
       opts.delete_if {|k,v| (v.nil? or k == :environment)}
     end
 
+    # always register in case we are using a configuration that swaps between drivers
+    mech_driver = register_mechanize_driver(capybara_opts)
+    poltergeist_driver = register_poltergeist_driver(capybara_opts)
     case capybara_opts[:browser]
     when :mechanize then
-      @driver = register_mechanize_driver(capybara_opts)
+      @driver = mech_driver
     when :poltergeist then
-      @driver = register_poltergeist_driver(capybara_opts)
+      @driver = poltergeist_driver
     else
       @driver = register_selenium_driver(capybara_opts, selenium_remote_opts, custom_opts)
     end
@@ -238,10 +241,10 @@ def register_poltergeist_driver(opts)
     Capybara.run_server = false
     options = {
       js_errors: false,
-      :timeout           => 120,
-      :window_size       => [1200, 1000],
-      :phantomjs_options => phantom_opts,
-      :default_wait_time => 30
+      timeout:   120,
+      window_size: [1200, 1000],
+      phantomjs_options: phantom_opts,
+      default_wait_time: 30
     }
     Capybara.register_driver :poltergeist do |app|
       Capybara.app_host = "http://www.bbc.co.uk"

From 2ec07671b799a1dffd16e6d3ec7ee28a698ed182 Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Mon, 18 Jan 2016 16:42:04 +0000
Subject: [PATCH 18/62] don't do the cookies and survey hacks if we are running
 headless

---
 lib/extensions/patches.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/extensions/patches.rb b/lib/extensions/patches.rb
index 271ea1c..550a916 100644
--- a/lib/extensions/patches.rb
+++ b/lib/extensions/patches.rb
@@ -11,8 +11,9 @@ class Session
     alias_method :old_visit, :visit
     def visit(url)
       old_visit url
-      surpress_cookies_prompt unless Capybara.current_driver == :mechanize
-      reload_if_survey_appears unless Capybara.current_driver == :mechanize
+      return if [:mechanize, :poltergeist].include?(Capybara.current_driver)
+      surpress_cookies_prompt
+      reload_if_survey_appears
     end
 
     def surpress_cookies_prompt

From c537adba720f7c909edbd4ada6268208521d6712 Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Tue, 19 Jan 2016 11:00:38 +0000
Subject: [PATCH 19/62] tweak json merge

---
 lib/tasks/merge_cucumber_json_reports.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/merge_cucumber_json_reports.rb b/lib/tasks/merge_cucumber_json_reports.rb
index 625e8de..731c0b9 100644
--- a/lib/tasks/merge_cucumber_json_reports.rb
+++ b/lib/tasks/merge_cucumber_json_reports.rb
@@ -30,6 +30,7 @@ def update(fname, feature, report)
   end
 
   def rerun
+    puts "Processing rerun json"
     json_rerun = Dir.glob "reports/rerun.json"
     if json_rerun.empty?
       puts 'no rerun file found'
@@ -50,7 +51,7 @@ def scenario_names(report, fname)
   end
 
   def scenarios(report, fname)
-    report.find { |f| f['uri'] == fname }['elements'].select { |e| e['keyword'] == 'Scenario' }.flatten
+    report.find { |f| f['uri'] == fname }['elements'].select { |e| e['keyword'].include? 'Scenario' }.flatten
   end
 
   def feature_exists?(name)
@@ -64,7 +65,7 @@ def scenario_exists?(scenario, fname)
   def replace_scenario(sname, scenario, feature)
     puts "Replacing #{sname} in #{feature} in master"
     @master.find { |f| f['uri'] == feature }['elements'].delete_if do |e|
-      e['keyword'] == 'Scenario' && e['name'] == sname
+      e['keyword'].include?('Scenario') && e['name'] == sname
     end
     append_scenario(scenario, feature)
   end

From e9e11e3bbe70b4826816f517b78f7e0c547be5c3 Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Tue, 19 Jan 2016 13:48:13 +0000
Subject: [PATCH 20/62] need to take account of scenario outlines

---
 lib/tasks/merge_cucumber_json_reports.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/tasks/merge_cucumber_json_reports.rb b/lib/tasks/merge_cucumber_json_reports.rb
index 731c0b9..70d190b 100644
--- a/lib/tasks/merge_cucumber_json_reports.rb
+++ b/lib/tasks/merge_cucumber_json_reports.rb
@@ -22,7 +22,8 @@ def update(fname, feature, report)
     if feature_exists? fname
       scenarios(report, fname).each do |scenario|
         sname = scenario.fetch 'name'
-        scenario_exists?(sname, fname) ? replace_scenario(sname, scenario, fname) : append_scenario(scenario, fname)
+        sline = scenario.fetch 'line'
+        scenario_exists?(sname, fname) ? replace_scenario(sname, sline, scenario, fname) : append_scenario(scenario, fname)
       end
     else
       append_feature feature
@@ -62,10 +63,11 @@ def scenario_exists?(scenario, fname)
     scenario_names(@master, fname).include? scenario
   end
 
-  def replace_scenario(sname, scenario, feature)
-    puts "Replacing #{sname} in #{feature} in master"
+  def replace_scenario(sname, sline, scenario, feature)
     @master.find { |f| f['uri'] == feature }['elements'].delete_if do |e|
-      e['keyword'].include?('Scenario') && e['name'] == sname
+      exists = e['keyword'].include?('Scenario') && e['name'] == sname && e['line'] == sline
+      puts "Replacing #{sname} on line #{sline} in #{feature} in master" if exists
+      exists
     end
     append_scenario(scenario, feature)
   end

From 610192297811f01ab629b29856d0f27a5b0bd1fa Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Wed, 20 Jan 2016 09:56:47 +0000
Subject: [PATCH 21/62] add a task to generate a simple red/green report for
 parallel runs

---
 lib/tasks/confluence.erb    |  1 +
 lib/tasks/parallel-tasks.rb | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 lib/tasks/confluence.erb

diff --git a/lib/tasks/confluence.erb b/lib/tasks/confluence.erb
new file mode 100644
index 0000000..0ae79c4
--- /dev/null
+++ b/lib/tasks/confluence.erb
@@ -0,0 +1 @@
+<html><head></head><body><div style="height: 100%;width: 100%;background-color: <%= @result%>;"></div></body></html>
diff --git a/lib/tasks/parallel-tasks.rb b/lib/tasks/parallel-tasks.rb
index 3e4a920..0bcaf44 100644
--- a/lib/tasks/parallel-tasks.rb
+++ b/lib/tasks/parallel-tasks.rb
@@ -38,6 +38,13 @@ def get_thread_count
       ENV['THREAD_COUNT'] ? ENV['THREAD_COUNT'].to_i : 2
     end
 
+    def write_confluence_report(passfail)
+      require "erb"
+      template = File.read(File.dirname(__FILE__) + '/confluence.erb')
+      @result = passfail == 'pass' ? 'green' : 'red'
+      File.open('reports/confluence.html', 'w+').puts ERB.new(template).result(binding)
+    end
+
     desc 'Run all examples'
     RSpec::Core::RakeTask.new(:spec) do |t|
       t.rspec_opts = %w(--color -fprogress -fhtml -oreports/rspec.html)
@@ -77,8 +84,10 @@ def get_thread_count
       selenium_successful = run_rake_task('parallel_cuke')
       rerun_successful = true
       rerun_successful = run_rake_task('rerun_browserstack') unless selenium_successful
-      puts "result is #{selenium_successful} and  #{rerun_successful}"
-      fail 'Cucumber Failure' unless selenium_successful || rerun_successful
+      result = (selenium_successful || rerun_sucessful) == true ? 'pass' : 'fail'
+      puts "Overall result is #{result}"
+      write_confluence_report(result)
+      fail 'Cucumber Failure' if result == 'fail'
     end
 
     desc 'Remove all files from the ./reports and ./doc directory'

From 74825a9a64af1fcdc7e120311a33b86ba300e6e4 Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Wed, 20 Jan 2016 10:47:14 +0000
Subject: [PATCH 22/62] fix typo

---
 lib/tasks/parallel-tasks.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/parallel-tasks.rb b/lib/tasks/parallel-tasks.rb
index 0bcaf44..3c6b499 100644
--- a/lib/tasks/parallel-tasks.rb
+++ b/lib/tasks/parallel-tasks.rb
@@ -84,7 +84,7 @@ def write_confluence_report(passfail)
       selenium_successful = run_rake_task('parallel_cuke')
       rerun_successful = true
       rerun_successful = run_rake_task('rerun_browserstack') unless selenium_successful
-      result = (selenium_successful || rerun_sucessful) == true ? 'pass' : 'fail'
+      result = (selenium_successful || rerun_successful) == true ? 'pass' : 'fail'
       puts "Overall result is #{result}"
       write_confluence_report(result)
       fail 'Cucumber Failure' if result == 'fail'

From 78d933761796a67c4bfed2c210b7e3bdef67dc9d Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Wed, 20 Jan 2016 12:47:21 +0000
Subject: [PATCH 23/62] don't concern ourselves with hidden elements

---
 lib/frameworks/capybara.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index 1a9483c..6881005 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -61,7 +61,6 @@ def initialize
     selenium_remote_opts[:browser_name] = selenium_remote_opts[:browser_name].intern if selenium_remote_opts[:browser_name]#update :browser value to be a symbol, required for Selenium
 
     Capybara.run_server = false #Disable rack server
-    Capybara.ignore_hidden_elements = false
 
     [capybara_opts, selenium_remote_opts, custom_opts].each do |opts| #delete nil options and environment (which is only used for validation)
 

From 36a183c8bfda8c030d7657e8cd58886f32a5d9b5 Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Mon, 1 Feb 2016 12:53:21 +0000
Subject: [PATCH 24/62] don't autoload monkey patches

---
 lib/frameworks/capybara.rb                                   | 5 ++---
 lib/{ => frameworks}/extensions/capybara-extensions.rb       | 0
 .../extensions/capybara-mechanize-extensions.rb              | 0
 lib/{ => frameworks}/extensions/patches.rb                   | 0
 4 files changed, 2 insertions(+), 3 deletions(-)
 rename lib/{ => frameworks}/extensions/capybara-extensions.rb (100%)
 rename lib/{ => frameworks}/extensions/capybara-mechanize-extensions.rb (100%)
 rename lib/{ => frameworks}/extensions/patches.rb (100%)

diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index 6881005..52536c3 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -3,9 +3,8 @@
 require 'capybara/mechanize'
 require 'capybara/poltergeist'
 require 'selenium-webdriver'
-require 'extensions/capybara-extensions'
-require 'extensions/capybara-mechanize-extensions'
-require 'extensions/patches'
+require 'frameworks/extensions/capybara-extensions'
+require 'frameworks/extensions/capybara-mechanize-extensions'
 
 class CapybaraSetup
 
diff --git a/lib/extensions/capybara-extensions.rb b/lib/frameworks/extensions/capybara-extensions.rb
similarity index 100%
rename from lib/extensions/capybara-extensions.rb
rename to lib/frameworks/extensions/capybara-extensions.rb
diff --git a/lib/extensions/capybara-mechanize-extensions.rb b/lib/frameworks/extensions/capybara-mechanize-extensions.rb
similarity index 100%
rename from lib/extensions/capybara-mechanize-extensions.rb
rename to lib/frameworks/extensions/capybara-mechanize-extensions.rb
diff --git a/lib/extensions/patches.rb b/lib/frameworks/extensions/patches.rb
similarity index 100%
rename from lib/extensions/patches.rb
rename to lib/frameworks/extensions/patches.rb

From 1154f117bfede095553e2a753c5693f7fbd74c6b Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Fri, 5 Feb 2016 10:49:33 +0000
Subject: [PATCH 25/62] updates to allow user specified bundler exec and also
 support client certs with poltergeist

---
 lib/frameworks/capybara.rb  |  4 +++-
 lib/tasks/parallel-tasks.rb | 16 ++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index 52536c3..e302e58 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -233,7 +233,8 @@ def register_poltergeist_driver(opts)
     app = Proc.new do |env|
       ['200', {'Content-Type' => 'text/html'}, ['A barebones rack app.']]
     end
-    phantom_opts = %w(--ssl-protocol=tlsv1 --ignore-ssl-errors=yes)
+    phantom_opts = %w(--ignore-ssl-errors=true)
+    phantom_opts.push "--ssl-client-certificate-file=#{ENV['FW_CERT_LOCATION']}" if ENV['FW_CERT_LOCATION']
     phantom_opts.push "--proxy=#{@proxy_host}:#{@proxy_port}" if @proxy_host && @proxy_port
     Capybara.app = app
     Capybara.run_server = false
@@ -244,6 +245,7 @@ def register_poltergeist_driver(opts)
       phantomjs_options: phantom_opts,
       default_wait_time: 30
     }
+    options[:phantomjs] = ENV['PHANTOMJS_PATH'] if ENV['PHANTOMJS_PATH'] && !ENV['PHANTOMJS_PATH'].empty?
     Capybara.register_driver :poltergeist do |app|
       Capybara.app_host = "http://www.bbc.co.uk"
       Capybara::Poltergeist::Driver.new(app, options)
diff --git a/lib/tasks/parallel-tasks.rb b/lib/tasks/parallel-tasks.rb
index 3c6b499..6ca3bad 100644
--- a/lib/tasks/parallel-tasks.rb
+++ b/lib/tasks/parallel-tasks.rb
@@ -26,6 +26,10 @@ def reports(name)
       "--out=reports/#{name}.html --format json --out=reports/#{name}.json"
     end
 
+    def bundle_exec
+      ENV['BUNDLE_EXEC'] || 'bundle'
+    end
+
     def env
       ENV['ENVIRONMENT'] ? "ENVIRONMENT=#{ENV['ENVIRONMENT']}" : 'ENVIRONMENT=live'
     end
@@ -71,19 +75,19 @@ def write_confluence_report(passfail)
 
     desc 'Run cukes on production in parallel with browserstack chrome'
     task :parallel_cuke do |t|
-      sh "bundle exec parallel_cucumber -n #{get_thread_count} -o '#{tags} #{env}' features"
+      sh "#{bundle_exec} exec parallel_cucumber -n #{get_thread_count} -o '#{tags} #{env}' features"
     end
 
     desc 'Rerun failed cukes on production with browserstack chrome'
-    Cucumber::Rake::Task.new(:rerun_browserstack) do |t|
-      t.cucumber_opts = %W(-p browserstack #{env} @reports/rerun.txt #{reports('rerun')})
+    Cucumber::Rake::Task.new(:rerun) do |t|
+      t.cucumber_opts = %W(-p rerun #{env} @reports/rerun.txt #{reports('rerun')})
     end
 
     desc 'Run selenium and rerun failed tests'
     task :tests_with_retry do
       selenium_successful = run_rake_task('parallel_cuke')
       rerun_successful = true
-      rerun_successful = run_rake_task('rerun_browserstack') unless selenium_successful
+      rerun_successful = run_rake_task('rerun') unless selenium_successful
       result = (selenium_successful || rerun_successful) == true ? 'pass' : 'fail'
       puts "Overall result is #{result}"
       write_confluence_report(result)
@@ -109,7 +113,7 @@ def write_confluence_report(passfail)
         thread_reports = Dir.entries "#{junit_dir}#{thread}"
         thread_reports.reject { |f| File.directory?(f) }.each do |report|
           if  original_reports.include?(report)
-            sh "junit_merge #{junit_dir}#{thread}/#{report} #{junit_dir}/#{report}"
+            sh "#{bundle_exec} exec junit_merge #{junit_dir}#{thread}/#{report} #{junit_dir}/#{report}"
           else
             puts  "copy #{junit_dir}#{thread}/#{report} to #{junit_dir}"
             FileUtils.cp  "#{junit_dir}#{thread}/#{report}", junit_dir
@@ -117,7 +121,7 @@ def write_confluence_report(passfail)
         end
       end
       junit_rerun = Dir.glob "#{report_dir}/junit_rerun/*xml"
-      sh "junit_merge #{report_dir}/junit_rerun #{junit_dir}" unless junit_rerun.empty?
+      sh "#{bundle_exec} exec junit_merge #{report_dir}/junit_rerun #{junit_dir}" unless junit_rerun.empty?
     end
 
     desc 'Merge Cucumber JSON reports'

From d924fca9631796571588e4d754c7976c3b092f60 Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Tue, 1 Mar 2016 16:47:09 +0000
Subject: [PATCH 26/62] add ability to configure features directory when
 running parallel tests

---
 lib/tasks/parallel-tasks.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/parallel-tasks.rb b/lib/tasks/parallel-tasks.rb
index 6ca3bad..5f4da6a 100644
--- a/lib/tasks/parallel-tasks.rb
+++ b/lib/tasks/parallel-tasks.rb
@@ -38,6 +38,10 @@ def tags
       ENV['TAGS'] || ''
     end
 
+    def features_dir
+      ENV['FEATURES_DIR'] || 'features'
+    end
+
     def get_thread_count
       ENV['THREAD_COUNT'] ? ENV['THREAD_COUNT'].to_i : 2
     end
@@ -75,7 +79,7 @@ def write_confluence_report(passfail)
 
     desc 'Run cukes on production in parallel with browserstack chrome'
     task :parallel_cuke do |t|
-      sh "#{bundle_exec} exec parallel_cucumber -n #{get_thread_count} -o '#{tags} #{env}' features"
+      sh "#{bundle_exec} exec parallel_cucumber -n #{get_thread_count} -o '#{tags} #{env}' #{features_dir}"
     end
 
     desc 'Rerun failed cukes on production with browserstack chrome'

From e196f8661ef2deb45e3bb7a46c1d304966fdd937 Mon Sep 17 00:00:00 2001
From: ankitjain0105 <ankit.jain.ext@bbc.co.uk>
Date: Wed, 2 Mar 2016 16:57:33 +0000
Subject: [PATCH 27/62] Added code for closing Music Banner

---
 lib/frameworks/extensions/patches.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/frameworks/extensions/patches.rb b/lib/frameworks/extensions/patches.rb
index 550a916..901ecf5 100644
--- a/lib/frameworks/extensions/patches.rb
+++ b/lib/frameworks/extensions/patches.rb
@@ -14,6 +14,7 @@ def visit(url)
       return if [:mechanize, :poltergeist].include?(Capybara.current_driver)
       surpress_cookies_prompt
       reload_if_survey_appears
+      close_music_banner
     end
 
     def surpress_cookies_prompt
@@ -31,5 +32,10 @@ def reload_if_survey_appears
       end
       visit current_url if reload
     end
+
+    def close_music_banner
+      close_banner_button = '#mn-prompt--where-is-playlister button'
+      find(close_banner_button).click if has_selector?(close_banner_button, wait: 1)
+    end
   end
 end

From 85db32f27bb0ed7c13dd525529b0b9c6540b3525 Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Thu, 24 Mar 2016 11:41:46 +0000
Subject: [PATCH 28/62] allow bundle exec override to be more flexible

---
 lib/tasks/parallel-tasks.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/tasks/parallel-tasks.rb b/lib/tasks/parallel-tasks.rb
index 5f4da6a..a0f2272 100644
--- a/lib/tasks/parallel-tasks.rb
+++ b/lib/tasks/parallel-tasks.rb
@@ -27,7 +27,7 @@ def reports(name)
     end
 
     def bundle_exec
-      ENV['BUNDLE_EXEC'] || 'bundle'
+      ENV['BUNDLE_EXEC'] || 'bundle exec '
     end
 
     def env
@@ -79,12 +79,12 @@ def write_confluence_report(passfail)
 
     desc 'Run cukes on production in parallel with browserstack chrome'
     task :parallel_cuke do |t|
-      sh "#{bundle_exec} exec parallel_cucumber -n #{get_thread_count} -o '#{tags} #{env}' #{features_dir}"
+      sh "#{bundle_exec}parallel_cucumber -n #{get_thread_count} -o '#{tags} #{env}' #{features_dir}"
     end
 
     desc 'Rerun failed cukes on production with browserstack chrome'
-    Cucumber::Rake::Task.new(:rerun) do |t|
-      t.cucumber_opts = %W(-p rerun #{env} @reports/rerun.txt #{reports('rerun')})
+    task :rerun do
+      sh "#{bundle_exec}cucumber -p rerun #{env} @reports/rerun.txt #{reports('rerun')}"
     end
 
     desc 'Run selenium and rerun failed tests'
@@ -117,7 +117,7 @@ def write_confluence_report(passfail)
         thread_reports = Dir.entries "#{junit_dir}#{thread}"
         thread_reports.reject { |f| File.directory?(f) }.each do |report|
           if  original_reports.include?(report)
-            sh "#{bundle_exec} exec junit_merge #{junit_dir}#{thread}/#{report} #{junit_dir}/#{report}"
+            sh "#{bundle_exec}junit_merge #{junit_dir}#{thread}/#{report} #{junit_dir}/#{report}"
           else
             puts  "copy #{junit_dir}#{thread}/#{report} to #{junit_dir}"
             FileUtils.cp  "#{junit_dir}#{thread}/#{report}", junit_dir
@@ -125,7 +125,7 @@ def write_confluence_report(passfail)
         end
       end
       junit_rerun = Dir.glob "#{report_dir}/junit_rerun/*xml"
-      sh "#{bundle_exec} exec junit_merge #{report_dir}/junit_rerun #{junit_dir}" unless junit_rerun.empty?
+      sh "#{bundle_exec}junit_merge #{report_dir}/junit_rerun #{junit_dir}" unless junit_rerun.empty?
     end
 
     desc 'Merge Cucumber JSON reports'

From 6ccd717686cf870e84df05a17b3777163f419ecd Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Fri, 8 Apr 2016 11:16:25 +0100
Subject: [PATCH 29/62] change in colour for static html red/green result -
 requested by swati

---
 lib/tasks/parallel-tasks.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/parallel-tasks.rb b/lib/tasks/parallel-tasks.rb
index a0f2272..a237667 100644
--- a/lib/tasks/parallel-tasks.rb
+++ b/lib/tasks/parallel-tasks.rb
@@ -48,8 +48,10 @@ def get_thread_count
 
     def write_confluence_report(passfail)
       require "erb"
+      green = '#4CD672'
+      red = '#EA4D61'
       template = File.read(File.dirname(__FILE__) + '/confluence.erb')
-      @result = passfail == 'pass' ? 'green' : 'red'
+      @result = passfail == 'pass' ? green : red
       File.open('reports/confluence.html', 'w+').puts ERB.new(template).result(binding)
     end
 

From b92f738aeb180e88785a222f04e315ab89dba918 Mon Sep 17 00:00:00 2001
From: Ankit Jain <ankit.jain.ext@bbc.co.uk>
Date: Fri, 8 Apr 2016 17:16:50 +0100
Subject: [PATCH 30/62] Commenting survey pop up

Commenting survey pop up due to an issue
---
 lib/frameworks/extensions/patches.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/frameworks/extensions/patches.rb b/lib/frameworks/extensions/patches.rb
index 901ecf5..38544a6 100644
--- a/lib/frameworks/extensions/patches.rb
+++ b/lib/frameworks/extensions/patches.rb
@@ -13,7 +13,7 @@ def visit(url)
       old_visit url
       return if [:mechanize, :poltergeist].include?(Capybara.current_driver)
       surpress_cookies_prompt
-      reload_if_survey_appears
+      #reload_if_survey_appears
       close_music_banner
     end
 

From 06377de51e0cd5f4ab233457073a17d5de736fb9 Mon Sep 17 00:00:00 2001
From: Matthew Robbins <matthew.robbins.ext@bbc.co.uk>
Date: Wed, 18 May 2016 14:19:28 +0100
Subject: [PATCH 31/62] don't set app host for mechanize

---
 lib/frameworks/capybara.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index e302e58..3deae83 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -221,7 +221,6 @@ def register_mechanize_driver(opts)
     Capybara.app = app
     Capybara.run_server = false
     Capybara.register_driver :mechanize do |app|
-      Capybara.app_host = "http://www.bbc.co.uk"
       Capybara::Mechanize::Driver.new(app)
     end
     :mechanize

From 7486679efad14b0f6054fbff83a12429590b45fd Mon Sep 17 00:00:00 2001
From: ankitjain0105 <ankit.jain.ext@bbc.co.uk>
Date: Fri, 10 Jun 2016 12:12:55 +0100
Subject: [PATCH 32/62] Making changes as per ruby 2.3.0

---
 lib/frameworks/capybara.rb | 3 ++-
 lib/frameworks/wait.rb     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index 3deae83..00ef3f3 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -240,8 +240,9 @@ def register_poltergeist_driver(opts)
     options = {
       js_errors: false,
       timeout:   120,
-      window_size: [1200, 1000],
+      window_size: [1920, 5000],
       phantomjs_options: phantom_opts,
+      js: true,
       default_wait_time: 30
     }
     options[:phantomjs] = ENV['PHANTOMJS_PATH'] if ENV['PHANTOMJS_PATH'] && !ENV['PHANTOMJS_PATH'].empty?
diff --git a/lib/frameworks/wait.rb b/lib/frameworks/wait.rb
index f1ce191..ae1817f 100644
--- a/lib/frameworks/wait.rb
+++ b/lib/frameworks/wait.rb
@@ -55,7 +55,7 @@ def wait_for_no_exception(exception_message, exception, timeout = Capybara.defau
             end
           end
         end
-      rescue TimeoutError
+      rescue Timeout::Error
         puts '********************************************************************'
         puts "Timed out after waiting for #{timeout} seconds."
         puts exception_message

From b50ee2d2fc6c1e9021d4a856d8f1b70861d4823b Mon Sep 17 00:00:00 2001
From: ankitjain0105 <ankit.jain.ext@bbc.co.uk>
Date: Fri, 10 Jun 2016 12:16:15 +0100
Subject: [PATCH 33/62] Added size changes and timout changes

---
 lib/frameworks/capybara.rb | 3 ++-
 lib/frameworks/wait.rb     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index 3deae83..919f1a2 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -239,8 +239,9 @@ def register_poltergeist_driver(opts)
     Capybara.run_server = false
     options = {
       js_errors: false,
+      js: true,
       timeout:   120,
-      window_size: [1200, 1000],
+      window_size: [1900, 5000],
       phantomjs_options: phantom_opts,
       default_wait_time: 30
     }
diff --git a/lib/frameworks/wait.rb b/lib/frameworks/wait.rb
index f1ce191..ae1817f 100644
--- a/lib/frameworks/wait.rb
+++ b/lib/frameworks/wait.rb
@@ -55,7 +55,7 @@ def wait_for_no_exception(exception_message, exception, timeout = Capybara.defau
             end
           end
         end
-      rescue TimeoutError
+      rescue Timeout::Error
         puts '********************************************************************'
         puts "Timed out after waiting for #{timeout} seconds."
         puts exception_message

From 906cc4a7f70176a4830f0d45f38450ef4ca03bad Mon Sep 17 00:00:00 2001
From: ankitjain0105 <ankit.jain.ext@bbc.co.uk>
Date: Fri, 10 Jun 2016 16:05:36 +0100
Subject: [PATCH 34/62] reverted the size changes

---
 lib/frameworks/capybara.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index 919f1a2..3deae83 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -239,9 +239,8 @@ def register_poltergeist_driver(opts)
     Capybara.run_server = false
     options = {
       js_errors: false,
-      js: true,
       timeout:   120,
-      window_size: [1900, 5000],
+      window_size: [1200, 1000],
       phantomjs_options: phantom_opts,
       default_wait_time: 30
     }

From 2fee09cbb382573111efbb4116b6ed05943962ca Mon Sep 17 00:00:00 2001
From: ankitjain0105 <ankit.jain.ext@bbc.co.uk>
Date: Thu, 16 Jun 2016 12:09:00 +0100
Subject: [PATCH 35/62] Added survey pop up code again

---
 lib/frameworks/extensions/patches.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/frameworks/extensions/patches.rb b/lib/frameworks/extensions/patches.rb
index 38544a6..901ecf5 100644
--- a/lib/frameworks/extensions/patches.rb
+++ b/lib/frameworks/extensions/patches.rb
@@ -13,7 +13,7 @@ def visit(url)
       old_visit url
       return if [:mechanize, :poltergeist].include?(Capybara.current_driver)
       surpress_cookies_prompt
-      #reload_if_survey_appears
+      reload_if_survey_appears
       close_music_banner
     end
 

From aabe4b53745871319a6d8c8ba2f667c13c934e25 Mon Sep 17 00:00:00 2001
From: Ankit Jain <ankit.jain.ext@bbc.co.uk>
Date: Fri, 17 Jun 2016 11:30:53 +0100
Subject: [PATCH 36/62] Commenting survey pop up code again

Commenting survey pop up code again due to browserstack failures
---
 lib/frameworks/extensions/patches.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/frameworks/extensions/patches.rb b/lib/frameworks/extensions/patches.rb
index 901ecf5..38544a6 100644
--- a/lib/frameworks/extensions/patches.rb
+++ b/lib/frameworks/extensions/patches.rb
@@ -13,7 +13,7 @@ def visit(url)
       old_visit url
       return if [:mechanize, :poltergeist].include?(Capybara.current_driver)
       surpress_cookies_prompt
-      reload_if_survey_appears
+      #reload_if_survey_appears
       close_music_banner
     end
 

From 18a91d17d6672db63c99f5410ab796d687d113b0 Mon Sep 17 00:00:00 2001
From: ankitjain0105 <ankit.jain.ext@bbc.co.uk>
Date: Tue, 6 Sep 2016 12:51:31 +0100
Subject: [PATCH 37/62] Changing live condition

---
 lib/frameworks/cucumber.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/frameworks/cucumber.rb b/lib/frameworks/cucumber.rb
index 915d125..c4e16bd 100644
--- a/lib/frameworks/cucumber.rb
+++ b/lib/frameworks/cucumber.rb
@@ -24,7 +24,7 @@ def generate_base_urls
         @static_base_url = @static_sandbox6 + @bbc_domain
         @mobile_base_url = @mobiledot_prefix + "sandbox" + @bbc_domain
         @m_base_url = @mdot_prefix + "sandbox" + @bbc_domain
-      elsif (environment =='live' && ENV['WWW_LIVE']=='false')
+      elsif environment == 'live'
         @base_url = @www_prefix.chop + @bbc_domain
         @pal_base_url = @pal_prefix + environment + @bbc_domain
         @ssl_base_url = @ssl_prefix.chop + @bbc_domain

From 47db27036a8e5b620fd35c401923780c773e455a Mon Sep 17 00:00:00 2001
From: ankitjain0105 <ankit.jain.ext@bbc.co.uk>
Date: Tue, 6 Sep 2016 12:56:55 +0100
Subject: [PATCH 38/62] Changing live condition

---
 lib/frameworks/capybara.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index 00ef3f3..3deae83 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -240,9 +240,8 @@ def register_poltergeist_driver(opts)
     options = {
       js_errors: false,
       timeout:   120,
-      window_size: [1920, 5000],
+      window_size: [1200, 1000],
       phantomjs_options: phantom_opts,
-      js: true,
       default_wait_time: 30
     }
     options[:phantomjs] = ENV['PHANTOMJS_PATH'] if ENV['PHANTOMJS_PATH'] && !ENV['PHANTOMJS_PATH'].empty?

From 9c1fe738e6935fa941c7eeea3cd25cacd7ca3e75 Mon Sep 17 00:00:00 2001
From: Swati <swati.tabib.ext@bbc.co.uk>
Date: Tue, 6 Dec 2016 14:51:02 +0000
Subject: [PATCH 39/62] update

---
 lib/frameworks/cucumber.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/frameworks/cucumber.rb b/lib/frameworks/cucumber.rb
index c4e16bd..4b955da 100644
--- a/lib/frameworks/cucumber.rb
+++ b/lib/frameworks/cucumber.rb
@@ -5,6 +5,7 @@ module Frameworks
   module EnvHelper
     include W3CValidators
     #Generate base urls to use in Cucumber step defs
+    #Generate base urls to use in Cucumber step defs
     def generate_base_urls 
       environment = ENV['ENVIRONMENT'].downcase #be defensive
 

From 5b37b64db67bb47e35252f49c811db3b6dab9f6f Mon Sep 17 00:00:00 2001
From: Swati <swati.tabib.ext@bbc.co.uk>
Date: Tue, 6 Dec 2016 14:51:22 +0000
Subject: [PATCH 40/62] Update

---
 lib/frameworks/cucumber.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/frameworks/cucumber.rb b/lib/frameworks/cucumber.rb
index 4b955da..c4e16bd 100644
--- a/lib/frameworks/cucumber.rb
+++ b/lib/frameworks/cucumber.rb
@@ -5,7 +5,6 @@ module Frameworks
   module EnvHelper
     include W3CValidators
     #Generate base urls to use in Cucumber step defs
-    #Generate base urls to use in Cucumber step defs
     def generate_base_urls 
       environment = ENV['ENVIRONMENT'].downcase #be defensive
 

From 5f64a1b1f611c642772605aaef4aad08d91ca029 Mon Sep 17 00:00:00 2001
From: Swati Tabib <tabibs01@mc-s080764.local>
Date: Mon, 3 Jul 2017 17:32:29 +0100
Subject: [PATCH 41/62] rubocop fixes

---
 .rubocop.yml                                  |  14 ++
 README.rdoc                                   |   4 +-
 lib/frameworks/capybara.rb                    | 187 ++++++++++--------
 lib/frameworks/cucumber.rb                    |  96 +++++----
 .../extensions/capybara-extensions.rb         |  69 -------
 .../capybara-mechanize-extensions.rb          |  70 -------
 lib/frameworks/extensions/patches.rb          |  14 +-
 7 files changed, 168 insertions(+), 286 deletions(-)
 create mode 100644 .rubocop.yml
 delete mode 100644 lib/frameworks/extensions/capybara-extensions.rb
 delete mode 100644 lib/frameworks/extensions/capybara-mechanize-extensions.rb

diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 0000000..08750bd
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,14 @@
+Metrics/LineLength:
+  Max: 150
+
+Metrics/AbcSize:
+  Max: 21
+
+Metrics/MethodLength:
+  Max: 25
+
+Metrics/ClassLength:
+  Max: 250
+
+Metrics/CyclomaticComplexity:
+  Max: 10
\ No newline at end of file
diff --git a/README.rdoc b/README.rdoc
index ce677d1..a0ef305 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -10,10 +10,10 @@ The principle behind this gem is to factor out all the common setup code for reg
 
 Below are the current drivers that can be registered:
 
-* Selenium-Webdriver (Selenium2) - LOCAL: This can be used to drive 'in-browser' tests runnong on your local machine in IE, Firefox and Chrome (and any other browsers as and when they are added into the Selenium-Webdriver project)
+* Selenium-Webdriver (Selenium2) - LOCAL: This can be used to drive 'in-browser' tests running on your local machine in IE, Firefox and Chrome (and any other browsers as and when they are added into the Selenium-Webdriver project)
 
 
-* Selenium-Webdriver (Selenium2) - REMOTE: This can be used to drive 'in-browser' tests on a remote macine, this could be another macine on your local network which is running a Selenium-Webdriver server or indeed a cloud service such as 'Sauce Labs'
+* Selenium-Webdriver (Selenium2) - REMOTE: This can be used to drive 'in-browser' tests on a remote machine, this could be another machine on your local network which is running a Selenium-Webdriver server or indeed a cloud service such as 'Sauce Labs'
 
 * Mechanize-Caybara: This can be used, by setting BROWSER=mechanize
 
diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index 3deae83..29fa108 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -3,77 +3,82 @@
 require 'capybara/mechanize'
 require 'capybara/poltergeist'
 require 'selenium-webdriver'
-require 'frameworks/extensions/capybara-extensions'
-require 'frameworks/extensions/capybara-mechanize-extensions'
 
+# Register drivers
 class CapybaraSetup
-
   attr_reader :driver
 
   def initialize
-
     http_proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
     browser_cli_args = ENV['BROWSER_CLI_ARGS'].split(/\s+/).compact if ENV['BROWSER_CLI_ARGS']
 
-    capybara_opts = {:environment => ENV['ENVIRONMENT'],
-      :http_proxy => http_proxy,
-      :profile => ENV['FIREFOX_PROFILE'],
-      :browser => ENV['BROWSER'],
-      :webdriver_proxy_on => ENV['PROXY_ON'],
-      :url => ENV['REMOTE_URL'],
-      :chrome_switches => ENV['CHROME_SWITCHES'],
-      :firefox_prefs => ENV['FIREFOX_PREFS'],
-      :args => browser_cli_args
+    capybara_opts = {
+      environment: ENV['ENVIRONMENT'],
+      http_proxy: http_proxy,
+      profile: ENV['FIREFOX_PROFILE'],
+      browser: ENV['BROWSER'],
+      webdriver_proxy_on: ENV['PROXY_ON'],
+      url: ENV['REMOTE_URL'],
+      chrome_switches: ENV['CHROME_SWITCHES'],
+      firefox_prefs: ENV['FIREFOX_PREFS'],
+      args: browser_cli_args
     }
 
-    selenium_remote_opts = {:os => ENV['PLATFORM'],
-      :os_version => ENV['PLATFORM_VERSION'],
-      :browser_name => ENV['REMOTE_BROWSER'],
-      :browser_version => ENV['REMOTE_BROWSER_VERSION'],
-      :url => ENV['REMOTE_URL']
+    selenium_remote_opts = {
+      os: ENV['PLATFORM'],
+      os_version: ENV['PLATFORM_VERSION'],
+      browser_name: ENV['REMOTE_BROWSER'],
+      browser_version: ENV['REMOTE_BROWSER_VERSION'],
+      url: ENV['REMOTE_URL']
     }
 
-    custom_opts = {:job_name => ENV['SAUCE_JOB_NAME'],
-      :max_duration => ENV['SAUCE_MAX_DURATION'],
-      :firefox_cert_path => ENV['FIREFOX_CERT_PATH'],
-      :firefox_cert_prefix => ENV['FIREFOX_CERT_PREFIX'],
-      :browserstack_build => ENV['BS_BUILD'],
-      :browserstack_debug => ENV['BS_DEBUG'] || 'true', # BrowserStack debug mode on by default
-      :browserstack_device => ENV['BS_DEVICE'],
-      :browserstack_device_orientation => ENV['BS_DEVICE_ORIENTATION'],
-      :browserstack_project => ENV['BS_PROJECT'],
-      :browserstack_resolution => ENV['BS_RESOLUTION'],
-      :appium_platform => ENV['APPIUM_PLATFORM'],
-      :appium_device => ENV['APPIUM_DEVICE'],
-      :appium_browser => ENV['APPIUM_BROWSER'],
-      :appium_udid => ENV['APPIUM_UDID']
+    custom_opts = {
+      job_name: ENV['SAUCE_JOB_NAME'],
+      max_duration: ENV['SAUCE_MAX_DURATION'],
+      firefox_cert_path: ENV['FIREFOX_CERT_PATH'],
+      firefox_cert_prefix: ENV['FIREFOX_CERT_PREFIX'],
+      browserstack_build: ENV['BS_BUILD'],
+      browserstack_debug: ENV['BS_DEBUG'] || 'true', # BrowserStack debug mode on by default
+      browserstack_device: ENV['BS_DEVICE'],
+      browserstack_device_orientation: ENV['BS_DEVICE_ORIENTATION'],
+      browserstack_project: ENV['BS_PROJECT'],
+      browserstack_resolution: ENV['BS_RESOLUTION'],
+      appium_platform: ENV['APPIUM_PLATFORM'],
+      appium_device: ENV['APPIUM_DEVICE'],
+      appium_browser: ENV['APPIUM_BROWSER'],
+      appium_udid: ENV['APPIUM_UDID']
     }
+    # validate environment variables set using cucumber.yml or passed via command line
+    validate_env_vars(capybara_opts.merge(selenium_remote_opts), custom_opts)
 
-    validate_env_vars(capybara_opts.merge(selenium_remote_opts), custom_opts) #validate environment variables set using cucumber.yml or passed via command line
-
-    if(capybara_opts[:http_proxy])
+    if capybara_opts[:http_proxy]
       proxy_uri = URI(capybara_opts[:http_proxy])
       @proxy_host = proxy_uri.host
       @proxy_port = proxy_uri.port
     end
-    capybara_opts[:browser] = capybara_opts[:browser].intern #update :browser value to be a symbol, required for Selenium
-    selenium_remote_opts[:browser_name] = selenium_remote_opts[:browser_name].intern if selenium_remote_opts[:browser_name]#update :browser value to be a symbol, required for Selenium
-
-    Capybara.run_server = false #Disable rack server
-
-    [capybara_opts, selenium_remote_opts, custom_opts].each do |opts| #delete nil options and environment (which is only used for validation)
-
-      opts.delete_if {|k,v| (v.nil? or k == :environment)}
+    # update :browser value to be a symbol, required for Selenium
+    capybara_opts[:browser] = capybara_opts[:browser].intern
+    # update :browser value to be a symbol, required for Selenium
+    selenium_remote_opts[:browser_name] = selenium_remote_opts[:browser_name].intern if selenium_remote_opts[:browser_name]
+
+    Capybara.run_server = false # Disable rack server
+    
+    # delete nil options and environment (which is only used for validation)
+    [capybara_opts, selenium_remote_opts, custom_opts].each do |opts|
+      opts.delete_if { |k, v| (v.nil? || k == :environment) }
     end
 
     # always register in case we are using a configuration that swaps between drivers
     mech_driver = register_mechanize_driver(capybara_opts)
     poltergeist_driver = register_poltergeist_driver(capybara_opts)
+    headless_chromium_driver = register_headless_chromium_driver(capybara_opts)
     case capybara_opts[:browser]
     when :mechanize then
       @driver = mech_driver
     when :poltergeist then
       @driver = poltergeist_driver
+    when :headless_chromium then
+      @driver = headless_chromium_driver
     else
       @driver = register_selenium_driver(capybara_opts, selenium_remote_opts, custom_opts)
     end
@@ -87,12 +92,12 @@ def validate_env_vars(opts, custom_opts)
     msg1 = 'Please ensure following environment variables are set ENVIRONMENT [int|test|stage|live], BROWSER[headless|ie|chrome|firefox] and HTTP_PROXY (if required)'
     msg2 = 'Please ensure the following environment variables are set PLATFORM, REMOTE_URL, REMOTE_BROWSER (browser to use on remote machine), HTTP_PROXY (if required), REMOTE_BROWSER_PROXY (if required) and BROWSER_VERSION (if required)'
 
-    [:environment, :browser].each { |item| !opts.has_key?(item) or opts[item]==nil ? raise(msg1) : '' }
+    [:environment, :browser].each { |item| !opts.has_key?(item) || opts[item] == nil ? raise(msg1) : '' }
 
     if custom_opts[:appium_platform]
-      [:url].each { |item| !opts.has_key?(item) or opts[item]==nil ? raise(msg2) : '' }
-    elsif opts[:browser]=='remote'
-      [:url, :browser_name].each { |item| !opts.has_key?(item) or opts[item]==nil ? raise(msg2) : '' }
+      [:url].each { |item| !opts.has_key?(item) || opts[item] == nil ? raise(msg2) : '' }
+    elsif opts[:browser] == 'remote'
+      [:url, :browser_name].each { |item| !opts.has_key?(item) || opts[item] == nil ? raise(msg2) : '' }
     end
   end
 
@@ -102,11 +107,11 @@ def update_firefox_profile_with_certificates(profile, certificate_path, certific
 
     # Create links to the certificate files in the profile directory
     ['cert8.db', 'key3.db', 'secmod.db'].each do |cert_file|
-      source_file = "#{certificate_prefix}#{cert_file}"
+      source_file = '#{certificate_prefix}#{cert_file}'
       source_path = "#{certificate_path}" + File::SEPARATOR + source_file
       dest_path = profile_path + File::SEPARATOR + cert_file
-      if(! File.exist?(source_path))
-        raise "Firefox cert db file #{source_path} does not exist."
+      if !File.exist?(source_path)
+        raise 'Firefox cert db file #{source_path} does not exist.'
       end
       FileUtils.cp(source_path, dest_path)
     end
@@ -115,14 +120,13 @@ def update_firefox_profile_with_certificates(profile, certificate_path, certific
     profile = Selenium::WebDriver::Firefox::Profile.new(profile_path)
 
     # Avoid Firefox certificate alerts
-    profile["security.default_personal_cert"] = 'Select Automatically'
+    profile['security.default_personal_cert'] = 'Select Automatically'
 
-    return profile
+    # return profile
   end
 
-  def register_selenium_driver(opts,remote_opts,custom_opts)
+  def register_selenium_driver(opts, remote_opts, custom_opts)
     Capybara.register_driver :selenium do |app|
-
       if opts[:firefox_prefs] || opts[:profile]
         opts[:profile] = create_profile(opts[:profile], opts[:firefox_prefs])
 
@@ -131,7 +135,7 @@ def register_selenium_driver(opts,remote_opts,custom_opts)
         end
       end
 
-      opts[:switches] = [opts.delete(:chrome_switches)] if(opts[:chrome_switches])
+      opts[:switches] = [opts.delete(:chrome_switches)] if opts[:chrome_switches]
 
       if opts[:browser] == :remote
         client = Selenium::WebDriver::Remote::Http::Default.new
@@ -140,27 +144,25 @@ def register_selenium_driver(opts,remote_opts,custom_opts)
         remote_opts[:firefox_profile] = opts.delete :profile if opts[:profile]
         remote_opts['chrome.switches'] = opts.delete :switches if opts[:switches]
         caps = Selenium::WebDriver::Remote::Capabilities.new(remote_opts)
-
-        add_custom_caps(caps, custom_opts) if remote_opts[:url].include? 'saucelabs' #set sauce specific parameters - will this scupper other on sauce remote jobs?
-
-        add_browserstack_caps(caps, custom_opts) if remote_opts[:url].include? 'browserstack' #set browserstack specific parameters
-
-        add_appium_caps(caps, custom_opts) if custom_opts.keys.join.include?('appium')  #set appium specific parameters
+        # set sauce specific parameters - will this scupper other on sauce remote jobs?
+        add_custom_caps(caps, custom_opts) if remote_opts[:url].include? 'saucelabs'
+        # set browserstack specific parameters
+        add_browserstack_caps(caps, custom_opts) if remote_opts[:url].include? 'browserstack'
+        # set appium specific parameters
+        add_appium_caps(caps, custom_opts) if custom_opts.keys.join.include?('appium')
 
         opts[:desired_capabilities] = caps
         opts[:http_client] = client
       end
 
       clean_opts(opts, :http_proxy, :webdriver_proxy_on, :firefox_prefs)
-      Capybara::Selenium::Driver.new(app,opts)
+      Capybara::Selenium::Driver.new(app, opts)
     end
     :selenium
   end
 
   def add_custom_caps(caps, custom_opts)
-    sauce_time_limit = custom_opts.delete(:max_duration).to_i #note nil.to_i == 0
-    # This no longer works with the latest selenium-webdriver release
-    #caps.custom_capabilities({:'job-name' => (custom_opts[:job_name] or 'frameworks-unamed-job'), :'max-duration' => ((sauce_time_limit if sauce_time_limit != 0) or 1800)})
+    sauce_time_limit = custom_opts.delete(:max_duration).to_i # note nil.to_i == 0
   end
 
   def add_browserstack_caps(caps, custom_opts)
@@ -180,23 +182,24 @@ def add_appium_caps(caps, custom_opts)
   end
 
   def set_client_proxy(opts)
-    Selenium::WebDriver::Proxy.new(:http => opts[:http_proxy]) if opts[:http_proxy] && opts[:webdriver_proxy_on] != 'false' #set proxy on client connection if required, note you may use ENV['HTTP_PROXY'] for setting in browser (ff profile) but not for client conection, hence allow for PROXY_ON=false
+    # set proxy on client connection if required, note you may use ENV['HTTP_PROXY'] for setting in browser (ff profile) but not for client conection, hence allow for PROXY_ON=false
+    Selenium::WebDriver::Proxy.new(http: opts[:http_proxy]) if opts[:http_proxy] && opts[:webdriver_proxy_on] != 'false'
   end
 
   def create_profile(profile_name = nil, additional_prefs = nil)
     additional_prefs = JSON.parse(additional_prefs) if additional_prefs
-    if(additional_prefs && !profile_name)
+    if additional_prefs && !profile_name
       profile = Selenium::WebDriver::Firefox::Profile.new
       profile.native_events = true
-    elsif(profile_name == 'BBC_INTERNAL')
+    elsif profile_name == 'BBC_INTERNAL'
       profile = Selenium::WebDriver::Firefox::Profile.new
-      if(@proxy_host && @proxy_port)
-        profile["network.proxy.type"] = 1
-        profile["network.proxy.no_proxies_on"] = "*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk"
-        profile["network.proxy.http"] = @proxy_host
-        profile["network.proxy.ssl"] = @proxy_host
-        profile["network.proxy.http_port"] = @proxy_port
-        profile["network.proxy.ssl_port"] = @proxy_port
+      if @proxy_host && @proxy_port
+        profile['network.proxy.type'] = 1
+        profile['network.proxy.no_proxies_on'] = '*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk'
+        profile['network.proxy.http'] = @proxy_host
+        profile['network.proxy.ssl'] = @proxy_host
+        profile['network.proxy.http_port'] = @proxy_port
+        profile['network.proxy.ssl_port'] = @proxy_port
       end
       profile.native_events = true
     else
@@ -209,14 +212,13 @@ def create_profile(profile_name = nil, additional_prefs = nil)
         profile[k] = v
       end
     end
-
     profile
   end
 
-  def register_mechanize_driver(opts)
+  def register_mechanize_driver(_opts)
     # Mechanize needs a Rack application: create a dummy one
     app = Proc.new do |env|
-      ['200', {'Content-Type' => 'text/html'}, ['A barebones rack app.']]
+      ['200', { 'Content-Type' => 'text/html' }, ['A barebones rack app.']]
     end
     Capybara.app = app
     Capybara.run_server = false
@@ -226,13 +228,12 @@ def register_mechanize_driver(opts)
     :mechanize
   end
 
-
   def register_poltergeist_driver(opts)
-    ## Poltergiest needs a Rack application: create a dummy one
-    app = Proc.new do |env|
-      ['200', {'Content-Type' => 'text/html'}, ['A barebones rack app.']]
+    # Poltergiest needs a Rack application: create a dummy one
+    app = Proc.new do
+      ['200', { 'Content-Type' => 'text/html' }, ['A barebones rack app.']]
     end
-    phantom_opts = %w(--ignore-ssl-errors=true)
+    phantom_opts = %w[--ignore-ssl-errors=true]
     phantom_opts.push "--ssl-client-certificate-file=#{ENV['FW_CERT_LOCATION']}" if ENV['FW_CERT_LOCATION']
     phantom_opts.push "--proxy=#{@proxy_host}:#{@proxy_port}" if @proxy_host && @proxy_port
     Capybara.app = app
@@ -246,16 +247,32 @@ def register_poltergeist_driver(opts)
     }
     options[:phantomjs] = ENV['PHANTOMJS_PATH'] if ENV['PHANTOMJS_PATH'] && !ENV['PHANTOMJS_PATH'].empty?
     Capybara.register_driver :poltergeist do |app|
-      Capybara.app_host = "http://www.bbc.co.uk"
+      Capybara.app_host = 'http://www.bbc.co.uk'
       Capybara::Poltergeist::Driver.new(app, options)
     end
     :poltergeist
   end
 
+  def register_headless_chromium_driver(_opts)
+    app = Proc.new do
+      ['200', { 'Content-Type' => 'text/html' }, ['A barebones rack app.']]
+    end
+    Capybara.register_driver :headless_chromium do |app|
+      Capybara.app_host = 'http://www.bbc.co.uk'
+      caps = Selenium::WebDriver::Remote::Capabilities.chrome(
+        'chromeOptions' => {
+          'binary' => '/Users/tabibs01/Downloads/chrome-linux/chrome',
+          'args' => %w[headless no-sandbox disable-gpu]
+        }
+      )
+      Capybara::Selenium::Driver.new(app, browser: :chrome, desired_capabilities: caps)
+    end
+    :headless_chromium
+  end
+
   def clean_opts(opts, *args)
     args.each do |arg|
       opts.delete arg
     end
   end
-
 end
diff --git a/lib/frameworks/cucumber.rb b/lib/frameworks/cucumber.rb
index c4e16bd..1a61fc5 100644
--- a/lib/frameworks/cucumber.rb
+++ b/lib/frameworks/cucumber.rb
@@ -2,28 +2,29 @@
 require 'w3c_validators'
 
 module Frameworks
+  # Generate base urls to use in Cucumber step defs
   module EnvHelper
     include W3CValidators
-    #Generate base urls to use in Cucumber step defs
-    def generate_base_urls 
-      environment = ENV['ENVIRONMENT'].downcase #be defensive
+    # Generate base urls to use in Cucumber step defs
+    def generate_base_urls
+      environment = ENV['ENVIRONMENT'].downcase # be defensive
 
       prepare_host
 
-      if(environment =='sandbox')
-        @base_url = @sandbox + @bbc_domain 
-        @pal_base_url = @sandbox + @bbc_domain 
+      if environment == 'sandbox'
+        @base_url = @sandbox + @bbc_domain
+        @pal_base_url = @sandbox + @bbc_domain
         @ssl_base_url = @sslsandbox + @bbc_domain
         @static_base_url = @static_sandbox + @bbc_domain
-        @mobile_base_url = @mobiledot_prefix + "sandbox.dev" + @bbc_domain
-        @m_base_url = @mdot_prefix + "sandbox.dev" + @bbc_domain
-      elsif(environment =='sandbox6')
-        @base_url = @sandbox6 + @bbc_domain 
-        @pal_base_url = @sandbox6 + @bbc_domain 
+        @mobile_base_url = @mobiledot_prefix + 'sandbox.dev' + @bbc_domain
+        @m_base_url = @mdot_prefix + 'sandbox.dev' + @bbc_domain
+      elsif environment == 'sandbox6'
+        @base_url = @sandbox6 + @bbc_domain
+        @pal_base_url = @sandbox6 + @bbc_domain
         @ssl_base_url = @sslsandbox6 + @bbc_domain
         @static_base_url = @static_sandbox6 + @bbc_domain
-        @mobile_base_url = @mobiledot_prefix + "sandbox" + @bbc_domain
-        @m_base_url = @mdot_prefix + "sandbox" + @bbc_domain
+        @mobile_base_url = @mobiledot_prefix + 'sandbox' + @bbc_domain
+        @m_base_url = @mdot_prefix + 'sandbox' + @bbc_domain
       elsif environment == 'live'
         @base_url = @www_prefix.chop + @bbc_domain
         @pal_base_url = @pal_prefix + environment + @bbc_domain
@@ -43,48 +44,43 @@ def generate_base_urls
         @m_base_url = @mdot_prefix + environment + @bbc_domain
       end
 
-      proxy = ENV['http_proxy'] || ENV['HTTP_PROXY'] 
-      proxy_parts = proxy.scan(/(?:http:\/\/)?([^\:]+)(?::(\d+))?/) if proxy && !proxy.empty?
+      proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
+      proxy_parts = proxy.scan(%r{(?:http://)?([^\:]+)(?::(\d+))?}) if proxy && !proxy.empty?
       if proxy_parts && !proxy_parts.empty?
-          @proxy_host = proxy_parts[0][0]
-          if proxy_parts[0][1]
-              @proxy_port = proxy_parts[0][1]
-          else
-              @proxy_port = "80"
-          end
+        @proxy_host = proxy_parts[0][0]
+        @proxy_port = if proxy_parts[0][1]
+                        proxy_parts[0][1]
+                      else
+                        '80'
+                      end
       end
     end
 
     def validate_online(src, validator_args = nil)
-
-      args = {:proxy_host => @proxy_host,:proxy_port => @proxy_port} 
-      if(validator_args != nil)
-         args = args.merge(validator_args)
-      end    
+      args = { proxy_host: @proxy_host, proxy_port: @proxy_port }
+      args = args.merge(validator_args) if !validator_args.nil?
       @validator = MarkupValidator.new(args)
 
       @validator.set_doctype!(:xhtml)
       begin
-
         results = @validator.validate_text(src)
 
-        if results.errors.length > 0
+        if !results.errors.empty?
           results.errors.each do |err|
             puts err.to_s
           end
-          raise "W3C Validation failed."
+          raise 'W3C Validation failed.'
         end
-
       rescue SystemCallError => e
-        puts "System error whilst performing request to W3C: #{e}"  
+        puts "System error whilst performing request to W3C: #{e}"
       end
     end
 
     def prepare_host
-      ENV['SCHEME']=='https' ? scheme = 'https' : scheme = 'http'
+      scheme = ENV['SCHEME'] == 'https' ? 'https' : 'http'
       @www_prefix = "#{scheme}://www."
       @pal_prefix = "#{scheme}://pal."
-      @ssl_prefix = "https://ssl."
+      @ssl_prefix = 'https://ssl.'
       @static_prefix = "#{scheme}://static."
       @open_prefix = "#{scheme}://open."
       @bbc_domain = '.' + (ENV['FW_BBC_DOMAIN'] || 'bbc.co.uk')
@@ -93,57 +89,55 @@ def prepare_host
       @sandbox6 = "#{scheme}://sandbox"
       @mobiledot_prefix = "#{scheme}://mobile."
       @mdot_prefix = "#{scheme}://m."
-      @sslsandbox = "https://ssl.sandbox.dev"
-      @sslsandbox6 = "https://ssl.sandbox"
+      @sslsandbox = 'https://ssl.sandbox.dev'
+      @sslsandbox6 = 'https://ssl.sandbox'
       @static_sandbox = "#{scheme}://static.sandbox.dev"
-      @static_sandbox6 = "#{scheme}://static.sandbox"      
+      @static_sandbox6 = "#{scheme}://static.sandbox"
     end
 
-    def setup_mechanize(agent, http_proxy=nil)
+    def setup_mechanize(agent, http_proxy = nil)
       http_proxy = http_proxy || ENV['HTTP_PROXY'] || ENV['http_proxy']
 
       if ENV['FW_CERT_LOCATION']
-        agent.cert, agent.key = ENV['FW_CERT_LOCATION'], ENV['FW_CERT_LOCATION'] 
+        agent.cert = ENV['FW_CERT_LOCATION']
+        agent.key = ENV['FW_CERT_LOCATION']
       end
 
       agent.ca_file = ENV['CA_CERT_LOCATION'] if ENV['CA_CERT_LOCATION']
-      agent.set_proxy(http_proxy.scan(/http:\/\/(.*):80/)[0][0].to_s,80) if http_proxy && !http_proxy.empty?
+      agent.set_proxy(http_proxy.scan(%r{http://(.*):80})[0][0].to_s, 80) if http_proxy && !http_proxy.empty?
 
       # The above proxy setting ignores any no_proxy variable setting:
       # added the following to circumvent this
-      if(http_proxy)
+      if http_proxy
         no_proxy = ENV['NO_PROXY'] || ENV['no_proxy']
-        if(no_proxy)
+        if no_proxy
           # The no_proxy query string argument must not contain spaces
-          no_proxy_qs = no_proxy.gsub(/[, ]+/,',')
+          no_proxy_qs = no_proxy.gsub(/[, ]+/, ',')
           agent.agent.http.proxy = URI(http_proxy + '?no_proxy=' + no_proxy_qs)
         end
       end
 
-      #This is necessary because Mech2 does not ship with root certs like Mech1 did and boxes may not have the OpenSSL set installed
+      # This is necessary because Mech2 does not ship with root certs like Mech1 did and boxes may not have the OpenSSL set installed
       agent.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
       # This prevents Mechanize from raising a Mechanize::ResponseCodeError
       # when the HTTP Response Code is 404 or 503. This lets capybara continue the journey.
-      agent.agent.allowed_error_codes = ['404', '503']
+      agent.agent.allowed_error_codes = %w[404 503]
     end
 
-    def new_mechanize(http_proxy=nil)
+    def new_mechanize(http_proxy = nil)
       require 'mechanize'
       agent = Mechanize.new
       setup_mechanize(agent, http_proxy)
       agent
     end
+  end # EnvHelper
+end # Frameworks
 
-  end #EnvHelper
-end #Frameworks
-
-
-#Add module into world to ensure visibility of instance variables within Cucumber
+# Add module into world to ensure visibility of instance variables within Cucumber
 World(Frameworks::EnvHelper)
 
 Before do
   setup_mechanize(page.driver.browser.agent) if page.driver.class == Capybara::Mechanize::Driver
   generate_base_urls
 end
-
diff --git a/lib/frameworks/extensions/capybara-extensions.rb b/lib/frameworks/extensions/capybara-extensions.rb
deleted file mode 100644
index f910d31..0000000
--- a/lib/frameworks/extensions/capybara-extensions.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'selenium-webdriver'
-
-#
-# Cookie utility methods
-#
-class Capybara::Selenium::Driver
-  def cookies
-    browser.manage.all_cookies
-  end
-
-  def cookie_named(name)
-    browser.manage.cookie_named(name)
-  end
-
-  def delete_cookie(cookie)
-    browser.manage.delete_cookie(cookie)
-  end
-
-  def delete_all_cookies
-    browser.manage.delete_all_cookies
-  end
-
-  def add_cookie(attribs)
-    browser.manage.add_cookie(attribs)
-  end
-
-   def delete_cookies_in_domain(domain)
-    browser.manage.delete_cookies_in_domain(domain)
-  end
-end
-
-module Capybara
-  class Session
-    ##
-    # Get all cookies
-    #
-    # @return [Array<Hash>] list of cookies
-    #
-    def cookies
-      driver.cookies
-    end
-
-    ##
-    # Get the cookie with the given name
-    #
-    # @param [String] name the name of the cookie
-    # @return [Hash, nil] the cookie, or nil if it wasn't found.
-    #
-    def cookie_named(name)
-      driver.cookie_named(name)
-    end
-
-    def delete_cookie(cookie)
-      driver.delete_cookie(cookie)
-    end
-
-    def delete_all_cookies
-      driver.delete_all_cookies
-    end
-
-    def add_cookie(attribs)
-      driver.add_cookie(attribs)
-    end
-
-    def delete_cookies_in_domain(domain)
-      driver.delete_cookies_in_domain(domain)
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/frameworks/extensions/capybara-mechanize-extensions.rb b/lib/frameworks/extensions/capybara-mechanize-extensions.rb
deleted file mode 100644
index 662d19b..0000000
--- a/lib/frameworks/extensions/capybara-mechanize-extensions.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-require 'capybara/mechanize/cucumber' 
-
-# Cookie handling extensions
-class Capybara::Mechanize::Driver
-
-  def cookies
-    cookies = []
-
-    browser.agent.cookie_jar.jar.each do |domain|
-      domain[1].each do |path|
-        path[1].each do |cookie|
-          
-          cookies.push({
-            :name => cookie[1].name,
-            :value => cookie[1].value,
-            :domain => cookie[1].domain,
-            :secure => cookie[1].secure,
-            :expires => cookie[1].expires,
-            :httponly => cookie[1].httponly,
-            :path => cookie[1].path
-          })
-        end
-      end
-    end
-    cookies
-  end
-
-  def cookie_named(name)
-    cookies.find { |c| c[:name] == name }
-  end
-
-  def delete_cookie(cookie_name)
-    browser.agent.cookie_jar.jar.each do |domain|
-      domain[1].each do |path|
-        path[1].each do |cookie|
-          if cookie[0] == cookie_name
-            browser.agent.cookie_jar.jar[domain[0]][path[0]].delete(cookie[0])
-          end
-        end
-      end
-    end
-  end
-
-  def delete_all_cookies
-    browser.agent.cookie_jar.clear!
-  end
-
-  def delete_cookies_in_domain(domain)
-    cookies.each do |cookie|
-      delete_cookie(cookie[:name]) if cookie[:domain].include?(domain)
-    end
-  end
-
-  def add_cookie(attribs)
-    
-    cookie = HTTP::Cookie.new(
-      attribs[:name],
-      attribs[:value],
-      :domain => attribs[:domain],
-      :for_domain => true,
-      :path => '/',
-      :expires => attribs[:expires],
-      :secure => attribs[:secure],
-      :httponly => attribs[:httponly]
-    )
-
-    browser.agent.cookie_jar.add(cookie)
-
-  end
-end
diff --git a/lib/frameworks/extensions/patches.rb b/lib/frameworks/extensions/patches.rb
index 38544a6..1d62637 100644
--- a/lib/frameworks/extensions/patches.rb
+++ b/lib/frameworks/extensions/patches.rb
@@ -1,6 +1,7 @@
 require 'show_me_the_cookies'
 require 'capybara'
 require 'frameworks/logger'
+
 # monkey patches live here - beware!
 module Capybara
   # override behaviour of visit to surpress bbc survey
@@ -8,13 +9,13 @@ class Session
     include ShowMeTheCookies
     include FrameworksCapybara::Logger
 
-    alias_method :old_visit, :visit
+    alias old_visit visit
     def visit(url)
+      Capybara.current_driver
       old_visit url
       return if [:mechanize, :poltergeist].include?(Capybara.current_driver)
       surpress_cookies_prompt
-      #reload_if_survey_appears
-      close_music_banner
+      # reload_if_survey_appears
     end
 
     def surpress_cookies_prompt
@@ -26,16 +27,11 @@ def reload_if_survey_appears
       reload = false
       within_frame('edr_l_first') do
         if has_selector?('#layer_wrap', wait: 1)
-          log.info 'Found survey, will now reload page - only true x browser solution for now'
+          log.info 'Found survey, will now reload the page'
           reload = true
         end
       end
       visit current_url if reload
     end
-
-    def close_music_banner
-      close_banner_button = '#mn-prompt--where-is-playlister button'
-      find(close_banner_button).click if has_selector?(close_banner_button, wait: 1)
-    end
   end
 end

From ebd914a4f9f38c3347520665555030fa5a9514a0 Mon Sep 17 00:00:00 2001
From: Swati Tabib <tabibs01@mc-s080764.local>
Date: Fri, 7 Jul 2017 10:23:48 +0100
Subject: [PATCH 42/62] rubocop fixes

---
 Rakefile                                 |   4 +-
 frameworks-capybara.gemspec              |  47 ++-
 lib/frameworks/capybara.rb               |  17 +-
 lib/frameworks/cucumber.rb               |   4 +-
 lib/frameworks/logger.rb                 |   4 +-
 lib/frameworks/wait.rb                   |   7 +-
 lib/tasks/frameworks-tasks.rb            |  46 +--
 lib/tasks/merge_cucumber_json_reports.rb |   4 +-
 lib/tasks/parallel-tasks.rb              |  17 +-
 lib/version.rb                           |   2 +-
 spec/frameworks_capybara_spec.rb         | 488 +++++++++++------------
 spec/frameworks_cucumber_spec.rb         | 269 ++++++-------
 spec/spec_helper.rb                      |   2 +-
 spec/unit_test_monkeypatches.rb          |   5 +-
 spec/wait_spec.rb                        |  13 +-
 15 files changed, 440 insertions(+), 489 deletions(-)

diff --git a/Rakefile b/Rakefile
index ed6c73a..3026c82 100644
--- a/Rakefile
+++ b/Rakefile
@@ -5,8 +5,8 @@ require 'cucumber/rake/task'
 
 Bundler::GemHelper.install_tasks
 
-desc "Run all examples"
+desc 'Run all examples'
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = %w[--color]
 end
-task :default => [:spec]
+task default: [:spec]
diff --git a/frameworks-capybara.gemspec b/frameworks-capybara.gemspec
index fd2cd27..a379ea1 100644
--- a/frameworks-capybara.gemspec
+++ b/frameworks-capybara.gemspec
@@ -1,35 +1,34 @@
 # -*- encoding: utf-8 -*-
+
 lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
 require 'version'
 
 Gem::Specification.new do |s|
-  s.name = "frameworks-capybara"
+  s.name = 'frameworks-capybara'
   s.version = FrameworksCapybara::VERSION
 
-  s.authors = ["matt robbins"]
-  s.email = ["mcrobbins@gmail.com"]
-  s.description = "Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches"
-
-  s.files = Dir.glob("{features,lib,bin,config,vendor,.bundle}/**/*") +  %w(Gemfile Gemfile.lock)
-
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.4.2"
-  s.summary = "Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches"
+  s.authors = ['Radio and Music Test team']
+  s.email = ['']
+  s.description = 'Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches'
 
-  s.files         = `git ls-files`.split("\n")
+  s.files = Dir.glob('{features,lib,bin,config,vendor,.bundle}/**/*') + %w[Gemfile Gemfile.lock]
 
-  s.add_runtime_dependency("selenium-webdriver")
-  s.add_runtime_dependency("capybara", '~> 2.5')
-  s.add_runtime_dependency("mechanize")
-  s.add_runtime_dependency("capybara-mechanize")
-  s.add_runtime_dependency("poltergeist")
-  s.add_runtime_dependency("json")
-  s.add_runtime_dependency("cucumber")
-  s.add_runtime_dependency("logging")
-  s.add_runtime_dependency("show_me_the_cookies")
-  s.add_runtime_dependency("w3c_validators")
-  s.add_development_dependency("rake")
-  s.add_development_dependency("rspec")
+  s.require_paths = ['lib']
+  s.rubygems_version = '2.4.2'
+  s.summary = 'Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches'
+  s.files = `git ls-files`.split("\n")
+  s.add_runtime_dependency('selenium-webdriver')
+  s.add_runtime_dependency('capybara', '~> 2.5')
+  s.add_runtime_dependency('mechanize')
+  s.add_runtime_dependency('capybara-mechanize')
+  s.add_runtime_dependency('poltergeist')
+  s.add_runtime_dependency('json')
+  s.add_runtime_dependency('cucumber')
+  s.add_runtime_dependency('logging')
+  s.add_runtime_dependency('show_me_the_cookies')
+  s.add_runtime_dependency('w3c_validators')
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rspec')
 end
diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index 29fa108..8d15713 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -62,7 +62,6 @@ def initialize
     selenium_remote_opts[:browser_name] = selenium_remote_opts[:browser_name].intern if selenium_remote_opts[:browser_name]
 
     Capybara.run_server = false # Disable rack server
-    
     # delete nil options and environment (which is only used for validation)
     [capybara_opts, selenium_remote_opts, custom_opts].each do |opts|
       opts.delete_if { |k, v| (v.nil? || k == :environment) }
@@ -92,12 +91,12 @@ def validate_env_vars(opts, custom_opts)
     msg1 = 'Please ensure following environment variables are set ENVIRONMENT [int|test|stage|live], BROWSER[headless|ie|chrome|firefox] and HTTP_PROXY (if required)'
     msg2 = 'Please ensure the following environment variables are set PLATFORM, REMOTE_URL, REMOTE_BROWSER (browser to use on remote machine), HTTP_PROXY (if required), REMOTE_BROWSER_PROXY (if required) and BROWSER_VERSION (if required)'
 
-    [:environment, :browser].each { |item| !opts.has_key?(item) || opts[item] == nil ? raise(msg1) : '' }
+    [:environment, :browser].each { |item| !opts.key?(item) || opts[item].nil? ? raise(msg1) : '' }
 
     if custom_opts[:appium_platform]
-      [:url].each { |item| !opts.has_key?(item) || opts[item] == nil ? raise(msg2) : '' }
+      [:url].each { |item| !opts.key?(item) || opts[item].nil? ? raise(msg2) : '' }
     elsif opts[:browser] == 'remote'
-      [:url, :browser_name].each { |item| !opts.has_key?(item) || opts[item] == nil ? raise(msg2) : '' }
+      [:url, :browser_name].each { |item| !opts.key?(item) || opts[item].nil? ? raise(msg2) : '' }
     end
   end
 
@@ -110,7 +109,7 @@ def update_firefox_profile_with_certificates(profile, certificate_path, certific
       source_file = '#{certificate_prefix}#{cert_file}'
       source_path = "#{certificate_path}" + File::SEPARATOR + source_file
       dest_path = profile_path + File::SEPARATOR + cert_file
-      if !File.exist?(source_path)
+      unless File.exist?(source_path)
         raise 'Firefox cert db file #{source_path} does not exist.'
       end
       FileUtils.cp(source_path, dest_path)
@@ -161,8 +160,8 @@ def register_selenium_driver(opts, remote_opts, custom_opts)
     :selenium
   end
 
-  def add_custom_caps(caps, custom_opts)
-    sauce_time_limit = custom_opts.delete(:max_duration).to_i # note nil.to_i == 0
+  def add_custom_caps(_caps, custom_opts)
+    custom_opts.delete(:max_duration).to_i # note nil.to_i == 0
   end
 
   def add_browserstack_caps(caps, custom_opts)
@@ -190,7 +189,6 @@ def create_profile(profile_name = nil, additional_prefs = nil)
     additional_prefs = JSON.parse(additional_prefs) if additional_prefs
     if additional_prefs && !profile_name
       profile = Selenium::WebDriver::Firefox::Profile.new
-      profile.native_events = true
     elsif profile_name == 'BBC_INTERNAL'
       profile = Selenium::WebDriver::Firefox::Profile.new
       if @proxy_host && @proxy_port
@@ -201,11 +199,10 @@ def create_profile(profile_name = nil, additional_prefs = nil)
         profile['network.proxy.http_port'] = @proxy_port
         profile['network.proxy.ssl_port'] = @proxy_port
       end
-      profile.native_events = true
     else
       profile = Selenium::WebDriver::Firefox::Profile.from_name profile_name
-      profile.native_events = true
     end
+    profile.native_events = true
 
     if additional_prefs
       additional_prefs.each do |k, v|
diff --git a/lib/frameworks/cucumber.rb b/lib/frameworks/cucumber.rb
index 1a61fc5..92390c8 100644
--- a/lib/frameworks/cucumber.rb
+++ b/lib/frameworks/cucumber.rb
@@ -58,14 +58,14 @@ def generate_base_urls
 
     def validate_online(src, validator_args = nil)
       args = { proxy_host: @proxy_host, proxy_port: @proxy_port }
-      args = args.merge(validator_args) if !validator_args.nil?
+      args = args.merge(validator_args) unless validator_args.nil?
       @validator = MarkupValidator.new(args)
 
       @validator.set_doctype!(:xhtml)
       begin
         results = @validator.validate_text(src)
 
-        if !results.errors.empty?
+        unless results.errors.empty?
           results.errors.each do |err|
             puts err.to_s
           end
diff --git a/lib/frameworks/logger.rb b/lib/frameworks/logger.rb
index af943cc..813ef5f 100644
--- a/lib/frameworks/logger.rb
+++ b/lib/frameworks/logger.rb
@@ -4,7 +4,7 @@ module FrameworksCapybara
   # configure logging
   module Logger
     def log_level
-      log_levels = %w(warn info debug)
+      log_levels = %w[warn info debug]
       env_log_level = (ENV['LOG_LEVEL'] || '').downcase
       log_levels.include?(env_log_level) ? env_log_level.to_sym : :debug
     end
@@ -24,7 +24,7 @@ def default_style
       scheme = 'pldefault'
       Logging.color_scheme(
         scheme,
-        levels: { info:  :green, warn:  :yellow, error: :red },
+        levels: { info: :green, warn: :yellow, error: :red },
         date:    :cyan,
         logger:  :cyan,
         message: :cyan
diff --git a/lib/frameworks/wait.rb b/lib/frameworks/wait.rb
index ae1817f..3b6e59c 100644
--- a/lib/frameworks/wait.rb
+++ b/lib/frameworks/wait.rb
@@ -1,8 +1,8 @@
 require 'time'
 
 module FrameworksCapybara
+  # wait for elements methods
   module Wait
-    ##
     # Execute a block until it returns true.
     # Optionally pass a message and timeout (default 10 seconds).
     #
@@ -15,7 +15,6 @@ def wait_for(message = '', options = { timeout: 5 })
       end
     end
 
-    ##
     # Execute a block containing RSpec assertion, catch failures and wait till it passes
     # Pass an exception message to be outputted on failure and a block
     # Optionally pass a timeout, sleep interval
@@ -40,13 +39,13 @@ def wait_for_assertion(exception_message, timeout = Capybara.default_max_wait_ti
     # end
     #
     def wait_for_no_exception(exception_message, exception, timeout = Capybara.default_max_wait_time, sleep_interval = 1, &block)
-      fail 'You need to provide a block' unless block_given?
+      raise 'You need to provide a block' unless block_given?
       test_exception = 'check did not return within timeout window.'
       begin
         Timeout.timeout(timeout) do
           loop do
             begin
-              block.call
+              yield
               return true
             rescue exception => assertion_exception
               puts "#{exception_message} - rescuing: #{exception.to_s} and trying to call block again!"
diff --git a/lib/tasks/frameworks-tasks.rb b/lib/tasks/frameworks-tasks.rb
index 14296c4..e9832c2 100644
--- a/lib/tasks/frameworks-tasks.rb
+++ b/lib/tasks/frameworks-tasks.rb
@@ -1,13 +1,14 @@
+# Rake Tasks
 class RakeHelpers
-  INVOKE_CUCUMBER = "bin/cucumber -r features"
+  INVOKE_CUCUMBER = 'bin/cucumber -r features'.freeze
 
   class << self
     def install
-      system('bundle install --no-cache --binstubs --path vendor/bundle') 
+      system('bundle install --no-cache --binstubs --path vendor/bundle')
     end
 
     def color(text, options = {})
-      #ANSI color codes
+      # ANSI color codes
       case options[:color]
       when :red
         text = "\033[31m#{text}\033[0m"
@@ -20,54 +21,53 @@ def color(text, options = {})
     end
 
     def list_profiles
-      puts 'Available profiles:' 
+      puts 'Available profiles:'
       f =  File.open('config/cucumber.yml', 'r')
       linenum = 0
       @profiles = {}
       f.readlines.each do |line|
         line.scan(/.*?: /) do |match|
           linenum += 1
-          puts color(linenum.to_s + '. ', :color => :yellow) + color(match.gsub(':',''), :color => :green)
-          @profiles[linenum.to_s] = match.gsub(':','')
+          puts color(linenum.to_s + '. ', color: yellow) + color(match.delete(':', ''), color: green)
+          @profiles[linenum.to_s] = match.delete(':', '')
         end
       end
     end
 
     def update
-      system('bundle update') 
+      system('bundle update')
     end
 
-    def run_feature(feature, profile='default')
+    def run_feature(feature, profile = 'default')
       system("#{INVOKE_CUCUMBER} -p #{profile} features/#{feature}.feature")
     end
 
-    def run_profile(profile='default')
+    def run_profile(profile = 'default')
       system("#{INVOKE_CUCUMBER} -p #{profile}")
     end
 
-
     def start_app
-      $: << File.dirname( __FILE__)
+      $LOAD_PATH << File.dirname(__FILE__)
       require 'lib/spec/test_app'
-      Rack::Handler::WEBrick.run TestApp, :Port => 8070
+      Rack::Handler::WEBrick.run TestApp, Port: 8070
     end
 
     def run_local
-      if(RUBY_PLATFORM == 'java')
-        abort color("This script only works if you are running on MRI ('normal') Ruby....sorry....", :color => :red) 
+      if RUBY_PLATFORM == 'java'
+        abort color("This script only works if you are running on MRI ('normal') Ruby....sorry....", color: red)
       end
-      puts color('*********************************************',:color => :green)
-      puts color('*                                           *',:color => :green)
-      puts color('* Cucumber Acceptance Tests                 *',:color => :green)
-      puts color('* Pre-Requisites:                           *',:color => :green)
-      puts color('* ruby 1.8.7, bundler, rake                 *',:color => :green)
-      puts color('*                                           *',:color => :green)
-      puts color('*********************************************',:color => :green)
+      puts color('*********************************************', color: green)
+      puts color('*                                           *', color: green)
+      puts color('* Cucumber Acceptance Tests                 *', color: green)
+      puts color('* Pre-Requisites:                           *', color: green)
+      puts color('* ruby 1.8.7, bundler, rake                 *', color: green)
+      puts color('*                                           *', color: green)
+      puts color('*********************************************', color: green)
       list_profiles
       puts 'Above is a list of the available profiles, please enter the number of the profile you wish to run: '
       profile = STDIN.gets.chomp
-      #TODO: Add some input validation?
-      puts "The profile chosen is: #{color(@profiles[profile], :color => :red)}"
+      # TODO: Add some input validation?
+      puts "The profile chosen is: #{color(@profiles[profile], color: red)}"
       puts 'Preparing to bundle required gems...'
       install
       puts 'Preparing to run tests...'
diff --git a/lib/tasks/merge_cucumber_json_reports.rb b/lib/tasks/merge_cucumber_json_reports.rb
index 70d190b..4e74eb1 100644
--- a/lib/tasks/merge_cucumber_json_reports.rb
+++ b/lib/tasks/merge_cucumber_json_reports.rb
@@ -31,8 +31,8 @@ def update(fname, feature, report)
   end
 
   def rerun
-    puts "Processing rerun json"
-    json_rerun = Dir.glob "reports/rerun.json"
+    puts 'Processing rerun json'
+    json_rerun = Dir.glob 'reports/rerun.json'
     if json_rerun.empty?
       puts 'no rerun file found'
     else
diff --git a/lib/tasks/parallel-tasks.rb b/lib/tasks/parallel-tasks.rb
index a237667..34f8b07 100644
--- a/lib/tasks/parallel-tasks.rb
+++ b/lib/tasks/parallel-tasks.rb
@@ -1,3 +1,4 @@
+# parallel tasks
 class ParallelTasks
   include Rake::DSL if defined? Rake::DSL
 
@@ -47,7 +48,7 @@ def get_thread_count
     end
 
     def write_confluence_report(passfail)
-      require "erb"
+      require 'erb'
       green = '#4CD672'
       red = '#EA4D61'
       template = File.read(File.dirname(__FILE__) + '/confluence.erb')
@@ -57,13 +58,13 @@ def write_confluence_report(passfail)
 
     desc 'Run all examples'
     RSpec::Core::RakeTask.new(:spec) do |t|
-      t.rspec_opts = %w(--color -fprogress -fhtml -oreports/rspec.html)
+      t.rspec_opts = %w[--color -fprogress -fhtml -oreports/rspec.html]
     end
 
     desc 'Create some docs'
     YARD::Rake::YardocTask.new do |t|
       t.files   = ['lib/**/*.rb']
-      t.options = %w(--markup=markdown)
+      t.options = %w[--markup=markdown]
     end
 
     desc 'Feature documentation'
@@ -80,7 +81,7 @@ def write_confluence_report(passfail)
     end
 
     desc 'Run cukes on production in parallel with browserstack chrome'
-    task :parallel_cuke do |t|
+    task :parallel_cuke do
       sh "#{bundle_exec}parallel_cucumber -n #{get_thread_count} -o '#{tags} #{env}' #{features_dir}"
     end
 
@@ -97,7 +98,7 @@ def write_confluence_report(passfail)
       result = (selenium_successful || rerun_successful) == true ? 'pass' : 'fail'
       puts "Overall result is #{result}"
       write_confluence_report(result)
-      fail 'Cucumber Failure' if result == 'fail'
+      raise 'Cucumber Failure' if result == 'fail'
     end
 
     desc 'Remove all files from the ./reports and ./doc directory'
@@ -118,11 +119,11 @@ def write_confluence_report(passfail)
         original_reports = Dir.entries junit_dir
         thread_reports = Dir.entries "#{junit_dir}#{thread}"
         thread_reports.reject { |f| File.directory?(f) }.each do |report|
-          if  original_reports.include?(report)
+          if original_reports.include?(report)
             sh "#{bundle_exec}junit_merge #{junit_dir}#{thread}/#{report} #{junit_dir}/#{report}"
           else
-            puts  "copy #{junit_dir}#{thread}/#{report} to #{junit_dir}"
-            FileUtils.cp  "#{junit_dir}#{thread}/#{report}", junit_dir
+            puts "copy #{junit_dir}#{thread}/#{report} to #{junit_dir}"
+            FileUtils.cp "#{junit_dir}#{thread}/#{report}", junit_dir
           end
         end
       end
diff --git a/lib/version.rb b/lib/version.rb
index c0f8fe8..4514fc7 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -1,3 +1,3 @@
 module FrameworksCapybara
-  VERSION = '3.0.0'
+  VERSION = '3.0.0'.freeze
 end
diff --git a/spec/frameworks_capybara_spec.rb b/spec/frameworks_capybara_spec.rb
index 22ec3ab..eda83a8 100644
--- a/spec/frameworks_capybara_spec.rb
+++ b/spec/frameworks_capybara_spec.rb
@@ -1,12 +1,12 @@
 require 'spec_helper'
 require 'securerandom'
-##
-#Monkey Patch
-#This is required because Capybara has module methods (singletons) which create
-#a session and then re-use this whenever Capybara is referenced in the current process. 
-#Therefore even creating new instances of CapybaraSetup will use the same session and driver instance
-#...not picking up changes in the different tests below.  
-#Hence the only option is to clean out the session before each test.
+
+# Monkey Patch
+# This is required because Capybara has module methods (singletons) which create
+# a session and then re-use this whenever Capybara is referenced in the current process.
+# Therefore even creating new instances of CapybaraSetup will use the same session and driver instance
+# not picking up changes in the different tests below.
+# Hence the only option is to clean out the session before each test.
 module Capybara
   class << self
     def delete_session
@@ -15,105 +15,104 @@ def delete_session
   end
 end
 
-shared_examples_for "Selenium Driver Options Array" do
-  it "should contain no nil values for unset options" do
-    #TODO: Test for nil elements in options - there shouldn't be any that we insert
-    #i.e. anything in our ENV options should not end up being nil in Selenium
-    Capybara.current_session.driver.options[:environment].should == nil
-    Capybara.current_session.driver.options[:http_proxy].should == nil
-    Capybara.current_session.driver.options[:webdriver_proxy_on].should == nil
-    Capybara.current_session.driver.options[:platform].should == nil
-    Capybara.current_session.driver.options[:browser_name].should == nil
-    Capybara.current_session.driver.options[:version].should == nil
-    Capybara.current_session.driver.options[:job_name].should == nil
-    Capybara.current_session.driver.options[:chrome_switches].should == nil
-    Capybara.current_session.driver.options[:firefox_prefs].should == nil
-    Capybara.current_session.driver.options[:max_duration].should == nil
+shared_examples_for 'Selenium Driver Options Array' do
+  it 'should contain no nil values for unset options' do
+    # TODO: Test for nil elements in options - there shouldn't be any that we insert
+    # i.e. anything in our ENV options should not end up being nil in Selenium
+    Capybara.current_session.driver.options[:environment].should eq nil
+    Capybara.current_session.driver.options[:http_proxy].should eq nil
+    Capybara.current_session.driver.options[:webdriver_proxy_on].should eq nil
+    Capybara.current_session.driver.options[:platform].should eq nil
+    Capybara.current_session.driver.options[:browser_name].should eq nil
+    Capybara.current_session.driver.options[:version].should eq nil
+    Capybara.current_session.driver.options[:job_name].should eq nil
+    Capybara.current_session.driver.options[:chrome_switches].should eq nil
+    Capybara.current_session.driver.options[:firefox_prefs].should eq nil
+    Capybara.current_session.driver.options[:max_duration].should eq nil
     Capybara.current_session.driver.options[:profile].should_not be_a_kind_of String
     Capybara.current_session.driver.options[:browser].should_not be_a_kind_of String
   end
 end
 
 describe CapybaraSetup do
-
   before(:each) do
     home = ENV['HOME']
     appdata = ENV['APPDATA']
     ENV.clear
-    ENV['HOME'] = home #Want to clear some env variables but HOME is used by Webdriver, therefore need to preserve it
+    ENV['HOME'] = home # Want to clear some env variables but HOME is used by Webdriver, therefore need to preserve it
     ENV['APPDATA'] = appdata
   end
 
-  describe "should validate options" do
+  describe 'should validate options' do
     before(:each) do
       Capybara.delete_session
     end
 
-    it "should require as a minimum ENVIRONMENT and BROWSER" do
-      lambda {CapybaraSetup.new}.should raise_error(RuntimeError,'Please ensure following environment variables are set ENVIRONMENT [int|test|stage|live], BROWSER[headless|ie|chrome|firefox] and HTTP_PROXY (if required)')
+    it 'should require as a minimum ENVIRONMENT and BROWSER' do
+      lambda { CapybaraSetup.new }.should raise_error(RuntimeError, 'Please ensure following environment variables are set ENVIRONMENT [int|test|stage|live], BROWSER[headless|ie|chrome|firefox] and HTTP_PROXY (if required)')
     end
 
-    it "should require as a minimum ENVIRONMENT, BROWSER and REMOTE_BROWSER if running a Remote Selenium Instance" do
+    it 'should require as a minimum ENVIRONMENT, BROWSER and REMOTE_BROWSER if running a Remote Selenium Instance' do
       ENV['BROWSER'] = 'remote'
       ENV['ENVIRONMENT'] = 'test'
-      lambda {CapybaraSetup.new}.should raise_error(RuntimeError,'Please ensure the following environment variables are set PLATFORM, REMOTE_URL, REMOTE_BROWSER (browser to use on remote machine), HTTP_PROXY (if required), REMOTE_BROWSER_PROXY (if required) and BROWSER_VERSION (if required)')
+      lambda { CapybaraSetup.new }.should raise_error(RuntimeError, 'Please ensure the following environment variables are set PLATFORM, REMOTE_URL, REMOTE_BROWSER (browser to use on remote machine), HTTP_PROXY (if required), REMOTE_BROWSER_PROXY (if required) and BROWSER_VERSION (if required)')
     end
 
-    it "should not error if ENVIRONMENT and BROWSER are provided" do
+    it 'should not error if ENVIRONMENT and BROWSER are provided' do
       ENV['BROWSER'] = 'headless'
       ENV['ENVIRONMENT'] = 'test'
-      lambda {CapybaraSetup.new}.should_not raise_error
+      lambda { CapybaraSetup.new }.should_not raise_error
     end
 
-    it "should not error if ENVIRONMENT, BROWSER and REMOTE_BROSWER are provided if running a Remote Selenium Instance" do
+    it 'should not error if ENVIRONMENT, BROWSER and REMOTE_BROSWER are provided if running a Remote Selenium Instance' do
       ENV['BROWSER'] = 'remote'
       ENV['ENVIRONMENT'] = 'test'
       ENV['REMOTE_BROWSER'] = 'test'
       ENV['REMOTE_URL'] = 'test'
-      lambda {CapybaraSetup.new}.should_not raise_error
+      lambda { CapybaraSetup.new }.should_not raise_error
     end
   end
 
-  describe "should allow Capybara drivers to be created" do
+  describe 'should allow Capybara drivers to be created' do
     before do
       ENV['ENVIRONMENT'] = 'test'
     end
 
-    describe "should allow Selenium driver to be created" do
-      context "with minimal Selenium driver" do
+    describe 'should allow Selenium driver to be created' do
+      context 'with minimal Selenium driver' do
         before do
           ENV['BROWSER'] = 'firefox'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :firefox
+          Capybara.current_session.driver.options[:browser].should eq :firefox
         end
 
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with no command-line arguments supplied" do
+      context 'with no command-line arguments supplied' do
         before do
           ENV['BROWSER'] = 'phantomjs'
         end
 
-        it "should be initialized correctly" do
+        it 'should be initialized correctly' do
           Capybara.delete_session
           expect(CapybaraSetup.new.driver).to eq :selenium
           expect(Capybara.current_session.driver.options[:args]).to be nil
         end
       end
 
-      context "with single command-line argument supplied" do
+      context 'with single command-line argument supplied' do
         before do
           ENV['BROWSER'] = 'phantomjs'
           ENV['BROWSER_CLI_ARGS'] = '--ignore-ssl-errors=true'
         end
 
-        it "should be initialized correctly" do
+        it 'should be initialized correctly' do
           Capybara.delete_session
           expect(CapybaraSetup.new.driver).to eq :selenium
           args = Capybara.current_session.driver.options[:args]
@@ -123,13 +122,13 @@ def delete_session
         end
       end
 
-      context "with multiple command-line arguments supplied" do
+      context 'with multiple command-line arguments supplied' do
         before do
           ENV['BROWSER'] = 'phantomjs'
           ENV['BROWSER_CLI_ARGS'] = '--ignore-ssl-errors=true --remote-debugger-port=9000'
         end
 
-        it "should be initialized correctly" do
+        it 'should be initialized correctly' do
           Capybara.delete_session
           expect(CapybaraSetup.new.driver).to eq :selenium
           args = Capybara.current_session.driver.options[:args]
@@ -140,25 +139,24 @@ def delete_session
         end
       end
 
-      context "with Selenium driver and default firefox profile (from profiles.ini)" do
+      context 'with Selenium driver and default firefox profile (from profiles.ini)' do
         before do
           ENV['BROWSER'] = 'firefox'
           ENV['FIREFOX_PROFILE'] = 'default'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :firefox
+          Capybara.current_session.driver.options[:browser].should eq :firefox
           Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@model).should include "default"
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@model).should include 'default'
         end
-        it_behaves_like "Selenium Driver Options Array"
-
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Selenium driver and programtically created profile" do
+      context 'with Selenium driver and programtically created profile' do
         before do
           ENV['BROWSER'] = 'firefox'
           ENV['FIREFOX_PROFILE'] = 'BBC_INTERNAL'
@@ -166,40 +164,39 @@ def delete_session
           ENV['PROXY_ON'] = 'false'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :firefox
+          Capybara.current_session.driver.options[:browser].should eq :firefox
           Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.type'].should == 1
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.no_proxies_on'].should == '*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk'
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.http'].should == 'example.cache.co.uk'
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.http_port'].should == 80
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl'].should == 'example.cache.co.uk'
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl_port'].should == 80
-        end
-        it_behaves_like "Selenium Driver Options Array"
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.type'].should eq 1
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.no_proxies_on'].should eq '*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk'
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.http'].should eq 'example.cache.co.uk'
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.http_port'].should eq 80
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl'].should eq 'example.cache.co.uk'
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl_port'].should eq 80
+        end
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Selenium driver and custom chrome options" do
+      context 'with Selenium driver and custom chrome options' do
         before do
           ENV['BROWSER'] = 'chrome'
           ENV['CHROME_SWITCHES'] = '--user-agent=Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :chrome
-          Capybara.current_session.driver.options[:switches].should == ['--user-agent=Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10']
+          Capybara.current_session.driver.options[:browser].should eq :chrome
+          Capybara.current_session.driver.options[:switches].should eq ['--user-agent=Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10']
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-
-      context "with Remote Selenium driver" do
+      context 'with Remote Selenium driver' do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'firefox'
@@ -207,23 +204,23 @@ def delete_session
           ENV['REMOTE_URL'] = 'http://example.com'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :remote
-          Capybara.current_session.driver.options[:url].should == 'http://example.com'
-          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
-          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities 
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :firefox
+          Capybara.current_session.driver.options[:browser].should eq :remote
+          Capybara.current_session.driver.options[:url].should eq 'http://example.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
+          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should eq :firefox
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@model).should include 'default'
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Remote Selenium driver and client proxy" do
+      context 'with Remote Selenium driver and client proxy' do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'firefox'
@@ -232,20 +229,20 @@ def delete_session
           ENV['HTTP_PROXY'] = 'http://example.cache.co.uk:80'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :remote
-          Capybara.current_session.driver.options[:url].should == 'http://example.com'
-          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
+          Capybara.current_session.driver.options[:browser].should eq :remote
+          Capybara.current_session.driver.options[:url].should eq 'http://example.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
           Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should be_a_kind_of Selenium::WebDriver::Proxy
           Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).instance_variable_get(:@http).should == 'http://example.cache.co.uk:80'
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Remote Selenium driver, programtically cretated Firefox profile using proxy but client not using proxy" do
+      context 'with Remote Selenium driver, programtically cretated Firefox profile using proxy but client not using proxy' do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'firefox'
@@ -255,25 +252,25 @@ def delete_session
           ENV['PROXY_ON'] = 'false'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :remote
+          Capybara.current_session.driver.options[:browser].should eq :remote
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.type'].should == 1
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.no_proxies_on'].should == '*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk'
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.http'].should == 'example.cache.co.uk'
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.http_port'].should == 80
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl'].should == 'example.cache.co.uk'
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl_port'].should == 80
-          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
-        end
-        it_behaves_like "Selenium Driver Options Array"
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.type'].should eq 1
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.no_proxies_on'].should eq '*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.http'].should eq 'example.cache.co.uk'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.http_port'].should eq 80
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl'].should eq 'example.cache.co.uk'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl_port'].should eq 80
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
+        end
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Remote Selenium driver (specifying platform and browser version) and default Custom Capabilites (e.g. for Sauce Labs)" do
+      context 'with Remote Selenium driver (specifying platform and browser version) and default Custom Capabilites (e.g. for Sauce Labs)' do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'firefox'
@@ -283,27 +280,25 @@ def delete_session
           ENV['REMOTE_URL'] = 'http://saucelabs.com'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :remote
-          Capybara.current_session.driver.options[:url].should == 'http://saucelabs.com'
-          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
-          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities 
-          #Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'job-name'].should == 'frameworks-unamed-job' 
-          #Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'max-duration'].should == 1800 
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :firefox
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_version].should == '4'
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:os].should == 'windows'
+          Capybara.current_session.driver.options[:browser].should eq :remote
+          Capybara.current_session.driver.options[:url].should eq 'http://saucelabs.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
+          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should eq :firefox
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_version].should eq '4'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:os].should eq 'windows'
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@model).should include 'default'
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Selenium driver and hardcoded bbc internal profile and additional firefox preferences" do
+      context 'with Selenium driver and hardcoded bbc internal profile and additional firefox preferences' do
         before do
           ENV['BROWSER'] = 'firefox'
           ENV['HTTP_PROXY'] = 'http://example.cache.co.uk:80'
@@ -311,55 +306,53 @@ def delete_session
           ENV['FIREFOX_PREFS'] = '{"javascript.enabled":false}'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :firefox
+          Capybara.current_session.driver.options[:browser].should eq :firefox
           Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should == false
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should eq false
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-
-      context "with Selenium driver and additional firefox preferences" do
+      context 'with Selenium driver and additional firefox preferences' do
         before do
           ENV['BROWSER'] = 'firefox'
           ENV['FIREFOX_PROFILE'] = 'default'
           ENV['FIREFOX_PREFS'] = '{"javascript.enabled":false}'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :firefox
+          Capybara.current_session.driver.options[:browser].should eq :firefox
           Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should == false
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should eq false
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-
-      context "with Selenium driver and new profile and custom prefs" do
+      context 'with Selenium driver and new profile and custom prefs' do
         before do
           ENV['BROWSER'] = 'firefox'
           ENV['FIREFOX_PREFS'] = '{"javascript.enabled":false}'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :firefox
+          Capybara.current_session.driver.options[:browser].should eq :firefox
           Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should == false
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should eq false
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Remote Selenium driver and specified Chrome Switches" do
+      context 'with Remote Selenium driver and specified Chrome Switches' do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'chrome'
@@ -367,23 +360,23 @@ def delete_session
           ENV['CHROME_SWITCHES'] = '--user-agent=Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :remote
-          Capybara.current_session.driver.options[:switches].should == nil
-          Capybara.current_session.driver.options[:url].should == 'http://saucelabs.com'
-          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
-          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities 
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :chrome
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)['chrome.switches'].should == ['--user-agent=Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10'] 
-        end
-        it_behaves_like "Selenium Driver Options Array"
+          Capybara.current_session.driver.options[:browser].should eq :remote
+          Capybara.current_session.driver.options[:switches].should eq nil
+          Capybara.current_session.driver.options[:url].should eq 'http://saucelabs.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
+          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should eq :chrome
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)['chrome.switches'].should eq ['--user-agent=Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10']
+        end
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Remote Selenium driver and specified Custom Capabilites (e.g. for Sauce Labs)" do
+      context 'with Remote Selenium driver and specified Custom Capabilites (e.g. for Sauce Labs)' do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'firefox'
@@ -394,44 +387,42 @@ def delete_session
           ENV['REMOTE_URL'] = 'http://saucelabs.com'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :remote
-          Capybara.current_session.driver.options[:url].should == 'http://saucelabs.com'
-          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
-          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities 
-          #Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'job-name'].should == 'myjobname' 
-          #Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'max-duration'].should == 2000 
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :firefox
+          Capybara.current_session.driver.options[:browser].should eq :remote
+          Capybara.current_session.driver.options[:url].should eq 'http://saucelabs.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
+          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should eq :firefox
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@model).should include 'default'
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Remote Selenium driver and most minimal Capabilites for BrowserStack" do
+      context 'with Remote Selenium driver and most minimal Capabilites for BrowserStack' do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'ie'
           ENV['REMOTE_URL'] = 'http://hub.browserstack.com'
         end
 
-        it "should be initialized correctly" do
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :remote
-          Capybara.current_session.driver.options[:url].should == ENV['REMOTE_URL']
+          Capybara.current_session.driver.options[:browser].should eq :remote
+          Capybara.current_session.driver.options[:url].should eq ENV['REMOTE_URL']
           Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:'browserstack.debug'].should == 'true'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:'browserstack.debug'].should eq 'true'
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Remote Selenium driver and specified Custom Capabilites for BrowserStack" do
+      context 'with Remote Selenium driver and specified Custom Capabilites for BrowserStack' do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['BS_BUILD'] = 'browserstack build 1'
@@ -447,30 +438,30 @@ def delete_session
           ENV['REMOTE_URL'] = 'http://hub.browserstack.com'
         end
 
-        it "should be initialized correctly" do
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :remote
-          Capybara.current_session.driver.options[:url].should == ENV['REMOTE_URL']
+          Capybara.current_session.driver.options[:browser].should eq :remote
+          Capybara.current_session.driver.options[:url].should eq ENV['REMOTE_URL']
           Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
           Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:build].should == ENV['BS_BUILD']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:'browserstack.debug'].should == ENV['BS_DEBUG']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:device].should == ENV['BS_DEVICE']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:deviceOrientation].should == ENV['BS_DEVICE_ORIENTATION']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:project].should == ENV['BS_PROJECT']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:resolution].should == ENV['BS_RESOLUTION']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:os].should == ENV['PLATFORM']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:os_version].should == ENV['PLATFORM_VERSION']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :iPhone
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_version].should == ENV['REMOTE_BROWSER_VERSION']
-        end
-        it_behaves_like "Selenium Driver Options Array"
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:build].should eq ENV['BS_BUILD']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:'browserstack.debug'].should eq ENV['BS_DEBUG']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:device].should eq ENV['BS_DEVICE']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:deviceOrientation].should eq ENV['BS_DEVICE_ORIENTATION']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:project].should eq ENV['BS_PROJECT']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:resolution].should eq ENV['BS_RESOLUTION']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:os].should eq ENV['PLATFORM']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:os_version].should eq ENV['PLATFORM_VERSION']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should eq :iPhone
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_version].should eq ENV['REMOTE_BROWSER_VERSION']
+        end
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Remote Selenium driver and specified Custom Capabilites for Appium" do
+      context 'with Remote Selenium driver and specified Custom Capabilites for Appium' do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_URL'] = 'http://127.0.0.1:4273'
@@ -480,86 +471,85 @@ def delete_session
           ENV['APPIUM_UDID'] = 'abd234'
         end
 
-        it "should be initialized correctly" do
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :remote
+          Capybara.current_session.driver.options[:browser].should eq :remote
           Capybara.current_session.driver.options[:url].should == ENV['REMOTE_URL']
           Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
           Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
     end
 
-    describe "should allow Mechanize driver to be created" do
-      context "with minimal Mechanize driver" do
+    describe 'should allow Mechanize driver to be created' do
+      context 'with minimal Mechanize driver' do
         before do
           ENV['BROWSER'] = 'mechanize'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do 
           Capybara.delete_session
           CapybaraSetup.new.driver.should == :mechanize
           Capybara.current_session.driver.should be_a_kind_of Capybara::Mechanize::Driver
         end
 
-        context "with maximal Mechanize driver" do
+        context 'with maximal Mechanize driver' do
           before do
             ENV['BROWSER'] = 'mechanize'
             ENV['ENVIRONMENT'] = 'test'
             ENV['HTTP_PROXY'] = 'http://example.cache.co.uk:80'
           end
 
-          it "should be initialized correctly" do
+          it 'should be initialized correctly' do
             Capybara.delete_session
-            CapybaraSetup.new.driver.should == :mechanize
+            CapybaraSetup.new.driver.should eq :mechanize
             Capybara.current_session.driver.should be_a_kind_of Capybara::Mechanize::Driver
-            #note can no longer unit test this due to change in Capybara wiping brower instance
-            #Capybara.current_session.driver.browser.agent.proxy_addr.should == 'example.cache.co.uk'
-            #Capybara.current_session.driver.browser.agent.proxy_port.should == 80
+            # note can no longer unit test this due to change in Capybara wiping brower instance
+            # Capybara.current_session.driver.browser.agent.proxy_addr.should == 'example.cache.co.uk'
+            # Capybara.current_session.driver.browser.agent.proxy_port.should == 80
 
           end
         end
       end
 
-    describe "should allow Poltergeist driver to be created" do
-      context "with minimal Poltergeist driver" do
+    describe 'should allow Poltergeist driver to be created' do
+      context 'with minimal Poltergeist driver' do
         before do
           ENV['BROWSER'] = 'poltergeist'
         end
 
-        it "should be initialized correctly" do
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :poltergeist
+          CapybaraSetup.new.driver.should eq :poltergeist
           Capybara.current_session.driver.should be_a_kind_of Capybara::Poltergeist::Driver
         end
 
-        context "with maximal Poltergeist driver" do
+        context 'with maximal Poltergeist driver' do
           before do
             ENV['BROWSER'] = 'poltergeist'
             ENV['ENVIRONMENT'] = 'test'
             ENV['HTTP_PROXY'] = 'http://example.cache.co.uk:80'
           end
 
-          it "should be initialized correctly" do
+          it 'should be initialized correctly' do
             Capybara.delete_session
-            CapybaraSetup.new.driver.should == :poltergeist
+            CapybaraSetup.new.driver.should eq :poltergeist
             Capybara.current_session.driver.should be_a_kind_of Capybara::Poltergeist::Driver
           end
         end
       end
     end
 
-      describe "should permit certificate files to be incorporated into firefox profiles" do
-
-        context "integration tests for update_firefox_profile_with_certificates() method" do
+      describe 'should permit certificate files to be incorporated into firefox profiles' do
+        context 'integration tests for update_firefox_profile_with_certificates() method' do
           before do
-            def write_random_data(file_path) 
+            def write_random_data(file_path)
               file_data = SecureRandom.hex
-              File.open(file_path, "w") { |a_file|
+              File.open(file_path, 'w') { |a_file|
                 a_file.write(file_data)
               }
               file_data
@@ -568,10 +558,10 @@ def write_random_data(file_path)
             def compare_file_data(profile_path, file_name, expected_data)
               profile_file = profile_path + File::SEPARATOR + file_name
               actual_data = nil
-              File.open(profile_file, "r") { |a_file|
+              File.open(profile_file, 'r') { |a_file|
                 actual_data = a_file.read
               }
-              expected_data.should == actual_data 
+              expected_data.should == actual_data
             end
 
             ENV['BROWSER'] = 'firefox'
@@ -587,16 +577,16 @@ def compare_file_data(profile_path, file_name, expected_data)
             FileUtils.remove_entry @cert_dir
           end
 
-          it "should raise an exception if the cert8.db file is missing in the source directory" do
+          it 'should raise an exception if the cert8.db file is missing in the source directory' do
             profile = Selenium::WebDriver::Firefox::Profile.new
 
-            key3_data = write_random_data(@key3_db)
-            secmod_data = write_random_data(@secmod_db)
+            write_random_data(@key3_db)
+            write_random_data(@secmod_db)
 
             an_exception = nil
-            begin 
+            begin
               CapybaraSetup.new.instance_exec(profile, @cert_dir) { |profile, certificate_path|
-                update_firefox_profile_with_certificates(profile, certificate_path) 
+                update_firefox_profile_with_certificates(profile, certificate_path)
               }
             rescue RuntimeError => e
               an_exception = e
@@ -605,16 +595,15 @@ def compare_file_data(profile_path, file_name, expected_data)
             an_exception.should_not be_nil
           end
 
-          it "should raise an exception if the key3.db file is missing in the source directory" do
+          it 'should raise an exception if the key3.db file is missing in the source directory' do
             profile = Selenium::WebDriver::Firefox::Profile.new
 
-            cert8_data = write_random_data(@cert8_db)
-            secmod_data = write_random_data(@secmod_db)
-           
+            write_random_data(@cert8_db)
+            write_random_data(@secmod_db)
             an_exception = nil
-            begin 
+            begin
               CapybaraSetup.new.instance_exec(profile, @cert_dir) { |profile, certificate_path|
-                update_firefox_profile_with_certificates(profile, certificate_path) 
+                update_firefox_profile_with_certificates(profile, certificate_path)
               }
             rescue RuntimeError => e
               an_exception = e
@@ -622,17 +611,16 @@ def compare_file_data(profile_path, file_name, expected_data)
 
             an_exception.should_not be_nil
           end
-          
-          it "should raise an exception if the secmod.db file is missing in the source directory" do
+
+          it 'should raise an exception if the secmod.db file is missing in the source directory' do
             profile = Selenium::WebDriver::Firefox::Profile.new
 
-            cert8_data = write_random_data(@cert8_db)
-            key3_data = write_random_data(@key3_db)
-  
+            write_random_data(@cert8_db)
+            write_random_data(@key3_db)
             an_exception = nil
-            begin 
+            begin
               CapybaraSetup.new.instance_exec(profile, @cert_dir) { |profile, certificate_path|
-                update_firefox_profile_with_certificates(profile, certificate_path) 
+                update_firefox_profile_with_certificates(profile, certificate_path)
               }
             rescue RuntimeError => e
               an_exception = e
@@ -641,8 +629,7 @@ def compare_file_data(profile_path, file_name, expected_data)
             an_exception.should_not be_nil
           end
 
-          it "should update a firefox profile with valid references to certificate db files" do
-       
+          it 'should update a firefox profile with valid references to certificate db files' do
             profile = Selenium::WebDriver::Firefox::Profile.new
 
             cert8_data = write_random_data(@cert8_db)
@@ -651,7 +638,7 @@ def compare_file_data(profile_path, file_name, expected_data)
 
             setup = CapybaraSetup.new
             result = setup.instance_exec(profile, @cert_dir) { |profile, certificate_path|
-              update_firefox_profile_with_certificates(profile, certificate_path) 
+              update_firefox_profile_with_certificates(profile, certificate_path)
             }
             profile_path = result.layout_on_disk
             compare_file_data(profile_path, 'cert8.db', cert8_data)
@@ -659,41 +646,36 @@ def compare_file_data(profile_path, file_name, expected_data)
             compare_file_data(profile_path, 'secmod.db', secmod_data)
           end
 
-          it "should update a firefox profile with references to certificate db files with prefixes" do
-       
+          it 'should update a firefox profile with references to certificate db files with prefixes' do
             profile = Selenium::WebDriver::Firefox::Profile.new
             cert_prefix = 'a'
             @cert8_db = @cert_dir + File::SEPARATOR + cert_prefix + 'cert8.db'
             @key3_db = @cert_dir + File::SEPARATOR + cert_prefix + 'key3.db'
             @secmod_db = @cert_dir + File::SEPARATOR + cert_prefix + 'secmod.db'
- 
             cert8_data = write_random_data(@cert8_db)
             key3_data = write_random_data(@key3_db)
             secmod_data = write_random_data(@secmod_db)
 
             setup = CapybaraSetup.new
-            result = setup.instance_exec(profile, @cert_dir, cert_prefix) { |profile, certificate_path, certificate_prefix, result|
-              update_firefox_profile_with_certificates(profile, certificate_path, certificate_prefix) 
+            result = setup.instance_exec(profile, @cert_dir, cert_prefix) { |profile, certificate_path, certificate_prefix, _result|
+              update_firefox_profile_with_certificates(profile, certificate_path, certificate_prefix)
             }
             profile_path = result.layout_on_disk
             compare_file_data(profile_path, 'cert8.db', cert8_data)
             compare_file_data(profile_path, 'key3.db', key3_data)
             compare_file_data(profile_path, 'secmod.db', secmod_data)
           end
-
         end
-
       end
 
-      describe "The BBC-INTERNAL firefox profile should be set up with the correct proxy settings whether working behind a proxy or not" do
-
-        context "no proxy settings provided" do
+      describe 'The BBC-INTERNAL firefox profile should be set up with the correct proxy settings whether working behind a proxy or not' do
+        context 'no proxy settings provided' do
           before do
             ENV['BROWSER'] = 'firefox'
             ENV['ENVIRONMENT'] = 'test'
           end
 
-          it "should create the firefox profile settings correctly" do
+          it 'should create the firefox profile settings correctly' do
             setup = CapybaraSetup.new
             profile = setup.instance_exec('BBC_INTERNAL', nil) { |profile_name, additional_prefs|
               create_profile(profile_name, additional_prefs)
@@ -705,24 +687,24 @@ def compare_file_data(profile_path, file_name, expected_data)
           end
         end
 
-        context "proxy settings provided" do
+        context 'proxy settings provided' do
           before do
             @proxy_host = 'example.cache.co.uk'
             @proxy_port = 6789
             ENV['BROWSER'] = 'firefox'
             ENV['ENVIRONMENT'] = 'test'
-            ENV['HTTP_PROXY'] = "http://#{@proxy_host}:#{@proxy_port}"
+            ENV['HTTP_PROXY'] = 'http://#{@proxy_host}:#{@proxy_port}'
           end
 
-          it "should create the firefox profile correctly" do
+          it 'should create the firefox profile correctly' do
             setup = CapybaraSetup.new
             profile = setup.instance_exec('BBC_INTERNAL', nil) { |profile_name, additional_prefs|
               create_profile(profile_name, additional_prefs)
             }
 
-            profile.instance_variable_get('@additional_prefs')['network.proxy.type'].should == 1    
-            profile.instance_variable_get('@additional_prefs')['network.proxy.http'].should == @proxy_host
-            profile.instance_variable_get('@additional_prefs')['network.proxy.http_port'].should == @proxy_port
+            profile.instance_variable_get('@additional_prefs')['network.proxy.type'].should eq 1
+            profile.instance_variable_get('@additional_prefs')['network.proxy.http'].should eq @proxy_host
+            profile.instance_variable_get('@additional_prefs')['network.proxy.http_port'].should eq @proxy_port
           end
         end
       end
diff --git a/spec/frameworks_cucumber_spec.rb b/spec/frameworks_cucumber_spec.rb
index 1d10a6a..cdfbd62 100644
--- a/spec/frameworks_cucumber_spec.rb
+++ b/spec/frameworks_cucumber_spec.rb
@@ -1,162 +1,158 @@
 require 'spec_helper'
 
 describe Frameworks::EnvHelper do
-
   before do
     ENV.clear
-    ENV['BROWSER'] = 'test' #mandatory data to prevent validation exception
+    ENV['BROWSER'] = 'test' # mandatory data to prevent validation exception
   end
 
-  describe "set base url correctly" do
+  describe 'set base url correctly' do
     include Frameworks::EnvHelper
 
-    it "should be able to set a local url" do
+    it 'should be able to set a local url' do
       ENV['ENVIRONMENT'] = 'sandbox'
       generate_base_urls
-      @base_url.should == 'http://pal.sandbox.dev.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.sandbox.dev.bbc.co.uk'
-      @static_base_url.should == 'http://static.sandbox.dev.bbc.co.uk'
-      @m_base_url.should == 'http://m.sandbox.dev.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.sandbox.dev.bbc.co.uk'
+      @base_url.should eq('http://pal.sandbox.dev.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.sandbox.dev.bbc.co.uk')
+      @static_base_url.should eq('http://static.sandbox.dev.bbc.co.uk')
+      @m_base_url.should eq('http://m.sandbox.dev.bbc.co.uk')
+      @mobile_base_url.should eq('http://mobile.sandbox.dev.bbc.co.uk')
     end
 
-    it "should be able to set a local system6 url" do
+    it 'should be able to set a local system6 url' do
       ENV['ENVIRONMENT'] = 'sandbox6'
       generate_base_urls
-      @base_url.should == 'http://sandbox.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.sandbox.bbc.co.uk'
-      @static_base_url.should == 'http://static.sandbox.bbc.co.uk'
-      @m_base_url.should == 'http://m.sandbox.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.sandbox.bbc.co.uk'
+      @base_url.should eq('http://sandbox.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.sandbox.bbc.co.uk')
+      @static_base_url.should eq('http://static.sandbox.bbc.co.uk')
+      @m_base_url.should eq('http://m.sandbox.bbc.co.uk')
+      @mobile_base_url.should eq('http://mobile.sandbox.bbc.co.uk')
     end
 
-    it "should be able to set a base url" do
+    it 'should be able to set a base url' do
       ENV['ENVIRONMENT'] = 'foo'
       generate_base_urls
-      @base_url.should == 'http://www.foo.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.foo.bbc.co.uk'
-      @static_base_url.should == 'http://static.foo.bbci.co.uk'
-      @open_base_url.should == 'http://open.foo.bbc.co.uk'
-      @m_base_url.should == 'http://m.foo.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.foo.bbc.co.uk'
+      @base_url.should eq('http://www.foo.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.foo.bbc.co.uk')
+      @static_base_url.should eq('http://static.foo.bbci.co.uk')
+      @open_base_url.should eq('http://open.foo.bbc.co.uk')
+      @m_base_url.should eq('http://m.foo.bbc.co.uk')
+      @mobile_base_url.should eq('http://mobile.foo.bbc.co.uk')
     end
 
-    it "should set correct static base for www.live.bbc.co.uk" do
+    it 'should set correct static base for www.live.bbc.co.uk' do
       ENV['ENVIRONMENT'] = 'live'
       generate_base_urls
-      @base_url.should == 'http://www.live.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.live.bbc.co.uk'
-      @static_base_url.should == 'http://static.bbci.co.uk'
-      @open_base_url.should == 'http://open.live.bbc.co.uk'
-      @m_base_url.should == 'http://m.live.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.live.bbc.co.uk'
+      @base_url.should eq('http://www.live.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.live.bbc.co.uk')
+      @static_base_url.should eq('http://static.bbci.co.uk')
+      @open_base_url.should eq('http://open.live.bbc.co.uk')
+      @m_base_url.should eq('http://m.live.bbc.co.uk')
+      @mobile_base_url.should eq('http://mobile.live.bbc.co.uk')
     end
 
-    it "should be able to set a base url and not be case sensitive" do
+    it 'should be able to set a base url and not be case sensitive' do
       ENV['ENVIRONMENT'] = 'fOo'
       generate_base_urls
-      @base_url.should == 'http://www.foo.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.foo.bbc.co.uk'
-      @static_base_url.should == 'http://static.foo.bbci.co.uk'
-      @open_base_url.should == 'http://open.foo.bbc.co.uk'
-      @m_base_url.should == 'http://m.foo.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.foo.bbc.co.uk'
+      @base_url.should eq('http://www.foo.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.foo.bbc.co.uk')
+      @static_base_url.should eq('http://static.foo.bbci.co.uk')
+      @open_base_url.should eq('http://open.foo.bbc.co.uk')
+      @m_base_url.should eq('http://m.foo.bbc.co.uk')
+      @mobile_base_url.should eq('http://mobile.foo.bbc.co.uk')
     end
 
-    it "should set correct static base for www.live.bbc.co.uk and not be case sensitive" do
+    it 'should set correct static base for www.live.bbc.co.uk and not be case sensitive' do
       ENV['ENVIRONMENT'] = 'LiVe'
       generate_base_urls
-      @base_url.should == 'http://www.live.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.live.bbc.co.uk'
-      @static_base_url.should == 'http://static.bbci.co.uk'
-      @open_base_url.should == 'http://open.live.bbc.co.uk'
-      @m_base_url.should == 'http://m.live.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.live.bbc.co.uk'
+      @base_url.should eq('http://www.live.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.live.bbc.co.uk')
+      @static_base_url.should eq('http://static.bbci.co.uk')
+      @open_base_url.should eq('http://open.live.bbc.co.uk')
+      @m_base_url.should eq('http://m.live.bbc.co.uk')
+      @mobile_base_url.should eq('http://mobile.live.bbc.co.uk')
     end
 
-
     it "should be able to set a 'classic' live url and not be case sensitive" do
       ENV['ENVIRONMENT'] = 'Live'
-      ENV['WWW_LIVE'] = 'false' 
+      ENV['WWW_LIVE'] = 'false'
       generate_base_urls
-      @base_url.should == 'http://www.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.bbc.co.uk'
-      @static_base_url.should == 'http://static.bbci.co.uk'
-      @open_base_url.should == 'http://open.bbc.co.uk'
-      @m_base_url.should == 'http://m.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.bbc.co.uk'
+      @base_url.should eq('http://www.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.bbc.co.uk')
+      @static_base_url.should eq('http://static.bbci.co.uk')
+      @open_base_url.should eq('http://open.bbc.co.uk')
+      @m_base_url.should eq('http://m.bbc.co.uk')
+      @mobile_base_url.should eq('http://mobile.bbc.co.uk')
     end
 
-    it "should be able to set pal url and not be case sensitive" do
+    it 'should be able to set pal url and not be case sensitive' do
       ENV['ENVIRONMENT'] = 'Live'
       generate_base_urls
-      @base_url.should == 'http://www.live.bbc.co.uk'
-      @pal_base_url.should == 'http://pal.live.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.live.bbc.co.uk'
-      @static_base_url.should == 'http://static.bbci.co.uk'
-      @open_base_url.should == 'http://open.live.bbc.co.uk'
-      @m_base_url.should == 'http://m.live.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.live.bbc.co.uk'
+      @base_url.should eq('http://www.live.bbc.co.uk')
+      @pal_base_url.should eq('http://pal.live.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.live.bbc.co.uk')
+      @static_base_url.should eq('http://static.bbci.co.uk')
+      @open_base_url.should eq('http://open.live.bbc.co.uk')
+      @m_base_url.should eq('http://m.live.bbc.co.uk')
+      @mobile_base_url.should eq('http://mobile.live.bbc.co.uk')
     end
 
-    it "pal url should still have environment even if asking for classic live url" do
+    it 'pal url should still have environment even if asking for classic live url' do
       ENV['ENVIRONMENT'] = 'Live'
-      ENV['WWW_LIVE'] = 'false' 
+      ENV['WWW_LIVE'] = 'false'
       generate_base_urls
-      @base_url.should == 'http://www.bbc.co.uk'
-      @pal_base_url.should == 'http://pal.live.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.bbc.co.uk'
-      @static_base_url.should == 'http://static.bbci.co.uk'
-      @open_base_url.should == 'http://open.bbc.co.uk'
-      @m_base_url.should == 'http://m.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.bbc.co.uk'
+      @base_url.should eq('http://www.bbc.co.uk')
+      @pal_base_url.should eq('http://pal.live.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.bbc.co.uk')
+      @static_base_url.should eq('http://static.bbci.co.uk')
+      @open_base_url.should eq('http://open.bbc.co.uk')
+      @m_base_url.should eq('http://m.bbc.co.uk')
+      @mobile_base_url.should eq('http://mobile.bbc.co.uk')
     end
 
-
-
-    it "should be able to set scheme to ssl" do
+    it 'should be able to set scheme to ssl' do
       ENV['SCHEME'] = 'https'
       ENV['ENVIRONMENT'] = 'foo'
       generate_base_urls
-      @base_url.should == 'https://www.foo.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.foo.bbc.co.uk'
-      @static_base_url.should == 'https://static.foo.bbci.co.uk'
-      @open_base_url.should == 'https://open.foo.bbc.co.uk'
+      @base_url.should eq('https://www.foo.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.foo.bbc.co.uk')
+      @static_base_url.should eq('https://static.foo.bbci.co.uk')
+      @open_base_url.should eq('https://open.foo.bbc.co.uk')
     end
 
-    it "should be able to set proxy host and port correctly to use in tests using HTTP_PROXY env variable" do
+    it 'should be able to set proxy host and port correctly to use in tests using HTTP_PROXY env variable' do
       ENV['ENVIRONMENT'] = 'foo'
       ENV['HTTP_PROXY'] = 'http://mycache.co.uk:8080'
       generate_base_urls
-      @proxy_host.should == "mycache.co.uk"
-      @proxy_port.should == "8080"
+      @proxy_host.should eq('mycache.co.uk')
+      @proxy_port.should eq('8080')
     end
 
-    it "should be able to set proxy host correctly to use in tests using http_proxy env variable" do
+    it 'should be able to set proxy host correctly to use in tests using http_proxy env variable' do
       ENV['ENVIRONMENT'] = 'foo'
       ENV['http_proxy'] = 'http://mycache.co.uk:8080'
       generate_base_urls
-      @proxy_host.should == "mycache.co.uk"
-      @proxy_port.should == "8080"
+      @proxy_host.should eq('mycache.co.uk')
+      @proxy_port.should eq('8080')
     end
 
-    it "should be able to use 80 as default proxy port when none specified" do
+    it 'should be able to use 80 as default proxy port when none specified' do
       ENV['ENVIRONMENT'] = 'foo'
       ENV['http_proxy'] = 'http://mycache.co.uk'
       generate_base_urls
-      @proxy_host.should == "mycache.co.uk"
-      @proxy_port.should == "80"
+      @proxy_host.should eq('mycache.co.uk')
+      @proxy_port.should eq('80')
     end
 
     it "should be able to handle an environment variable which doesn't have the protocol" do
       ENV['ENVIRONMENT'] = 'foo'
       ENV['http_proxy'] = 'mycache.co.uk'
       generate_base_urls
-      @proxy_host.should == "mycache.co.uk"
-      @proxy_port.should == "80"
+      @proxy_host.should eq('mycache.co.uk')
+      @proxy_port.should eq('80')
     end
 
-    it "should be able to have an empty http_proxy environment variable" do
+    it 'should be able to have an empty http_proxy environment variable' do
       ENV['ENVIRONMENT'] = 'foo'
       ENV['http_proxy'] = ''
       generate_base_urls
@@ -164,115 +160,96 @@
       @proxy_port.should be_nil
     end
 
-    it "should be able to set a local url with expected domain" do
+    it 'should be able to set a local url with expected domain' do
       ENV['ENVIRONMENT'] = 'sandbox'
       ENV['FW_BBC_DOMAIN'] = 'bbc.com'
       generate_base_urls
-      @base_url.should == 'http://pal.sandbox.dev.bbc.com'
-      @ssl_base_url.should == 'https://ssl.sandbox.dev.bbc.com'
-      @static_base_url.should == 'http://static.sandbox.dev.bbc.com'
-      @m_base_url.should == 'http://m.sandbox.dev.bbc.com'
-      @mobile_base_url.should == 'http://mobile.sandbox.dev.bbc.com'
+      @base_url.should eq('http://pal.sandbox.dev.bbc.com')
+      @ssl_base_url.should eq('https://ssl.sandbox.dev.bbc.com')
+      @static_base_url.should eq('http://static.sandbox.dev.bbc.com')
+      @m_base_url.should eq('http://m.sandbox.dev.bbc.com')
+      @mobile_base_url.should eq('http://mobile.sandbox.dev.bbc.com')
     end
 
-    it "should be able to set a local system6 url with expected domain" do
+    it 'should be able to set a local system6 url with expected domain' do
       ENV['ENVIRONMENT'] = 'sandbox6'
       ENV['FW_BBC_DOMAIN'] = 'bbc.com'
       generate_base_urls
-      @base_url.should == 'http://sandbox.bbc.com'
-      @ssl_base_url.should == 'https://ssl.sandbox.bbc.com'
-      @static_base_url.should == 'http://static.sandbox.bbc.com'
-      @m_base_url.should == 'http://m.sandbox.bbc.com'
-      @mobile_base_url.should == 'http://mobile.sandbox.bbc.com'
+      @base_url.should eq('http://sandbox.bbc.com')
+      @ssl_base_url.should eq('https://ssl.sandbox.bbc.com')
+      @static_base_url.should eq('http://static.sandbox.bbc.com')
+      @m_base_url.should eq('http://m.sandbox.bbc.com')
+      @mobile_base_url.should eq('http://mobile.sandbox.bbc.com')
     end
 
-    it "should be able to set a base url with expected domain" do
+    it 'should be able to set a base url with expected domain' do
       ENV['ENVIRONMENT'] = 'foo'
       ENV['FW_BBC_DOMAIN'] = 'bbc.com'
       generate_base_urls
-      @base_url.should == 'http://www.foo.bbc.com'
-      @ssl_base_url.should == 'https://ssl.foo.bbc.com'
-      @static_base_url.should == 'http://static.foo.bbci.co.uk'
-      @open_base_url.should == 'http://open.foo.bbc.com'
-      @m_base_url.should == 'http://m.foo.bbc.com'
-      @mobile_base_url.should == 'http://mobile.foo.bbc.com'
+      @base_url.should eq('http://www.foo.bbc.com')
+      @ssl_base_url.should eq('https://ssl.foo.bbc.com')
+      @static_base_url.should eq('http://static.foo.bbci.co.uk')
+      @open_base_url.should eq('http://open.foo.bbc.com')
+      @m_base_url.should eq('http://m.foo.bbc.com')
+      @mobile_base_url.should eq('http://mobile.foo.bbc.com')
     end
 
-    it "should set public facing live domain" do
+    it 'should set public facing live domain' do
       ENV['ENVIRONMENT'] = 'live'
       ENV['WWW_LIVE'] = 'false'
       ENV['FW_BBC_DOMAIN'] = 'bbc.com'
       generate_base_urls
-      @base_url.should == 'http://www.bbc.com'
-      @ssl_base_url.should == 'https://ssl.bbc.com'
-      @static_base_url.should == 'http://static.bbci.co.uk'
-      @open_base_url.should == 'http://open.bbc.com'
-      @m_base_url.should == 'http://m.bbc.com'
-      @mobile_base_url.should == 'http://mobile.bbc.com'
-    end
-
-=begin
-#don't want to push proxy addr online
-    it "should be able to validate xhtml online" do
-      @proxy_host = ''
-      @proxy_port = ''
-      xhtml = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>a</title></head><body><p>a</p></body></html>'
-      validate_online(xhtml)
-    end
-
-    it "should be able to report errors for invalid markup" do
-      @proxy_host = ''
-      @proxy_port = ''
-      xhtml = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><nosuchelement><title>a</title></head><body><p>a</p></body></html>'
-      expect {
-        validate_online(xhtml)
-      }.to raise_error(RuntimeError)
+      @base_url.should eq('http://www.bbc.com')
+      @ssl_base_url.should eq('https://ssl.bbc.com')
+      @static_base_url.should eq('http://static.bbci.co.uk')
+      @open_base_url.should eq('http://open.bbc.com')
+      @m_base_url.should eq('http://m.bbc.com')
+      @mobile_base_url.should eq('http://mobile.bbc.com')
     end
-=end
   end
 
-    describe "independent mechanize agent" do
+  describe 'independent mechanize agent' do
     include Frameworks::EnvHelper
 
-    it "should allow you to create an independent, configured mechanize object" do
+    it 'should allow you to create an independent, configured mechanize object' do
       ENV['HTTP_PROXY'] = 'http://mycache.co.uk:80'
       agent = new_mechanize
       agent.should be_a_kind_of Mechanize
-      agent.proxy_addr.should == 'mycache.co.uk'
+      agent.proxy_addr.should eq('mycache.co.uk')
     end
 
-    it "the proxy should be separately configurable" do
-      agent = new_mechanize(http_proxy='http://mycache.co.uk:80')
+    it 'the proxy should be separately configurable' do
+      agent = new_mechanize('http://mycache.co.uk:80')
       agent.should be_a_kind_of Mechanize
-      agent.proxy_addr.should == 'mycache.co.uk'
+      agent.proxy_addr.should eq('mycache.co.uk')
     end
 
-   it "the proxy should be ignored if the no_proxy exclusion is set" do
+    it 'the proxy should be ignored if the no_proxy exclusion is set' do
       proxy_host = 'mycache.co.uk'
       proxy_port = '80'
-      proxy_uri = 'http://'  + proxy_host + ':' + proxy_port
+      proxy_uri = 'http://' + proxy_host + ':' + proxy_port
       no_proxy = 'ignore_this_host'
       ENV['NO_PROXY'] = no_proxy
-      agent = new_mechanize(http_proxy=proxy_uri)
+      agent = new_mechanize(proxy_uri)
       expect(agent).to be_a_kind_of Mechanize
       expect(agent.agent.http.proxy_uri.host).to eq(proxy_host)
       expect(agent.agent.http.proxy_uri.port).to eq(proxy_port.to_i)
-      no_proxy_array = [ no_proxy ]
+      no_proxy_array = [no_proxy]
       expect(agent.agent.http.no_proxy).to eq(no_proxy_array)
     end
 
-    it "the proxy should be ignored if the no_proxy exclusion is set with multiple values" do
+    it 'the proxy should be ignored if the no_proxy exclusion is set with multiple values' do
       proxy_host = 'mycache.co.uk'
       proxy_port = '80'
-      proxy_uri = 'http://'  + proxy_host + ':' + proxy_port
+      proxy_uri = 'http://' + proxy_host + ':' + proxy_port
       no_proxy1 = 'ignore_this_host'
       no_proxy2 = '.and.this.domain'
       ENV['NO_PROXY'] = no_proxy1 + ', ' + no_proxy2
-      agent = new_mechanize(http_proxy=proxy_uri)
+      agent = new_mechanize(proxy_uri)
       expect(agent).to be_a_kind_of Mechanize
       expect(agent.agent.http.proxy_uri.host).to eq(proxy_host)
       expect(agent.agent.http.proxy_uri.port).to eq(proxy_port.to_i)
-      no_proxy_array = [ no_proxy1, no_proxy2 ]
+      no_proxy_array = [no_proxy1, no_proxy2]
       expect(agent.agent.http.no_proxy).to eq(no_proxy_array)
     end
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 07f6632..02cc03a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -9,7 +9,7 @@
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift "#{dir}/../lib"
 c = Cucumber::Configuration.new
-Cucumber::RbSupport::RbLanguage.new(Cucumber::Runtime.new, c) #Need to load Cucumber runtime, so World is available 
+Cucumber::RbSupport::RbLanguage.new(Cucumber::Runtime.new, c) # Need to load Cucumber runtime, so World is available
 
 require 'frameworks/capybara'
 require 'frameworks/cucumber'
diff --git a/spec/unit_test_monkeypatches.rb b/spec/unit_test_monkeypatches.rb
index 56dcc88..b721543 100644
--- a/spec/unit_test_monkeypatches.rb
+++ b/spec/unit_test_monkeypatches.rb
@@ -4,17 +4,14 @@
 module Selenium
   module WebDriver
     module Firefox
-
       # @api private
       module Util
         module_function
 
         def app_data_path
-           File.dirname(__FILE__)
+          File.dirname(__FILE__)
         end
-
       end # Util
     end # Firefox
   end # WebDriver
 end # Selenium
-
diff --git a/spec/wait_spec.rb b/spec/wait_spec.rb
index c94338a..bf87887 100644
--- a/spec/wait_spec.rb
+++ b/spec/wait_spec.rb
@@ -4,19 +4,18 @@
   let(:test) { Class.new { include FrameworksCapybara::Wait }.new }
 
   describe 'wait_for' do
-    it "should exit silently if the block returns true" do
+    it 'should exit silently if the block returns true' do
       test.wait_for { true }
     end
 
-    it "should raise an exception if the default timeout expires" do
-      start_time = Time.now
+    it 'should raise an exception if the default timeout expires' do
       expect { test.wait_for('foo') { true == false } }.to raise_error
     end
 
-    it "should raise an exception if the specified timeout expires" do
+    it 'should raise an exception if the specified timeout expires' do
       start_time = Time.now
       expect {
-        test.wait_for('',timeout: 1) do
+        test.wait_for('', timeout: 1) do
           Time.now > (start_time + (2 * 60))
         end
       }.to raise_error
@@ -37,12 +36,12 @@
   describe 'wait for an arbitrary assertion' do
     it 'should catch provided exception until block no longer raises it' do
       error = ZeroDivisionError
-      expect(test.wait_for_no_exception('msg', error) { 1/1 == 1 }).to eql true
+      expect(test.wait_for_no_exception('msg', error) { 1 / 1 == 1 }).to eql true
     end
 
     it 'should catch provided exception until block no longer raises it or timeout' do
       error = ZeroDivisionError
-      expect { test.wait_for_no_exception('msg', error) { expect(1/0).to eql 1 } }.to raise_error(error)
+      expect { test.wait_for_no_exception('msg', error) { expect(1 / 0).to eql 1 } }.to raise_error(error)
     end
   end
 end

From 83ceb9a249d3cf29d1d21621b0fceb463f6333e3 Mon Sep 17 00:00:00 2001
From: Ankit Jain <jaina07@mc-s089994.national.core.bbc.co.uk>
Date: Tue, 18 Jul 2017 18:20:58 +0100
Subject: [PATCH 43/62] Added save screenshot code

---
 lib/frameworks/utils.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/frameworks/utils.rb b/lib/frameworks/utils.rb
index 978c485..1f6c228 100644
--- a/lib/frameworks/utils.rb
+++ b/lib/frameworks/utils.rb
@@ -50,5 +50,12 @@ def switch_to_last_opened_window
       Capybara.page.switch_to_window(Capybara.page.windows.last)
       Capybara.page.windows.first.close
     end
+
+    def save_and_link_screenshot
+      FileUtils.mkdir_p('reports') unless File.directory?('reports')
+      current_time = Time.new.strftime('%Y-%m-%d-%H-%M-%S')
+      Capybara.current_session.driver.save_screenshot("./reports/Screenshot_#{current_time}.png")
+      embed "./reports/Screenshot_#{current_time}.png", 'image/png', "Actual screenshot of the error at #{current_url}"
+    end
   end
 end

From dfdcf7c8aee28224d34d76b2fb1476330ad82777 Mon Sep 17 00:00:00 2001
From: Swati Tabib <swati.tabib.ext@bbc.co.uk>
Date: Tue, 25 Jul 2017 16:41:09 +0100
Subject: [PATCH 44/62] resolving rubocop offenses

---
 Rakefile                             | 2 +-
 frameworks-capybara.gemspec          | 2 +-
 lib/frameworks/capybara.rb           | 6 +++---
 lib/frameworks/cucumber.rb           | 2 +-
 lib/frameworks/extensions/patches.rb | 2 +-
 lib/frameworks/utils.rb              | 5 +++--
 lib/tasks/parallel-tasks.rb          | 4 ++--
 spec/frameworks_capybara_spec.rb     | 3 +--
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Rakefile b/Rakefile
index 3026c82..89db265 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,6 +7,6 @@ Bundler::GemHelper.install_tasks
 
 desc 'Run all examples'
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = %w[--color]
+  t.rspec_opts = %w(--color)
 end
 task default: [:spec]
diff --git a/frameworks-capybara.gemspec b/frameworks-capybara.gemspec
index a379ea1..789847e 100644
--- a/frameworks-capybara.gemspec
+++ b/frameworks-capybara.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.email = ['']
   s.description = 'Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches'
 
-  s.files = Dir.glob('{features,lib,bin,config,vendor,.bundle}/**/*') + %w[Gemfile Gemfile.lock]
+  s.files = Dir.glob('{features,lib,bin,config,vendor,.bundle}/**/*') + %w(Gemfile Gemfile.lock)
 
   s.require_paths = ['lib']
   s.rubygems_version = '2.4.2'
diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index 8d15713..f81be6e 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -230,13 +230,13 @@ def register_poltergeist_driver(opts)
     app = Proc.new do
       ['200', { 'Content-Type' => 'text/html' }, ['A barebones rack app.']]
     end
-    phantom_opts = %w[--ignore-ssl-errors=true]
+    phantom_opts = %w(--ignore-ssl-errors=true)
     phantom_opts.push "--ssl-client-certificate-file=#{ENV['FW_CERT_LOCATION']}" if ENV['FW_CERT_LOCATION']
     phantom_opts.push "--proxy=#{@proxy_host}:#{@proxy_port}" if @proxy_host && @proxy_port
     Capybara.app = app
     Capybara.run_server = false
     options = {
-      js_errors: false,
+      js_errors: true,
       timeout:   120,
       window_size: [1200, 1000],
       phantomjs_options: phantom_opts,
@@ -259,7 +259,7 @@ def register_headless_chromium_driver(_opts)
       caps = Selenium::WebDriver::Remote::Capabilities.chrome(
         'chromeOptions' => {
           'binary' => '/Users/tabibs01/Downloads/chrome-linux/chrome',
-          'args' => %w[headless no-sandbox disable-gpu]
+          'args' => %w(headless no-sandbox disable-gpu)
         }
       )
       Capybara::Selenium::Driver.new(app, browser: :chrome, desired_capabilities: caps)
diff --git a/lib/frameworks/cucumber.rb b/lib/frameworks/cucumber.rb
index 92390c8..11118d3 100644
--- a/lib/frameworks/cucumber.rb
+++ b/lib/frameworks/cucumber.rb
@@ -122,7 +122,7 @@ def setup_mechanize(agent, http_proxy = nil)
 
       # This prevents Mechanize from raising a Mechanize::ResponseCodeError
       # when the HTTP Response Code is 404 or 503. This lets capybara continue the journey.
-      agent.agent.allowed_error_codes = %w[404 503]
+      agent.agent.allowed_error_codes = %w(404 503)
     end
 
     def new_mechanize(http_proxy = nil)
diff --git a/lib/frameworks/extensions/patches.rb b/lib/frameworks/extensions/patches.rb
index 1d62637..ae29935 100644
--- a/lib/frameworks/extensions/patches.rb
+++ b/lib/frameworks/extensions/patches.rb
@@ -8,7 +8,7 @@ module Capybara
   class Session
     include ShowMeTheCookies
     include FrameworksCapybara::Logger
-
+    
     alias old_visit visit
     def visit(url)
       Capybara.current_driver
diff --git a/lib/frameworks/utils.rb b/lib/frameworks/utils.rb
index 978c485..9b430d5 100644
--- a/lib/frameworks/utils.rb
+++ b/lib/frameworks/utils.rb
@@ -1,5 +1,6 @@
 # generic util methods
 module FrameworksCapybara
+  # generic util methods
   module Utils
     def rubyize(english_string)
       english_string.tr(' ', '_').downcase
@@ -17,8 +18,8 @@ def clean_id_cookies
     def browser
       if Capybara.current_driver == :selenium
         Capybara.current_session.driver.browser.manage
-        .instance_variable_get('@bridge')
-        .instance_variable_get('@capabilities')[:browser_name]
+                .instance_variable_get('@bridge')
+                .instance_variable_get('@capabilities')[:browser_name]
       else
         Capybara.current_driver
       end
diff --git a/lib/tasks/parallel-tasks.rb b/lib/tasks/parallel-tasks.rb
index 34f8b07..1632126 100644
--- a/lib/tasks/parallel-tasks.rb
+++ b/lib/tasks/parallel-tasks.rb
@@ -58,13 +58,13 @@ def write_confluence_report(passfail)
 
     desc 'Run all examples'
     RSpec::Core::RakeTask.new(:spec) do |t|
-      t.rspec_opts = %w[--color -fprogress -fhtml -oreports/rspec.html]
+      t.rspec_opts = %w(--color -fprogress -fhtml -oreports/rspec.html)
     end
 
     desc 'Create some docs'
     YARD::Rake::YardocTask.new do |t|
       t.files   = ['lib/**/*.rb']
-      t.options = %w[--markup=markdown]
+      t.options = %w(--markup=markdown)
     end
 
     desc 'Feature documentation'
diff --git a/spec/frameworks_capybara_spec.rb b/spec/frameworks_capybara_spec.rb
index eda83a8..97416e1 100644
--- a/spec/frameworks_capybara_spec.rb
+++ b/spec/frameworks_capybara_spec.rb
@@ -491,7 +491,7 @@ def delete_session
           ENV['BROWSER'] = 'mechanize'
         end
 
-        it 'should be initialized correctly' do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
           CapybaraSetup.new.driver.should == :mechanize
           Capybara.current_session.driver.should be_a_kind_of Capybara::Mechanize::Driver
@@ -511,7 +511,6 @@ def delete_session
             # note can no longer unit test this due to change in Capybara wiping brower instance
             # Capybara.current_session.driver.browser.agent.proxy_addr.should == 'example.cache.co.uk'
             # Capybara.current_session.driver.browser.agent.proxy_port.should == 80
-
           end
         end
       end

From 6dcee28dcecd520982bb41c792a77a4e3686959a Mon Sep 17 00:00:00 2001
From: Swati Tabib <swati.tabib.ext@bbc.co.uk>
Date: Wed, 26 Jul 2017 11:31:08 +0100
Subject: [PATCH 45/62] removing chrome headless driver code

---
 lib/frameworks/capybara.rb | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index f81be6e..0120860 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -250,23 +250,6 @@ def register_poltergeist_driver(opts)
     :poltergeist
   end
 
-  def register_headless_chromium_driver(_opts)
-    app = Proc.new do
-      ['200', { 'Content-Type' => 'text/html' }, ['A barebones rack app.']]
-    end
-    Capybara.register_driver :headless_chromium do |app|
-      Capybara.app_host = 'http://www.bbc.co.uk'
-      caps = Selenium::WebDriver::Remote::Capabilities.chrome(
-        'chromeOptions' => {
-          'binary' => '/Users/tabibs01/Downloads/chrome-linux/chrome',
-          'args' => %w(headless no-sandbox disable-gpu)
-        }
-      )
-      Capybara::Selenium::Driver.new(app, browser: :chrome, desired_capabilities: caps)
-    end
-    :headless_chromium
-  end
-
   def clean_opts(opts, *args)
     args.each do |arg|
       opts.delete arg

From 49959a179020ccc8ff9e96e910858c62cb8ec646 Mon Sep 17 00:00:00 2001
From: Swati <swati.tabib.ext@bbc.co.uk>
Date: Fri, 28 Jul 2017 15:46:17 +0100
Subject: [PATCH 46/62] Revert "Rubocop fixes"

---
 .rubocop.yml                                  |  14 -
 README.rdoc                                   |   4 +-
 Rakefile                                      |   6 +-
 frameworks-capybara.gemspec                   |  47 +-
 lib/frameworks/capybara.rb                    | 175 ++++---
 lib/frameworks/cucumber.rb                    |  96 ++--
 .../extensions/capybara-extensions.rb         |  69 +++
 .../capybara-mechanize-extensions.rb          |  70 +++
 lib/frameworks/extensions/patches.rb          |  16 +-
 lib/frameworks/logger.rb                      |   4 +-
 lib/frameworks/utils.rb                       |   5 +-
 lib/frameworks/wait.rb                        |   7 +-
 lib/tasks/frameworks-tasks.rb                 |  46 +-
 lib/tasks/merge_cucumber_json_reports.rb      |   4 +-
 lib/tasks/parallel-tasks.rb                   |  13 +-
 lib/version.rb                                |   2 +-
 spec/frameworks_capybara_spec.rb              | 489 +++++++++---------
 spec/frameworks_cucumber_spec.rb              | 269 +++++-----
 spec/spec_helper.rb                           |   2 +-
 spec/unit_test_monkeypatches.rb               |   5 +-
 spec/wait_spec.rb                             |  13 +-
 21 files changed, 770 insertions(+), 586 deletions(-)
 delete mode 100644 .rubocop.yml
 create mode 100644 lib/frameworks/extensions/capybara-extensions.rb
 create mode 100644 lib/frameworks/extensions/capybara-mechanize-extensions.rb

diff --git a/.rubocop.yml b/.rubocop.yml
deleted file mode 100644
index 08750bd..0000000
--- a/.rubocop.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-Metrics/LineLength:
-  Max: 150
-
-Metrics/AbcSize:
-  Max: 21
-
-Metrics/MethodLength:
-  Max: 25
-
-Metrics/ClassLength:
-  Max: 250
-
-Metrics/CyclomaticComplexity:
-  Max: 10
\ No newline at end of file
diff --git a/README.rdoc b/README.rdoc
index a0ef305..ce677d1 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -10,10 +10,10 @@ The principle behind this gem is to factor out all the common setup code for reg
 
 Below are the current drivers that can be registered:
 
-* Selenium-Webdriver (Selenium2) - LOCAL: This can be used to drive 'in-browser' tests running on your local machine in IE, Firefox and Chrome (and any other browsers as and when they are added into the Selenium-Webdriver project)
+* Selenium-Webdriver (Selenium2) - LOCAL: This can be used to drive 'in-browser' tests runnong on your local machine in IE, Firefox and Chrome (and any other browsers as and when they are added into the Selenium-Webdriver project)
 
 
-* Selenium-Webdriver (Selenium2) - REMOTE: This can be used to drive 'in-browser' tests on a remote machine, this could be another machine on your local network which is running a Selenium-Webdriver server or indeed a cloud service such as 'Sauce Labs'
+* Selenium-Webdriver (Selenium2) - REMOTE: This can be used to drive 'in-browser' tests on a remote macine, this could be another macine on your local network which is running a Selenium-Webdriver server or indeed a cloud service such as 'Sauce Labs'
 
 * Mechanize-Caybara: This can be used, by setting BROWSER=mechanize
 
diff --git a/Rakefile b/Rakefile
index 89db265..ed6c73a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -5,8 +5,8 @@ require 'cucumber/rake/task'
 
 Bundler::GemHelper.install_tasks
 
-desc 'Run all examples'
+desc "Run all examples"
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = %w(--color)
+  t.rspec_opts = %w[--color]
 end
-task default: [:spec]
+task :default => [:spec]
diff --git a/frameworks-capybara.gemspec b/frameworks-capybara.gemspec
index 789847e..fd2cd27 100644
--- a/frameworks-capybara.gemspec
+++ b/frameworks-capybara.gemspec
@@ -1,34 +1,35 @@
 # -*- encoding: utf-8 -*-
-
 lib = File.expand_path('../lib/', __FILE__)
-$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
+$:.unshift lib unless $:.include?(lib)
 
 require 'version'
 
 Gem::Specification.new do |s|
-  s.name = 'frameworks-capybara'
+  s.name = "frameworks-capybara"
   s.version = FrameworksCapybara::VERSION
 
-  s.authors = ['Radio and Music Test team']
-  s.email = ['']
-  s.description = 'Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches'
+  s.authors = ["matt robbins"]
+  s.email = ["mcrobbins@gmail.com"]
+  s.description = "Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches"
+
+  s.files = Dir.glob("{features,lib,bin,config,vendor,.bundle}/**/*") +  %w(Gemfile Gemfile.lock)
+
+  s.require_paths = ["lib"]
+  s.rubygems_version = "2.4.2"
+  s.summary = "Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches"
 
-  s.files = Dir.glob('{features,lib,bin,config,vendor,.bundle}/**/*') + %w(Gemfile Gemfile.lock)
+  s.files         = `git ls-files`.split("\n")
 
-  s.require_paths = ['lib']
-  s.rubygems_version = '2.4.2'
-  s.summary = 'Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches'
-  s.files = `git ls-files`.split("\n")
-  s.add_runtime_dependency('selenium-webdriver')
-  s.add_runtime_dependency('capybara', '~> 2.5')
-  s.add_runtime_dependency('mechanize')
-  s.add_runtime_dependency('capybara-mechanize')
-  s.add_runtime_dependency('poltergeist')
-  s.add_runtime_dependency('json')
-  s.add_runtime_dependency('cucumber')
-  s.add_runtime_dependency('logging')
-  s.add_runtime_dependency('show_me_the_cookies')
-  s.add_runtime_dependency('w3c_validators')
-  s.add_development_dependency('rake')
-  s.add_development_dependency('rspec')
+  s.add_runtime_dependency("selenium-webdriver")
+  s.add_runtime_dependency("capybara", '~> 2.5')
+  s.add_runtime_dependency("mechanize")
+  s.add_runtime_dependency("capybara-mechanize")
+  s.add_runtime_dependency("poltergeist")
+  s.add_runtime_dependency("json")
+  s.add_runtime_dependency("cucumber")
+  s.add_runtime_dependency("logging")
+  s.add_runtime_dependency("show_me_the_cookies")
+  s.add_runtime_dependency("w3c_validators")
+  s.add_development_dependency("rake")
+  s.add_development_dependency("rspec")
 end
diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index 0120860..3deae83 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -3,81 +3,77 @@
 require 'capybara/mechanize'
 require 'capybara/poltergeist'
 require 'selenium-webdriver'
+require 'frameworks/extensions/capybara-extensions'
+require 'frameworks/extensions/capybara-mechanize-extensions'
 
-# Register drivers
 class CapybaraSetup
+
   attr_reader :driver
 
   def initialize
+
     http_proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
     browser_cli_args = ENV['BROWSER_CLI_ARGS'].split(/\s+/).compact if ENV['BROWSER_CLI_ARGS']
 
-    capybara_opts = {
-      environment: ENV['ENVIRONMENT'],
-      http_proxy: http_proxy,
-      profile: ENV['FIREFOX_PROFILE'],
-      browser: ENV['BROWSER'],
-      webdriver_proxy_on: ENV['PROXY_ON'],
-      url: ENV['REMOTE_URL'],
-      chrome_switches: ENV['CHROME_SWITCHES'],
-      firefox_prefs: ENV['FIREFOX_PREFS'],
-      args: browser_cli_args
+    capybara_opts = {:environment => ENV['ENVIRONMENT'],
+      :http_proxy => http_proxy,
+      :profile => ENV['FIREFOX_PROFILE'],
+      :browser => ENV['BROWSER'],
+      :webdriver_proxy_on => ENV['PROXY_ON'],
+      :url => ENV['REMOTE_URL'],
+      :chrome_switches => ENV['CHROME_SWITCHES'],
+      :firefox_prefs => ENV['FIREFOX_PREFS'],
+      :args => browser_cli_args
     }
 
-    selenium_remote_opts = {
-      os: ENV['PLATFORM'],
-      os_version: ENV['PLATFORM_VERSION'],
-      browser_name: ENV['REMOTE_BROWSER'],
-      browser_version: ENV['REMOTE_BROWSER_VERSION'],
-      url: ENV['REMOTE_URL']
+    selenium_remote_opts = {:os => ENV['PLATFORM'],
+      :os_version => ENV['PLATFORM_VERSION'],
+      :browser_name => ENV['REMOTE_BROWSER'],
+      :browser_version => ENV['REMOTE_BROWSER_VERSION'],
+      :url => ENV['REMOTE_URL']
     }
 
-    custom_opts = {
-      job_name: ENV['SAUCE_JOB_NAME'],
-      max_duration: ENV['SAUCE_MAX_DURATION'],
-      firefox_cert_path: ENV['FIREFOX_CERT_PATH'],
-      firefox_cert_prefix: ENV['FIREFOX_CERT_PREFIX'],
-      browserstack_build: ENV['BS_BUILD'],
-      browserstack_debug: ENV['BS_DEBUG'] || 'true', # BrowserStack debug mode on by default
-      browserstack_device: ENV['BS_DEVICE'],
-      browserstack_device_orientation: ENV['BS_DEVICE_ORIENTATION'],
-      browserstack_project: ENV['BS_PROJECT'],
-      browserstack_resolution: ENV['BS_RESOLUTION'],
-      appium_platform: ENV['APPIUM_PLATFORM'],
-      appium_device: ENV['APPIUM_DEVICE'],
-      appium_browser: ENV['APPIUM_BROWSER'],
-      appium_udid: ENV['APPIUM_UDID']
+    custom_opts = {:job_name => ENV['SAUCE_JOB_NAME'],
+      :max_duration => ENV['SAUCE_MAX_DURATION'],
+      :firefox_cert_path => ENV['FIREFOX_CERT_PATH'],
+      :firefox_cert_prefix => ENV['FIREFOX_CERT_PREFIX'],
+      :browserstack_build => ENV['BS_BUILD'],
+      :browserstack_debug => ENV['BS_DEBUG'] || 'true', # BrowserStack debug mode on by default
+      :browserstack_device => ENV['BS_DEVICE'],
+      :browserstack_device_orientation => ENV['BS_DEVICE_ORIENTATION'],
+      :browserstack_project => ENV['BS_PROJECT'],
+      :browserstack_resolution => ENV['BS_RESOLUTION'],
+      :appium_platform => ENV['APPIUM_PLATFORM'],
+      :appium_device => ENV['APPIUM_DEVICE'],
+      :appium_browser => ENV['APPIUM_BROWSER'],
+      :appium_udid => ENV['APPIUM_UDID']
     }
-    # validate environment variables set using cucumber.yml or passed via command line
-    validate_env_vars(capybara_opts.merge(selenium_remote_opts), custom_opts)
 
-    if capybara_opts[:http_proxy]
+    validate_env_vars(capybara_opts.merge(selenium_remote_opts), custom_opts) #validate environment variables set using cucumber.yml or passed via command line
+
+    if(capybara_opts[:http_proxy])
       proxy_uri = URI(capybara_opts[:http_proxy])
       @proxy_host = proxy_uri.host
       @proxy_port = proxy_uri.port
     end
-    # update :browser value to be a symbol, required for Selenium
-    capybara_opts[:browser] = capybara_opts[:browser].intern
-    # update :browser value to be a symbol, required for Selenium
-    selenium_remote_opts[:browser_name] = selenium_remote_opts[:browser_name].intern if selenium_remote_opts[:browser_name]
-
-    Capybara.run_server = false # Disable rack server
-    # delete nil options and environment (which is only used for validation)
-    [capybara_opts, selenium_remote_opts, custom_opts].each do |opts|
-      opts.delete_if { |k, v| (v.nil? || k == :environment) }
+    capybara_opts[:browser] = capybara_opts[:browser].intern #update :browser value to be a symbol, required for Selenium
+    selenium_remote_opts[:browser_name] = selenium_remote_opts[:browser_name].intern if selenium_remote_opts[:browser_name]#update :browser value to be a symbol, required for Selenium
+
+    Capybara.run_server = false #Disable rack server
+
+    [capybara_opts, selenium_remote_opts, custom_opts].each do |opts| #delete nil options and environment (which is only used for validation)
+
+      opts.delete_if {|k,v| (v.nil? or k == :environment)}
     end
 
     # always register in case we are using a configuration that swaps between drivers
     mech_driver = register_mechanize_driver(capybara_opts)
     poltergeist_driver = register_poltergeist_driver(capybara_opts)
-    headless_chromium_driver = register_headless_chromium_driver(capybara_opts)
     case capybara_opts[:browser]
     when :mechanize then
       @driver = mech_driver
     when :poltergeist then
       @driver = poltergeist_driver
-    when :headless_chromium then
-      @driver = headless_chromium_driver
     else
       @driver = register_selenium_driver(capybara_opts, selenium_remote_opts, custom_opts)
     end
@@ -91,12 +87,12 @@ def validate_env_vars(opts, custom_opts)
     msg1 = 'Please ensure following environment variables are set ENVIRONMENT [int|test|stage|live], BROWSER[headless|ie|chrome|firefox] and HTTP_PROXY (if required)'
     msg2 = 'Please ensure the following environment variables are set PLATFORM, REMOTE_URL, REMOTE_BROWSER (browser to use on remote machine), HTTP_PROXY (if required), REMOTE_BROWSER_PROXY (if required) and BROWSER_VERSION (if required)'
 
-    [:environment, :browser].each { |item| !opts.key?(item) || opts[item].nil? ? raise(msg1) : '' }
+    [:environment, :browser].each { |item| !opts.has_key?(item) or opts[item]==nil ? raise(msg1) : '' }
 
     if custom_opts[:appium_platform]
-      [:url].each { |item| !opts.key?(item) || opts[item].nil? ? raise(msg2) : '' }
-    elsif opts[:browser] == 'remote'
-      [:url, :browser_name].each { |item| !opts.key?(item) || opts[item].nil? ? raise(msg2) : '' }
+      [:url].each { |item| !opts.has_key?(item) or opts[item]==nil ? raise(msg2) : '' }
+    elsif opts[:browser]=='remote'
+      [:url, :browser_name].each { |item| !opts.has_key?(item) or opts[item]==nil ? raise(msg2) : '' }
     end
   end
 
@@ -106,11 +102,11 @@ def update_firefox_profile_with_certificates(profile, certificate_path, certific
 
     # Create links to the certificate files in the profile directory
     ['cert8.db', 'key3.db', 'secmod.db'].each do |cert_file|
-      source_file = '#{certificate_prefix}#{cert_file}'
+      source_file = "#{certificate_prefix}#{cert_file}"
       source_path = "#{certificate_path}" + File::SEPARATOR + source_file
       dest_path = profile_path + File::SEPARATOR + cert_file
-      unless File.exist?(source_path)
-        raise 'Firefox cert db file #{source_path} does not exist.'
+      if(! File.exist?(source_path))
+        raise "Firefox cert db file #{source_path} does not exist."
       end
       FileUtils.cp(source_path, dest_path)
     end
@@ -119,13 +115,14 @@ def update_firefox_profile_with_certificates(profile, certificate_path, certific
     profile = Selenium::WebDriver::Firefox::Profile.new(profile_path)
 
     # Avoid Firefox certificate alerts
-    profile['security.default_personal_cert'] = 'Select Automatically'
+    profile["security.default_personal_cert"] = 'Select Automatically'
 
-    # return profile
+    return profile
   end
 
-  def register_selenium_driver(opts, remote_opts, custom_opts)
+  def register_selenium_driver(opts,remote_opts,custom_opts)
     Capybara.register_driver :selenium do |app|
+
       if opts[:firefox_prefs] || opts[:profile]
         opts[:profile] = create_profile(opts[:profile], opts[:firefox_prefs])
 
@@ -134,7 +131,7 @@ def register_selenium_driver(opts, remote_opts, custom_opts)
         end
       end
 
-      opts[:switches] = [opts.delete(:chrome_switches)] if opts[:chrome_switches]
+      opts[:switches] = [opts.delete(:chrome_switches)] if(opts[:chrome_switches])
 
       if opts[:browser] == :remote
         client = Selenium::WebDriver::Remote::Http::Default.new
@@ -143,25 +140,27 @@ def register_selenium_driver(opts, remote_opts, custom_opts)
         remote_opts[:firefox_profile] = opts.delete :profile if opts[:profile]
         remote_opts['chrome.switches'] = opts.delete :switches if opts[:switches]
         caps = Selenium::WebDriver::Remote::Capabilities.new(remote_opts)
-        # set sauce specific parameters - will this scupper other on sauce remote jobs?
-        add_custom_caps(caps, custom_opts) if remote_opts[:url].include? 'saucelabs'
-        # set browserstack specific parameters
-        add_browserstack_caps(caps, custom_opts) if remote_opts[:url].include? 'browserstack'
-        # set appium specific parameters
-        add_appium_caps(caps, custom_opts) if custom_opts.keys.join.include?('appium')
+
+        add_custom_caps(caps, custom_opts) if remote_opts[:url].include? 'saucelabs' #set sauce specific parameters - will this scupper other on sauce remote jobs?
+
+        add_browserstack_caps(caps, custom_opts) if remote_opts[:url].include? 'browserstack' #set browserstack specific parameters
+
+        add_appium_caps(caps, custom_opts) if custom_opts.keys.join.include?('appium')  #set appium specific parameters
 
         opts[:desired_capabilities] = caps
         opts[:http_client] = client
       end
 
       clean_opts(opts, :http_proxy, :webdriver_proxy_on, :firefox_prefs)
-      Capybara::Selenium::Driver.new(app, opts)
+      Capybara::Selenium::Driver.new(app,opts)
     end
     :selenium
   end
 
-  def add_custom_caps(_caps, custom_opts)
-    custom_opts.delete(:max_duration).to_i # note nil.to_i == 0
+  def add_custom_caps(caps, custom_opts)
+    sauce_time_limit = custom_opts.delete(:max_duration).to_i #note nil.to_i == 0
+    # This no longer works with the latest selenium-webdriver release
+    #caps.custom_capabilities({:'job-name' => (custom_opts[:job_name] or 'frameworks-unamed-job'), :'max-duration' => ((sauce_time_limit if sauce_time_limit != 0) or 1800)})
   end
 
   def add_browserstack_caps(caps, custom_opts)
@@ -181,41 +180,43 @@ def add_appium_caps(caps, custom_opts)
   end
 
   def set_client_proxy(opts)
-    # set proxy on client connection if required, note you may use ENV['HTTP_PROXY'] for setting in browser (ff profile) but not for client conection, hence allow for PROXY_ON=false
-    Selenium::WebDriver::Proxy.new(http: opts[:http_proxy]) if opts[:http_proxy] && opts[:webdriver_proxy_on] != 'false'
+    Selenium::WebDriver::Proxy.new(:http => opts[:http_proxy]) if opts[:http_proxy] && opts[:webdriver_proxy_on] != 'false' #set proxy on client connection if required, note you may use ENV['HTTP_PROXY'] for setting in browser (ff profile) but not for client conection, hence allow for PROXY_ON=false
   end
 
   def create_profile(profile_name = nil, additional_prefs = nil)
     additional_prefs = JSON.parse(additional_prefs) if additional_prefs
-    if additional_prefs && !profile_name
+    if(additional_prefs && !profile_name)
       profile = Selenium::WebDriver::Firefox::Profile.new
-    elsif profile_name == 'BBC_INTERNAL'
+      profile.native_events = true
+    elsif(profile_name == 'BBC_INTERNAL')
       profile = Selenium::WebDriver::Firefox::Profile.new
-      if @proxy_host && @proxy_port
-        profile['network.proxy.type'] = 1
-        profile['network.proxy.no_proxies_on'] = '*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk'
-        profile['network.proxy.http'] = @proxy_host
-        profile['network.proxy.ssl'] = @proxy_host
-        profile['network.proxy.http_port'] = @proxy_port
-        profile['network.proxy.ssl_port'] = @proxy_port
+      if(@proxy_host && @proxy_port)
+        profile["network.proxy.type"] = 1
+        profile["network.proxy.no_proxies_on"] = "*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk"
+        profile["network.proxy.http"] = @proxy_host
+        profile["network.proxy.ssl"] = @proxy_host
+        profile["network.proxy.http_port"] = @proxy_port
+        profile["network.proxy.ssl_port"] = @proxy_port
       end
+      profile.native_events = true
     else
       profile = Selenium::WebDriver::Firefox::Profile.from_name profile_name
+      profile.native_events = true
     end
-    profile.native_events = true
 
     if additional_prefs
       additional_prefs.each do |k, v|
         profile[k] = v
       end
     end
+
     profile
   end
 
-  def register_mechanize_driver(_opts)
+  def register_mechanize_driver(opts)
     # Mechanize needs a Rack application: create a dummy one
     app = Proc.new do |env|
-      ['200', { 'Content-Type' => 'text/html' }, ['A barebones rack app.']]
+      ['200', {'Content-Type' => 'text/html'}, ['A barebones rack app.']]
     end
     Capybara.app = app
     Capybara.run_server = false
@@ -225,10 +226,11 @@ def register_mechanize_driver(_opts)
     :mechanize
   end
 
+
   def register_poltergeist_driver(opts)
-    # Poltergiest needs a Rack application: create a dummy one
-    app = Proc.new do
-      ['200', { 'Content-Type' => 'text/html' }, ['A barebones rack app.']]
+    ## Poltergiest needs a Rack application: create a dummy one
+    app = Proc.new do |env|
+      ['200', {'Content-Type' => 'text/html'}, ['A barebones rack app.']]
     end
     phantom_opts = %w(--ignore-ssl-errors=true)
     phantom_opts.push "--ssl-client-certificate-file=#{ENV['FW_CERT_LOCATION']}" if ENV['FW_CERT_LOCATION']
@@ -236,7 +238,7 @@ def register_poltergeist_driver(opts)
     Capybara.app = app
     Capybara.run_server = false
     options = {
-      js_errors: true,
+      js_errors: false,
       timeout:   120,
       window_size: [1200, 1000],
       phantomjs_options: phantom_opts,
@@ -244,7 +246,7 @@ def register_poltergeist_driver(opts)
     }
     options[:phantomjs] = ENV['PHANTOMJS_PATH'] if ENV['PHANTOMJS_PATH'] && !ENV['PHANTOMJS_PATH'].empty?
     Capybara.register_driver :poltergeist do |app|
-      Capybara.app_host = 'http://www.bbc.co.uk'
+      Capybara.app_host = "http://www.bbc.co.uk"
       Capybara::Poltergeist::Driver.new(app, options)
     end
     :poltergeist
@@ -255,4 +257,5 @@ def clean_opts(opts, *args)
       opts.delete arg
     end
   end
+
 end
diff --git a/lib/frameworks/cucumber.rb b/lib/frameworks/cucumber.rb
index 11118d3..c4e16bd 100644
--- a/lib/frameworks/cucumber.rb
+++ b/lib/frameworks/cucumber.rb
@@ -2,29 +2,28 @@
 require 'w3c_validators'
 
 module Frameworks
-  # Generate base urls to use in Cucumber step defs
   module EnvHelper
     include W3CValidators
-    # Generate base urls to use in Cucumber step defs
-    def generate_base_urls
-      environment = ENV['ENVIRONMENT'].downcase # be defensive
+    #Generate base urls to use in Cucumber step defs
+    def generate_base_urls 
+      environment = ENV['ENVIRONMENT'].downcase #be defensive
 
       prepare_host
 
-      if environment == 'sandbox'
-        @base_url = @sandbox + @bbc_domain
-        @pal_base_url = @sandbox + @bbc_domain
+      if(environment =='sandbox')
+        @base_url = @sandbox + @bbc_domain 
+        @pal_base_url = @sandbox + @bbc_domain 
         @ssl_base_url = @sslsandbox + @bbc_domain
         @static_base_url = @static_sandbox + @bbc_domain
-        @mobile_base_url = @mobiledot_prefix + 'sandbox.dev' + @bbc_domain
-        @m_base_url = @mdot_prefix + 'sandbox.dev' + @bbc_domain
-      elsif environment == 'sandbox6'
-        @base_url = @sandbox6 + @bbc_domain
-        @pal_base_url = @sandbox6 + @bbc_domain
+        @mobile_base_url = @mobiledot_prefix + "sandbox.dev" + @bbc_domain
+        @m_base_url = @mdot_prefix + "sandbox.dev" + @bbc_domain
+      elsif(environment =='sandbox6')
+        @base_url = @sandbox6 + @bbc_domain 
+        @pal_base_url = @sandbox6 + @bbc_domain 
         @ssl_base_url = @sslsandbox6 + @bbc_domain
         @static_base_url = @static_sandbox6 + @bbc_domain
-        @mobile_base_url = @mobiledot_prefix + 'sandbox' + @bbc_domain
-        @m_base_url = @mdot_prefix + 'sandbox' + @bbc_domain
+        @mobile_base_url = @mobiledot_prefix + "sandbox" + @bbc_domain
+        @m_base_url = @mdot_prefix + "sandbox" + @bbc_domain
       elsif environment == 'live'
         @base_url = @www_prefix.chop + @bbc_domain
         @pal_base_url = @pal_prefix + environment + @bbc_domain
@@ -44,43 +43,48 @@ def generate_base_urls
         @m_base_url = @mdot_prefix + environment + @bbc_domain
       end
 
-      proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
-      proxy_parts = proxy.scan(%r{(?:http://)?([^\:]+)(?::(\d+))?}) if proxy && !proxy.empty?
+      proxy = ENV['http_proxy'] || ENV['HTTP_PROXY'] 
+      proxy_parts = proxy.scan(/(?:http:\/\/)?([^\:]+)(?::(\d+))?/) if proxy && !proxy.empty?
       if proxy_parts && !proxy_parts.empty?
-        @proxy_host = proxy_parts[0][0]
-        @proxy_port = if proxy_parts[0][1]
-                        proxy_parts[0][1]
-                      else
-                        '80'
-                      end
+          @proxy_host = proxy_parts[0][0]
+          if proxy_parts[0][1]
+              @proxy_port = proxy_parts[0][1]
+          else
+              @proxy_port = "80"
+          end
       end
     end
 
     def validate_online(src, validator_args = nil)
-      args = { proxy_host: @proxy_host, proxy_port: @proxy_port }
-      args = args.merge(validator_args) unless validator_args.nil?
+
+      args = {:proxy_host => @proxy_host,:proxy_port => @proxy_port} 
+      if(validator_args != nil)
+         args = args.merge(validator_args)
+      end    
       @validator = MarkupValidator.new(args)
 
       @validator.set_doctype!(:xhtml)
       begin
+
         results = @validator.validate_text(src)
 
-        unless results.errors.empty?
+        if results.errors.length > 0
           results.errors.each do |err|
             puts err.to_s
           end
-          raise 'W3C Validation failed.'
+          raise "W3C Validation failed."
         end
+
       rescue SystemCallError => e
-        puts "System error whilst performing request to W3C: #{e}"
+        puts "System error whilst performing request to W3C: #{e}"  
       end
     end
 
     def prepare_host
-      scheme = ENV['SCHEME'] == 'https' ? 'https' : 'http'
+      ENV['SCHEME']=='https' ? scheme = 'https' : scheme = 'http'
       @www_prefix = "#{scheme}://www."
       @pal_prefix = "#{scheme}://pal."
-      @ssl_prefix = 'https://ssl.'
+      @ssl_prefix = "https://ssl."
       @static_prefix = "#{scheme}://static."
       @open_prefix = "#{scheme}://open."
       @bbc_domain = '.' + (ENV['FW_BBC_DOMAIN'] || 'bbc.co.uk')
@@ -89,55 +93,57 @@ def prepare_host
       @sandbox6 = "#{scheme}://sandbox"
       @mobiledot_prefix = "#{scheme}://mobile."
       @mdot_prefix = "#{scheme}://m."
-      @sslsandbox = 'https://ssl.sandbox.dev'
-      @sslsandbox6 = 'https://ssl.sandbox'
+      @sslsandbox = "https://ssl.sandbox.dev"
+      @sslsandbox6 = "https://ssl.sandbox"
       @static_sandbox = "#{scheme}://static.sandbox.dev"
-      @static_sandbox6 = "#{scheme}://static.sandbox"
+      @static_sandbox6 = "#{scheme}://static.sandbox"      
     end
 
-    def setup_mechanize(agent, http_proxy = nil)
+    def setup_mechanize(agent, http_proxy=nil)
       http_proxy = http_proxy || ENV['HTTP_PROXY'] || ENV['http_proxy']
 
       if ENV['FW_CERT_LOCATION']
-        agent.cert = ENV['FW_CERT_LOCATION']
-        agent.key = ENV['FW_CERT_LOCATION']
+        agent.cert, agent.key = ENV['FW_CERT_LOCATION'], ENV['FW_CERT_LOCATION'] 
       end
 
       agent.ca_file = ENV['CA_CERT_LOCATION'] if ENV['CA_CERT_LOCATION']
-      agent.set_proxy(http_proxy.scan(%r{http://(.*):80})[0][0].to_s, 80) if http_proxy && !http_proxy.empty?
+      agent.set_proxy(http_proxy.scan(/http:\/\/(.*):80/)[0][0].to_s,80) if http_proxy && !http_proxy.empty?
 
       # The above proxy setting ignores any no_proxy variable setting:
       # added the following to circumvent this
-      if http_proxy
+      if(http_proxy)
         no_proxy = ENV['NO_PROXY'] || ENV['no_proxy']
-        if no_proxy
+        if(no_proxy)
           # The no_proxy query string argument must not contain spaces
-          no_proxy_qs = no_proxy.gsub(/[, ]+/, ',')
+          no_proxy_qs = no_proxy.gsub(/[, ]+/,',')
           agent.agent.http.proxy = URI(http_proxy + '?no_proxy=' + no_proxy_qs)
         end
       end
 
-      # This is necessary because Mech2 does not ship with root certs like Mech1 did and boxes may not have the OpenSSL set installed
+      #This is necessary because Mech2 does not ship with root certs like Mech1 did and boxes may not have the OpenSSL set installed
       agent.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
       # This prevents Mechanize from raising a Mechanize::ResponseCodeError
       # when the HTTP Response Code is 404 or 503. This lets capybara continue the journey.
-      agent.agent.allowed_error_codes = %w(404 503)
+      agent.agent.allowed_error_codes = ['404', '503']
     end
 
-    def new_mechanize(http_proxy = nil)
+    def new_mechanize(http_proxy=nil)
       require 'mechanize'
       agent = Mechanize.new
       setup_mechanize(agent, http_proxy)
       agent
     end
-  end # EnvHelper
-end # Frameworks
 
-# Add module into world to ensure visibility of instance variables within Cucumber
+  end #EnvHelper
+end #Frameworks
+
+
+#Add module into world to ensure visibility of instance variables within Cucumber
 World(Frameworks::EnvHelper)
 
 Before do
   setup_mechanize(page.driver.browser.agent) if page.driver.class == Capybara::Mechanize::Driver
   generate_base_urls
 end
+
diff --git a/lib/frameworks/extensions/capybara-extensions.rb b/lib/frameworks/extensions/capybara-extensions.rb
new file mode 100644
index 0000000..f910d31
--- /dev/null
+++ b/lib/frameworks/extensions/capybara-extensions.rb
@@ -0,0 +1,69 @@
+require 'selenium-webdriver'
+
+#
+# Cookie utility methods
+#
+class Capybara::Selenium::Driver
+  def cookies
+    browser.manage.all_cookies
+  end
+
+  def cookie_named(name)
+    browser.manage.cookie_named(name)
+  end
+
+  def delete_cookie(cookie)
+    browser.manage.delete_cookie(cookie)
+  end
+
+  def delete_all_cookies
+    browser.manage.delete_all_cookies
+  end
+
+  def add_cookie(attribs)
+    browser.manage.add_cookie(attribs)
+  end
+
+   def delete_cookies_in_domain(domain)
+    browser.manage.delete_cookies_in_domain(domain)
+  end
+end
+
+module Capybara
+  class Session
+    ##
+    # Get all cookies
+    #
+    # @return [Array<Hash>] list of cookies
+    #
+    def cookies
+      driver.cookies
+    end
+
+    ##
+    # Get the cookie with the given name
+    #
+    # @param [String] name the name of the cookie
+    # @return [Hash, nil] the cookie, or nil if it wasn't found.
+    #
+    def cookie_named(name)
+      driver.cookie_named(name)
+    end
+
+    def delete_cookie(cookie)
+      driver.delete_cookie(cookie)
+    end
+
+    def delete_all_cookies
+      driver.delete_all_cookies
+    end
+
+    def add_cookie(attribs)
+      driver.add_cookie(attribs)
+    end
+
+    def delete_cookies_in_domain(domain)
+      driver.delete_cookies_in_domain(domain)
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/frameworks/extensions/capybara-mechanize-extensions.rb b/lib/frameworks/extensions/capybara-mechanize-extensions.rb
new file mode 100644
index 0000000..662d19b
--- /dev/null
+++ b/lib/frameworks/extensions/capybara-mechanize-extensions.rb
@@ -0,0 +1,70 @@
+require 'capybara/mechanize/cucumber' 
+
+# Cookie handling extensions
+class Capybara::Mechanize::Driver
+
+  def cookies
+    cookies = []
+
+    browser.agent.cookie_jar.jar.each do |domain|
+      domain[1].each do |path|
+        path[1].each do |cookie|
+          
+          cookies.push({
+            :name => cookie[1].name,
+            :value => cookie[1].value,
+            :domain => cookie[1].domain,
+            :secure => cookie[1].secure,
+            :expires => cookie[1].expires,
+            :httponly => cookie[1].httponly,
+            :path => cookie[1].path
+          })
+        end
+      end
+    end
+    cookies
+  end
+
+  def cookie_named(name)
+    cookies.find { |c| c[:name] == name }
+  end
+
+  def delete_cookie(cookie_name)
+    browser.agent.cookie_jar.jar.each do |domain|
+      domain[1].each do |path|
+        path[1].each do |cookie|
+          if cookie[0] == cookie_name
+            browser.agent.cookie_jar.jar[domain[0]][path[0]].delete(cookie[0])
+          end
+        end
+      end
+    end
+  end
+
+  def delete_all_cookies
+    browser.agent.cookie_jar.clear!
+  end
+
+  def delete_cookies_in_domain(domain)
+    cookies.each do |cookie|
+      delete_cookie(cookie[:name]) if cookie[:domain].include?(domain)
+    end
+  end
+
+  def add_cookie(attribs)
+    
+    cookie = HTTP::Cookie.new(
+      attribs[:name],
+      attribs[:value],
+      :domain => attribs[:domain],
+      :for_domain => true,
+      :path => '/',
+      :expires => attribs[:expires],
+      :secure => attribs[:secure],
+      :httponly => attribs[:httponly]
+    )
+
+    browser.agent.cookie_jar.add(cookie)
+
+  end
+end
diff --git a/lib/frameworks/extensions/patches.rb b/lib/frameworks/extensions/patches.rb
index ae29935..38544a6 100644
--- a/lib/frameworks/extensions/patches.rb
+++ b/lib/frameworks/extensions/patches.rb
@@ -1,21 +1,20 @@
 require 'show_me_the_cookies'
 require 'capybara'
 require 'frameworks/logger'
-
 # monkey patches live here - beware!
 module Capybara
   # override behaviour of visit to surpress bbc survey
   class Session
     include ShowMeTheCookies
     include FrameworksCapybara::Logger
-    
-    alias old_visit visit
+
+    alias_method :old_visit, :visit
     def visit(url)
-      Capybara.current_driver
       old_visit url
       return if [:mechanize, :poltergeist].include?(Capybara.current_driver)
       surpress_cookies_prompt
-      # reload_if_survey_appears
+      #reload_if_survey_appears
+      close_music_banner
     end
 
     def surpress_cookies_prompt
@@ -27,11 +26,16 @@ def reload_if_survey_appears
       reload = false
       within_frame('edr_l_first') do
         if has_selector?('#layer_wrap', wait: 1)
-          log.info 'Found survey, will now reload the page'
+          log.info 'Found survey, will now reload page - only true x browser solution for now'
           reload = true
         end
       end
       visit current_url if reload
     end
+
+    def close_music_banner
+      close_banner_button = '#mn-prompt--where-is-playlister button'
+      find(close_banner_button).click if has_selector?(close_banner_button, wait: 1)
+    end
   end
 end
diff --git a/lib/frameworks/logger.rb b/lib/frameworks/logger.rb
index 813ef5f..af943cc 100644
--- a/lib/frameworks/logger.rb
+++ b/lib/frameworks/logger.rb
@@ -4,7 +4,7 @@ module FrameworksCapybara
   # configure logging
   module Logger
     def log_level
-      log_levels = %w[warn info debug]
+      log_levels = %w(warn info debug)
       env_log_level = (ENV['LOG_LEVEL'] || '').downcase
       log_levels.include?(env_log_level) ? env_log_level.to_sym : :debug
     end
@@ -24,7 +24,7 @@ def default_style
       scheme = 'pldefault'
       Logging.color_scheme(
         scheme,
-        levels: { info: :green, warn: :yellow, error: :red },
+        levels: { info:  :green, warn:  :yellow, error: :red },
         date:    :cyan,
         logger:  :cyan,
         message: :cyan
diff --git a/lib/frameworks/utils.rb b/lib/frameworks/utils.rb
index eda4804..1f6c228 100644
--- a/lib/frameworks/utils.rb
+++ b/lib/frameworks/utils.rb
@@ -1,6 +1,5 @@
 # generic util methods
 module FrameworksCapybara
-  # generic util methods
   module Utils
     def rubyize(english_string)
       english_string.tr(' ', '_').downcase
@@ -18,8 +17,8 @@ def clean_id_cookies
     def browser
       if Capybara.current_driver == :selenium
         Capybara.current_session.driver.browser.manage
-                .instance_variable_get('@bridge')
-                .instance_variable_get('@capabilities')[:browser_name]
+        .instance_variable_get('@bridge')
+        .instance_variable_get('@capabilities')[:browser_name]
       else
         Capybara.current_driver
       end
diff --git a/lib/frameworks/wait.rb b/lib/frameworks/wait.rb
index 3b6e59c..ae1817f 100644
--- a/lib/frameworks/wait.rb
+++ b/lib/frameworks/wait.rb
@@ -1,8 +1,8 @@
 require 'time'
 
 module FrameworksCapybara
-  # wait for elements methods
   module Wait
+    ##
     # Execute a block until it returns true.
     # Optionally pass a message and timeout (default 10 seconds).
     #
@@ -15,6 +15,7 @@ def wait_for(message = '', options = { timeout: 5 })
       end
     end
 
+    ##
     # Execute a block containing RSpec assertion, catch failures and wait till it passes
     # Pass an exception message to be outputted on failure and a block
     # Optionally pass a timeout, sleep interval
@@ -39,13 +40,13 @@ def wait_for_assertion(exception_message, timeout = Capybara.default_max_wait_ti
     # end
     #
     def wait_for_no_exception(exception_message, exception, timeout = Capybara.default_max_wait_time, sleep_interval = 1, &block)
-      raise 'You need to provide a block' unless block_given?
+      fail 'You need to provide a block' unless block_given?
       test_exception = 'check did not return within timeout window.'
       begin
         Timeout.timeout(timeout) do
           loop do
             begin
-              yield
+              block.call
               return true
             rescue exception => assertion_exception
               puts "#{exception_message} - rescuing: #{exception.to_s} and trying to call block again!"
diff --git a/lib/tasks/frameworks-tasks.rb b/lib/tasks/frameworks-tasks.rb
index e9832c2..14296c4 100644
--- a/lib/tasks/frameworks-tasks.rb
+++ b/lib/tasks/frameworks-tasks.rb
@@ -1,14 +1,13 @@
-# Rake Tasks
 class RakeHelpers
-  INVOKE_CUCUMBER = 'bin/cucumber -r features'.freeze
+  INVOKE_CUCUMBER = "bin/cucumber -r features"
 
   class << self
     def install
-      system('bundle install --no-cache --binstubs --path vendor/bundle')
+      system('bundle install --no-cache --binstubs --path vendor/bundle') 
     end
 
     def color(text, options = {})
-      # ANSI color codes
+      #ANSI color codes
       case options[:color]
       when :red
         text = "\033[31m#{text}\033[0m"
@@ -21,53 +20,54 @@ def color(text, options = {})
     end
 
     def list_profiles
-      puts 'Available profiles:'
+      puts 'Available profiles:' 
       f =  File.open('config/cucumber.yml', 'r')
       linenum = 0
       @profiles = {}
       f.readlines.each do |line|
         line.scan(/.*?: /) do |match|
           linenum += 1
-          puts color(linenum.to_s + '. ', color: yellow) + color(match.delete(':', ''), color: green)
-          @profiles[linenum.to_s] = match.delete(':', '')
+          puts color(linenum.to_s + '. ', :color => :yellow) + color(match.gsub(':',''), :color => :green)
+          @profiles[linenum.to_s] = match.gsub(':','')
         end
       end
     end
 
     def update
-      system('bundle update')
+      system('bundle update') 
     end
 
-    def run_feature(feature, profile = 'default')
+    def run_feature(feature, profile='default')
       system("#{INVOKE_CUCUMBER} -p #{profile} features/#{feature}.feature")
     end
 
-    def run_profile(profile = 'default')
+    def run_profile(profile='default')
       system("#{INVOKE_CUCUMBER} -p #{profile}")
     end
 
+
     def start_app
-      $LOAD_PATH << File.dirname(__FILE__)
+      $: << File.dirname( __FILE__)
       require 'lib/spec/test_app'
-      Rack::Handler::WEBrick.run TestApp, Port: 8070
+      Rack::Handler::WEBrick.run TestApp, :Port => 8070
     end
 
     def run_local
-      if RUBY_PLATFORM == 'java'
-        abort color("This script only works if you are running on MRI ('normal') Ruby....sorry....", color: red)
+      if(RUBY_PLATFORM == 'java')
+        abort color("This script only works if you are running on MRI ('normal') Ruby....sorry....", :color => :red) 
       end
-      puts color('*********************************************', color: green)
-      puts color('*                                           *', color: green)
-      puts color('* Cucumber Acceptance Tests                 *', color: green)
-      puts color('* Pre-Requisites:                           *', color: green)
-      puts color('* ruby 1.8.7, bundler, rake                 *', color: green)
-      puts color('*                                           *', color: green)
-      puts color('*********************************************', color: green)
+      puts color('*********************************************',:color => :green)
+      puts color('*                                           *',:color => :green)
+      puts color('* Cucumber Acceptance Tests                 *',:color => :green)
+      puts color('* Pre-Requisites:                           *',:color => :green)
+      puts color('* ruby 1.8.7, bundler, rake                 *',:color => :green)
+      puts color('*                                           *',:color => :green)
+      puts color('*********************************************',:color => :green)
       list_profiles
       puts 'Above is a list of the available profiles, please enter the number of the profile you wish to run: '
       profile = STDIN.gets.chomp
-      # TODO: Add some input validation?
-      puts "The profile chosen is: #{color(@profiles[profile], color: red)}"
+      #TODO: Add some input validation?
+      puts "The profile chosen is: #{color(@profiles[profile], :color => :red)}"
       puts 'Preparing to bundle required gems...'
       install
       puts 'Preparing to run tests...'
diff --git a/lib/tasks/merge_cucumber_json_reports.rb b/lib/tasks/merge_cucumber_json_reports.rb
index 4e74eb1..70d190b 100644
--- a/lib/tasks/merge_cucumber_json_reports.rb
+++ b/lib/tasks/merge_cucumber_json_reports.rb
@@ -31,8 +31,8 @@ def update(fname, feature, report)
   end
 
   def rerun
-    puts 'Processing rerun json'
-    json_rerun = Dir.glob 'reports/rerun.json'
+    puts "Processing rerun json"
+    json_rerun = Dir.glob "reports/rerun.json"
     if json_rerun.empty?
       puts 'no rerun file found'
     else
diff --git a/lib/tasks/parallel-tasks.rb b/lib/tasks/parallel-tasks.rb
index 1632126..a237667 100644
--- a/lib/tasks/parallel-tasks.rb
+++ b/lib/tasks/parallel-tasks.rb
@@ -1,4 +1,3 @@
-# parallel tasks
 class ParallelTasks
   include Rake::DSL if defined? Rake::DSL
 
@@ -48,7 +47,7 @@ def get_thread_count
     end
 
     def write_confluence_report(passfail)
-      require 'erb'
+      require "erb"
       green = '#4CD672'
       red = '#EA4D61'
       template = File.read(File.dirname(__FILE__) + '/confluence.erb')
@@ -81,7 +80,7 @@ def write_confluence_report(passfail)
     end
 
     desc 'Run cukes on production in parallel with browserstack chrome'
-    task :parallel_cuke do
+    task :parallel_cuke do |t|
       sh "#{bundle_exec}parallel_cucumber -n #{get_thread_count} -o '#{tags} #{env}' #{features_dir}"
     end
 
@@ -98,7 +97,7 @@ def write_confluence_report(passfail)
       result = (selenium_successful || rerun_successful) == true ? 'pass' : 'fail'
       puts "Overall result is #{result}"
       write_confluence_report(result)
-      raise 'Cucumber Failure' if result == 'fail'
+      fail 'Cucumber Failure' if result == 'fail'
     end
 
     desc 'Remove all files from the ./reports and ./doc directory'
@@ -119,11 +118,11 @@ def write_confluence_report(passfail)
         original_reports = Dir.entries junit_dir
         thread_reports = Dir.entries "#{junit_dir}#{thread}"
         thread_reports.reject { |f| File.directory?(f) }.each do |report|
-          if original_reports.include?(report)
+          if  original_reports.include?(report)
             sh "#{bundle_exec}junit_merge #{junit_dir}#{thread}/#{report} #{junit_dir}/#{report}"
           else
-            puts "copy #{junit_dir}#{thread}/#{report} to #{junit_dir}"
-            FileUtils.cp "#{junit_dir}#{thread}/#{report}", junit_dir
+            puts  "copy #{junit_dir}#{thread}/#{report} to #{junit_dir}"
+            FileUtils.cp  "#{junit_dir}#{thread}/#{report}", junit_dir
           end
         end
       end
diff --git a/lib/version.rb b/lib/version.rb
index 4514fc7..c0f8fe8 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -1,3 +1,3 @@
 module FrameworksCapybara
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.0'
 end
diff --git a/spec/frameworks_capybara_spec.rb b/spec/frameworks_capybara_spec.rb
index 97416e1..22ec3ab 100644
--- a/spec/frameworks_capybara_spec.rb
+++ b/spec/frameworks_capybara_spec.rb
@@ -1,12 +1,12 @@
 require 'spec_helper'
 require 'securerandom'
-
-# Monkey Patch
-# This is required because Capybara has module methods (singletons) which create
-# a session and then re-use this whenever Capybara is referenced in the current process.
-# Therefore even creating new instances of CapybaraSetup will use the same session and driver instance
-# not picking up changes in the different tests below.
-# Hence the only option is to clean out the session before each test.
+##
+#Monkey Patch
+#This is required because Capybara has module methods (singletons) which create
+#a session and then re-use this whenever Capybara is referenced in the current process. 
+#Therefore even creating new instances of CapybaraSetup will use the same session and driver instance
+#...not picking up changes in the different tests below.  
+#Hence the only option is to clean out the session before each test.
 module Capybara
   class << self
     def delete_session
@@ -15,104 +15,105 @@ def delete_session
   end
 end
 
-shared_examples_for 'Selenium Driver Options Array' do
-  it 'should contain no nil values for unset options' do
-    # TODO: Test for nil elements in options - there shouldn't be any that we insert
-    # i.e. anything in our ENV options should not end up being nil in Selenium
-    Capybara.current_session.driver.options[:environment].should eq nil
-    Capybara.current_session.driver.options[:http_proxy].should eq nil
-    Capybara.current_session.driver.options[:webdriver_proxy_on].should eq nil
-    Capybara.current_session.driver.options[:platform].should eq nil
-    Capybara.current_session.driver.options[:browser_name].should eq nil
-    Capybara.current_session.driver.options[:version].should eq nil
-    Capybara.current_session.driver.options[:job_name].should eq nil
-    Capybara.current_session.driver.options[:chrome_switches].should eq nil
-    Capybara.current_session.driver.options[:firefox_prefs].should eq nil
-    Capybara.current_session.driver.options[:max_duration].should eq nil
+shared_examples_for "Selenium Driver Options Array" do
+  it "should contain no nil values for unset options" do
+    #TODO: Test for nil elements in options - there shouldn't be any that we insert
+    #i.e. anything in our ENV options should not end up being nil in Selenium
+    Capybara.current_session.driver.options[:environment].should == nil
+    Capybara.current_session.driver.options[:http_proxy].should == nil
+    Capybara.current_session.driver.options[:webdriver_proxy_on].should == nil
+    Capybara.current_session.driver.options[:platform].should == nil
+    Capybara.current_session.driver.options[:browser_name].should == nil
+    Capybara.current_session.driver.options[:version].should == nil
+    Capybara.current_session.driver.options[:job_name].should == nil
+    Capybara.current_session.driver.options[:chrome_switches].should == nil
+    Capybara.current_session.driver.options[:firefox_prefs].should == nil
+    Capybara.current_session.driver.options[:max_duration].should == nil
     Capybara.current_session.driver.options[:profile].should_not be_a_kind_of String
     Capybara.current_session.driver.options[:browser].should_not be_a_kind_of String
   end
 end
 
 describe CapybaraSetup do
+
   before(:each) do
     home = ENV['HOME']
     appdata = ENV['APPDATA']
     ENV.clear
-    ENV['HOME'] = home # Want to clear some env variables but HOME is used by Webdriver, therefore need to preserve it
+    ENV['HOME'] = home #Want to clear some env variables but HOME is used by Webdriver, therefore need to preserve it
     ENV['APPDATA'] = appdata
   end
 
-  describe 'should validate options' do
+  describe "should validate options" do
     before(:each) do
       Capybara.delete_session
     end
 
-    it 'should require as a minimum ENVIRONMENT and BROWSER' do
-      lambda { CapybaraSetup.new }.should raise_error(RuntimeError, 'Please ensure following environment variables are set ENVIRONMENT [int|test|stage|live], BROWSER[headless|ie|chrome|firefox] and HTTP_PROXY (if required)')
+    it "should require as a minimum ENVIRONMENT and BROWSER" do
+      lambda {CapybaraSetup.new}.should raise_error(RuntimeError,'Please ensure following environment variables are set ENVIRONMENT [int|test|stage|live], BROWSER[headless|ie|chrome|firefox] and HTTP_PROXY (if required)')
     end
 
-    it 'should require as a minimum ENVIRONMENT, BROWSER and REMOTE_BROWSER if running a Remote Selenium Instance' do
+    it "should require as a minimum ENVIRONMENT, BROWSER and REMOTE_BROWSER if running a Remote Selenium Instance" do
       ENV['BROWSER'] = 'remote'
       ENV['ENVIRONMENT'] = 'test'
-      lambda { CapybaraSetup.new }.should raise_error(RuntimeError, 'Please ensure the following environment variables are set PLATFORM, REMOTE_URL, REMOTE_BROWSER (browser to use on remote machine), HTTP_PROXY (if required), REMOTE_BROWSER_PROXY (if required) and BROWSER_VERSION (if required)')
+      lambda {CapybaraSetup.new}.should raise_error(RuntimeError,'Please ensure the following environment variables are set PLATFORM, REMOTE_URL, REMOTE_BROWSER (browser to use on remote machine), HTTP_PROXY (if required), REMOTE_BROWSER_PROXY (if required) and BROWSER_VERSION (if required)')
     end
 
-    it 'should not error if ENVIRONMENT and BROWSER are provided' do
+    it "should not error if ENVIRONMENT and BROWSER are provided" do
       ENV['BROWSER'] = 'headless'
       ENV['ENVIRONMENT'] = 'test'
-      lambda { CapybaraSetup.new }.should_not raise_error
+      lambda {CapybaraSetup.new}.should_not raise_error
     end
 
-    it 'should not error if ENVIRONMENT, BROWSER and REMOTE_BROSWER are provided if running a Remote Selenium Instance' do
+    it "should not error if ENVIRONMENT, BROWSER and REMOTE_BROSWER are provided if running a Remote Selenium Instance" do
       ENV['BROWSER'] = 'remote'
       ENV['ENVIRONMENT'] = 'test'
       ENV['REMOTE_BROWSER'] = 'test'
       ENV['REMOTE_URL'] = 'test'
-      lambda { CapybaraSetup.new }.should_not raise_error
+      lambda {CapybaraSetup.new}.should_not raise_error
     end
   end
 
-  describe 'should allow Capybara drivers to be created' do
+  describe "should allow Capybara drivers to be created" do
     before do
       ENV['ENVIRONMENT'] = 'test'
     end
 
-    describe 'should allow Selenium driver to be created' do
-      context 'with minimal Selenium driver' do
+    describe "should allow Selenium driver to be created" do
+      context "with minimal Selenium driver" do
         before do
           ENV['BROWSER'] = 'firefox'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do 
           Capybara.delete_session
-          CapybaraSetup.new.driver.should eq :selenium
+          CapybaraSetup.new.driver.should == :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should eq :firefox
+          Capybara.current_session.driver.options[:browser].should == :firefox
         end
 
-        it_behaves_like 'Selenium Driver Options Array'
+        it_behaves_like "Selenium Driver Options Array"
       end
 
-      context 'with no command-line arguments supplied' do
+      context "with no command-line arguments supplied" do
         before do
           ENV['BROWSER'] = 'phantomjs'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do
           Capybara.delete_session
           expect(CapybaraSetup.new.driver).to eq :selenium
           expect(Capybara.current_session.driver.options[:args]).to be nil
         end
       end
 
-      context 'with single command-line argument supplied' do
+      context "with single command-line argument supplied" do
         before do
           ENV['BROWSER'] = 'phantomjs'
           ENV['BROWSER_CLI_ARGS'] = '--ignore-ssl-errors=true'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do
           Capybara.delete_session
           expect(CapybaraSetup.new.driver).to eq :selenium
           args = Capybara.current_session.driver.options[:args]
@@ -122,13 +123,13 @@ def delete_session
         end
       end
 
-      context 'with multiple command-line arguments supplied' do
+      context "with multiple command-line arguments supplied" do
         before do
           ENV['BROWSER'] = 'phantomjs'
           ENV['BROWSER_CLI_ARGS'] = '--ignore-ssl-errors=true --remote-debugger-port=9000'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do
           Capybara.delete_session
           expect(CapybaraSetup.new.driver).to eq :selenium
           args = Capybara.current_session.driver.options[:args]
@@ -139,24 +140,25 @@ def delete_session
         end
       end
 
-      context 'with Selenium driver and default firefox profile (from profiles.ini)' do
+      context "with Selenium driver and default firefox profile (from profiles.ini)" do
         before do
           ENV['BROWSER'] = 'firefox'
           ENV['FIREFOX_PROFILE'] = 'default'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do 
           Capybara.delete_session
-          CapybaraSetup.new.driver.should eq :selenium
+          CapybaraSetup.new.driver.should == :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should eq :firefox
+          Capybara.current_session.driver.options[:browser].should == :firefox
           Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@model).should include 'default'
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@model).should include "default"
         end
-        it_behaves_like 'Selenium Driver Options Array'
+        it_behaves_like "Selenium Driver Options Array"
+
       end
 
-      context 'with Selenium driver and programtically created profile' do
+      context "with Selenium driver and programtically created profile" do
         before do
           ENV['BROWSER'] = 'firefox'
           ENV['FIREFOX_PROFILE'] = 'BBC_INTERNAL'
@@ -164,39 +166,40 @@ def delete_session
           ENV['PROXY_ON'] = 'false'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do 
           Capybara.delete_session
-          CapybaraSetup.new.driver.should eq :selenium
+          CapybaraSetup.new.driver.should == :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should eq :firefox
+          Capybara.current_session.driver.options[:browser].should == :firefox
           Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.type'].should eq 1
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.no_proxies_on'].should eq '*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk'
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.http'].should eq 'example.cache.co.uk'
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.http_port'].should eq 80
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl'].should eq 'example.cache.co.uk'
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl_port'].should eq 80
-        end
-        it_behaves_like 'Selenium Driver Options Array'
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.type'].should == 1
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.no_proxies_on'].should == '*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk'
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.http'].should == 'example.cache.co.uk'
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.http_port'].should == 80
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl'].should == 'example.cache.co.uk'
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl_port'].should == 80
+        end
+        it_behaves_like "Selenium Driver Options Array"
       end
 
-      context 'with Selenium driver and custom chrome options' do
+      context "with Selenium driver and custom chrome options" do
         before do
           ENV['BROWSER'] = 'chrome'
           ENV['CHROME_SWITCHES'] = '--user-agent=Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do 
           Capybara.delete_session
-          CapybaraSetup.new.driver.should eq :selenium
+          CapybaraSetup.new.driver.should == :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should eq :chrome
-          Capybara.current_session.driver.options[:switches].should eq ['--user-agent=Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10']
+          Capybara.current_session.driver.options[:browser].should == :chrome
+          Capybara.current_session.driver.options[:switches].should == ['--user-agent=Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10']
         end
-        it_behaves_like 'Selenium Driver Options Array'
+        it_behaves_like "Selenium Driver Options Array"
       end
 
-      context 'with Remote Selenium driver' do
+
+      context "with Remote Selenium driver" do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'firefox'
@@ -204,23 +207,23 @@ def delete_session
           ENV['REMOTE_URL'] = 'http://example.com'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do 
           Capybara.delete_session
-          CapybaraSetup.new.driver.should eq :selenium
+          CapybaraSetup.new.driver.should == :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should eq :remote
-          Capybara.current_session.driver.options[:url].should eq 'http://example.com'
-          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
-          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should eq :firefox
+          Capybara.current_session.driver.options[:browser].should == :remote
+          Capybara.current_session.driver.options[:url].should == 'http://example.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
+          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities 
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :firefox
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@model).should include 'default'
         end
-        it_behaves_like 'Selenium Driver Options Array'
+        it_behaves_like "Selenium Driver Options Array"
       end
 
-      context 'with Remote Selenium driver and client proxy' do
+      context "with Remote Selenium driver and client proxy" do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'firefox'
@@ -229,20 +232,20 @@ def delete_session
           ENV['HTTP_PROXY'] = 'http://example.cache.co.uk:80'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do 
           Capybara.delete_session
-          CapybaraSetup.new.driver.should eq :selenium
+          CapybaraSetup.new.driver.should == :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should eq :remote
-          Capybara.current_session.driver.options[:url].should eq 'http://example.com'
-          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
+          Capybara.current_session.driver.options[:browser].should == :remote
+          Capybara.current_session.driver.options[:url].should == 'http://example.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
           Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should be_a_kind_of Selenium::WebDriver::Proxy
           Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).instance_variable_get(:@http).should == 'http://example.cache.co.uk:80'
         end
-        it_behaves_like 'Selenium Driver Options Array'
+        it_behaves_like "Selenium Driver Options Array"
       end
 
-      context 'with Remote Selenium driver, programtically cretated Firefox profile using proxy but client not using proxy' do
+      context "with Remote Selenium driver, programtically cretated Firefox profile using proxy but client not using proxy" do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'firefox'
@@ -252,25 +255,25 @@ def delete_session
           ENV['PROXY_ON'] = 'false'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do 
           Capybara.delete_session
-          CapybaraSetup.new.driver.should eq :selenium
+          CapybaraSetup.new.driver.should == :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should eq :remote
+          Capybara.current_session.driver.options[:browser].should == :remote
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.type'].should eq 1
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.no_proxies_on'].should eq '*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk'
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.http'].should eq 'example.cache.co.uk'
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.http_port'].should eq 80
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl'].should eq 'example.cache.co.uk'
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl_port'].should eq 80
-          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
-        end
-        it_behaves_like 'Selenium Driver Options Array'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.type'].should == 1
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.no_proxies_on'].should == '*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.http'].should == 'example.cache.co.uk'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.http_port'].should == 80
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl'].should == 'example.cache.co.uk'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl_port'].should == 80
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
+        end
+        it_behaves_like "Selenium Driver Options Array"
       end
 
-      context 'with Remote Selenium driver (specifying platform and browser version) and default Custom Capabilites (e.g. for Sauce Labs)' do
+      context "with Remote Selenium driver (specifying platform and browser version) and default Custom Capabilites (e.g. for Sauce Labs)" do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'firefox'
@@ -280,25 +283,27 @@ def delete_session
           ENV['REMOTE_URL'] = 'http://saucelabs.com'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do 
           Capybara.delete_session
-          CapybaraSetup.new.driver.should eq :selenium
+          CapybaraSetup.new.driver.should == :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should eq :remote
-          Capybara.current_session.driver.options[:url].should eq 'http://saucelabs.com'
-          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
-          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should eq :firefox
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_version].should eq '4'
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:os].should eq 'windows'
+          Capybara.current_session.driver.options[:browser].should == :remote
+          Capybara.current_session.driver.options[:url].should == 'http://saucelabs.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
+          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities 
+          #Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'job-name'].should == 'frameworks-unamed-job' 
+          #Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'max-duration'].should == 1800 
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :firefox
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_version].should == '4'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:os].should == 'windows'
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@model).should include 'default'
         end
-        it_behaves_like 'Selenium Driver Options Array'
+        it_behaves_like "Selenium Driver Options Array"
       end
 
-      context 'with Selenium driver and hardcoded bbc internal profile and additional firefox preferences' do
+      context "with Selenium driver and hardcoded bbc internal profile and additional firefox preferences" do
         before do
           ENV['BROWSER'] = 'firefox'
           ENV['HTTP_PROXY'] = 'http://example.cache.co.uk:80'
@@ -306,53 +311,55 @@ def delete_session
           ENV['FIREFOX_PREFS'] = '{"javascript.enabled":false}'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do 
           Capybara.delete_session
-          CapybaraSetup.new.driver.should eq :selenium
+          CapybaraSetup.new.driver.should == :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should eq :firefox
+          Capybara.current_session.driver.options[:browser].should == :firefox
           Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should eq false
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should == false
         end
-        it_behaves_like 'Selenium Driver Options Array'
+        it_behaves_like "Selenium Driver Options Array"
       end
 
-      context 'with Selenium driver and additional firefox preferences' do
+
+      context "with Selenium driver and additional firefox preferences" do
         before do
           ENV['BROWSER'] = 'firefox'
           ENV['FIREFOX_PROFILE'] = 'default'
           ENV['FIREFOX_PREFS'] = '{"javascript.enabled":false}'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do 
           Capybara.delete_session
-          CapybaraSetup.new.driver.should eq :selenium
+          CapybaraSetup.new.driver.should == :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should eq :firefox
+          Capybara.current_session.driver.options[:browser].should == :firefox
           Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should eq false
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should == false
         end
-        it_behaves_like 'Selenium Driver Options Array'
+        it_behaves_like "Selenium Driver Options Array"
       end
 
-      context 'with Selenium driver and new profile and custom prefs' do
+
+      context "with Selenium driver and new profile and custom prefs" do
         before do
           ENV['BROWSER'] = 'firefox'
           ENV['FIREFOX_PREFS'] = '{"javascript.enabled":false}'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do 
           Capybara.delete_session
-          CapybaraSetup.new.driver.should eq :selenium
+          CapybaraSetup.new.driver.should == :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should eq :firefox
+          Capybara.current_session.driver.options[:browser].should == :firefox
           Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should eq false
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should == false
         end
-        it_behaves_like 'Selenium Driver Options Array'
+        it_behaves_like "Selenium Driver Options Array"
       end
 
-      context 'with Remote Selenium driver and specified Chrome Switches' do
+      context "with Remote Selenium driver and specified Chrome Switches" do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'chrome'
@@ -360,23 +367,23 @@ def delete_session
           ENV['CHROME_SWITCHES'] = '--user-agent=Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do 
           Capybara.delete_session
-          CapybaraSetup.new.driver.should eq :selenium
+          CapybaraSetup.new.driver.should == :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should eq :remote
-          Capybara.current_session.driver.options[:switches].should eq nil
-          Capybara.current_session.driver.options[:url].should eq 'http://saucelabs.com'
-          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
-          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should eq :chrome
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)['chrome.switches'].should eq ['--user-agent=Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10']
-        end
-        it_behaves_like 'Selenium Driver Options Array'
+          Capybara.current_session.driver.options[:browser].should == :remote
+          Capybara.current_session.driver.options[:switches].should == nil
+          Capybara.current_session.driver.options[:url].should == 'http://saucelabs.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
+          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities 
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :chrome
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)['chrome.switches'].should == ['--user-agent=Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10'] 
+        end
+        it_behaves_like "Selenium Driver Options Array"
       end
 
-      context 'with Remote Selenium driver and specified Custom Capabilites (e.g. for Sauce Labs)' do
+      context "with Remote Selenium driver and specified Custom Capabilites (e.g. for Sauce Labs)" do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'firefox'
@@ -387,42 +394,44 @@ def delete_session
           ENV['REMOTE_URL'] = 'http://saucelabs.com'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do 
           Capybara.delete_session
-          CapybaraSetup.new.driver.should eq :selenium
+          CapybaraSetup.new.driver.should == :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should eq :remote
-          Capybara.current_session.driver.options[:url].should eq 'http://saucelabs.com'
-          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
-          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should eq :firefox
+          Capybara.current_session.driver.options[:browser].should == :remote
+          Capybara.current_session.driver.options[:url].should == 'http://saucelabs.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
+          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities 
+          #Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'job-name'].should == 'myjobname' 
+          #Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'max-duration'].should == 2000 
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :firefox
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@model).should include 'default'
         end
-        it_behaves_like 'Selenium Driver Options Array'
+        it_behaves_like "Selenium Driver Options Array"
       end
 
-      context 'with Remote Selenium driver and most minimal Capabilites for BrowserStack' do
+      context "with Remote Selenium driver and most minimal Capabilites for BrowserStack" do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'ie'
           ENV['REMOTE_URL'] = 'http://hub.browserstack.com'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should eq :selenium
+          CapybaraSetup.new.driver.should == :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should eq :remote
-          Capybara.current_session.driver.options[:url].should eq ENV['REMOTE_URL']
+          Capybara.current_session.driver.options[:browser].should == :remote
+          Capybara.current_session.driver.options[:url].should == ENV['REMOTE_URL']
           Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:'browserstack.debug'].should eq 'true'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:'browserstack.debug'].should == 'true'
         end
-        it_behaves_like 'Selenium Driver Options Array'
+        it_behaves_like "Selenium Driver Options Array"
       end
 
-      context 'with Remote Selenium driver and specified Custom Capabilites for BrowserStack' do
+      context "with Remote Selenium driver and specified Custom Capabilites for BrowserStack" do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['BS_BUILD'] = 'browserstack build 1'
@@ -438,30 +447,30 @@ def delete_session
           ENV['REMOTE_URL'] = 'http://hub.browserstack.com'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should eq :selenium
+          CapybaraSetup.new.driver.should == :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should eq :remote
-          Capybara.current_session.driver.options[:url].should eq ENV['REMOTE_URL']
+          Capybara.current_session.driver.options[:browser].should == :remote
+          Capybara.current_session.driver.options[:url].should == ENV['REMOTE_URL']
           Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
           Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:build].should eq ENV['BS_BUILD']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:'browserstack.debug'].should eq ENV['BS_DEBUG']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:device].should eq ENV['BS_DEVICE']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:deviceOrientation].should eq ENV['BS_DEVICE_ORIENTATION']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:project].should eq ENV['BS_PROJECT']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:resolution].should eq ENV['BS_RESOLUTION']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:os].should eq ENV['PLATFORM']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:os_version].should eq ENV['PLATFORM_VERSION']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should eq :iPhone
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_version].should eq ENV['REMOTE_BROWSER_VERSION']
-        end
-        it_behaves_like 'Selenium Driver Options Array'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:build].should == ENV['BS_BUILD']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:'browserstack.debug'].should == ENV['BS_DEBUG']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:device].should == ENV['BS_DEVICE']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:deviceOrientation].should == ENV['BS_DEVICE_ORIENTATION']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:project].should == ENV['BS_PROJECT']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:resolution].should == ENV['BS_RESOLUTION']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:os].should == ENV['PLATFORM']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:os_version].should == ENV['PLATFORM_VERSION']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :iPhone
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_version].should == ENV['REMOTE_BROWSER_VERSION']
+        end
+        it_behaves_like "Selenium Driver Options Array"
       end
 
-      context 'with Remote Selenium driver and specified Custom Capabilites for Appium' do
+      context "with Remote Selenium driver and specified Custom Capabilites for Appium" do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_URL'] = 'http://127.0.0.1:4273'
@@ -471,84 +480,86 @@ def delete_session
           ENV['APPIUM_UDID'] = 'abd234'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should eq :selenium
+          CapybaraSetup.new.driver.should == :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should eq :remote
+          Capybara.current_session.driver.options[:browser].should == :remote
           Capybara.current_session.driver.options[:url].should == ENV['REMOTE_URL']
           Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
           Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
         end
-        it_behaves_like 'Selenium Driver Options Array'
+        it_behaves_like "Selenium Driver Options Array"
       end
     end
 
-    describe 'should allow Mechanize driver to be created' do
-      context 'with minimal Mechanize driver' do
+    describe "should allow Mechanize driver to be created" do
+      context "with minimal Mechanize driver" do
         before do
           ENV['BROWSER'] = 'mechanize'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do 
           Capybara.delete_session
           CapybaraSetup.new.driver.should == :mechanize
           Capybara.current_session.driver.should be_a_kind_of Capybara::Mechanize::Driver
         end
 
-        context 'with maximal Mechanize driver' do
+        context "with maximal Mechanize driver" do
           before do
             ENV['BROWSER'] = 'mechanize'
             ENV['ENVIRONMENT'] = 'test'
             ENV['HTTP_PROXY'] = 'http://example.cache.co.uk:80'
           end
 
-          it 'should be initialized correctly' do
+          it "should be initialized correctly" do
             Capybara.delete_session
-            CapybaraSetup.new.driver.should eq :mechanize
+            CapybaraSetup.new.driver.should == :mechanize
             Capybara.current_session.driver.should be_a_kind_of Capybara::Mechanize::Driver
-            # note can no longer unit test this due to change in Capybara wiping brower instance
-            # Capybara.current_session.driver.browser.agent.proxy_addr.should == 'example.cache.co.uk'
-            # Capybara.current_session.driver.browser.agent.proxy_port.should == 80
+            #note can no longer unit test this due to change in Capybara wiping brower instance
+            #Capybara.current_session.driver.browser.agent.proxy_addr.should == 'example.cache.co.uk'
+            #Capybara.current_session.driver.browser.agent.proxy_port.should == 80
+
           end
         end
       end
 
-    describe 'should allow Poltergeist driver to be created' do
-      context 'with minimal Poltergeist driver' do
+    describe "should allow Poltergeist driver to be created" do
+      context "with minimal Poltergeist driver" do
         before do
           ENV['BROWSER'] = 'poltergeist'
         end
 
-        it 'should be initialized correctly' do
+        it "should be initialized correctly" do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should eq :poltergeist
+          CapybaraSetup.new.driver.should == :poltergeist
           Capybara.current_session.driver.should be_a_kind_of Capybara::Poltergeist::Driver
         end
 
-        context 'with maximal Poltergeist driver' do
+        context "with maximal Poltergeist driver" do
           before do
             ENV['BROWSER'] = 'poltergeist'
             ENV['ENVIRONMENT'] = 'test'
             ENV['HTTP_PROXY'] = 'http://example.cache.co.uk:80'
           end
 
-          it 'should be initialized correctly' do
+          it "should be initialized correctly" do
             Capybara.delete_session
-            CapybaraSetup.new.driver.should eq :poltergeist
+            CapybaraSetup.new.driver.should == :poltergeist
             Capybara.current_session.driver.should be_a_kind_of Capybara::Poltergeist::Driver
           end
         end
       end
     end
 
-      describe 'should permit certificate files to be incorporated into firefox profiles' do
-        context 'integration tests for update_firefox_profile_with_certificates() method' do
+      describe "should permit certificate files to be incorporated into firefox profiles" do
+
+        context "integration tests for update_firefox_profile_with_certificates() method" do
           before do
-            def write_random_data(file_path)
+            def write_random_data(file_path) 
               file_data = SecureRandom.hex
-              File.open(file_path, 'w') { |a_file|
+              File.open(file_path, "w") { |a_file|
                 a_file.write(file_data)
               }
               file_data
@@ -557,10 +568,10 @@ def write_random_data(file_path)
             def compare_file_data(profile_path, file_name, expected_data)
               profile_file = profile_path + File::SEPARATOR + file_name
               actual_data = nil
-              File.open(profile_file, 'r') { |a_file|
+              File.open(profile_file, "r") { |a_file|
                 actual_data = a_file.read
               }
-              expected_data.should == actual_data
+              expected_data.should == actual_data 
             end
 
             ENV['BROWSER'] = 'firefox'
@@ -576,16 +587,16 @@ def compare_file_data(profile_path, file_name, expected_data)
             FileUtils.remove_entry @cert_dir
           end
 
-          it 'should raise an exception if the cert8.db file is missing in the source directory' do
+          it "should raise an exception if the cert8.db file is missing in the source directory" do
             profile = Selenium::WebDriver::Firefox::Profile.new
 
-            write_random_data(@key3_db)
-            write_random_data(@secmod_db)
+            key3_data = write_random_data(@key3_db)
+            secmod_data = write_random_data(@secmod_db)
 
             an_exception = nil
-            begin
+            begin 
               CapybaraSetup.new.instance_exec(profile, @cert_dir) { |profile, certificate_path|
-                update_firefox_profile_with_certificates(profile, certificate_path)
+                update_firefox_profile_with_certificates(profile, certificate_path) 
               }
             rescue RuntimeError => e
               an_exception = e
@@ -594,15 +605,16 @@ def compare_file_data(profile_path, file_name, expected_data)
             an_exception.should_not be_nil
           end
 
-          it 'should raise an exception if the key3.db file is missing in the source directory' do
+          it "should raise an exception if the key3.db file is missing in the source directory" do
             profile = Selenium::WebDriver::Firefox::Profile.new
 
-            write_random_data(@cert8_db)
-            write_random_data(@secmod_db)
+            cert8_data = write_random_data(@cert8_db)
+            secmod_data = write_random_data(@secmod_db)
+           
             an_exception = nil
-            begin
+            begin 
               CapybaraSetup.new.instance_exec(profile, @cert_dir) { |profile, certificate_path|
-                update_firefox_profile_with_certificates(profile, certificate_path)
+                update_firefox_profile_with_certificates(profile, certificate_path) 
               }
             rescue RuntimeError => e
               an_exception = e
@@ -610,16 +622,17 @@ def compare_file_data(profile_path, file_name, expected_data)
 
             an_exception.should_not be_nil
           end
-
-          it 'should raise an exception if the secmod.db file is missing in the source directory' do
+          
+          it "should raise an exception if the secmod.db file is missing in the source directory" do
             profile = Selenium::WebDriver::Firefox::Profile.new
 
-            write_random_data(@cert8_db)
-            write_random_data(@key3_db)
+            cert8_data = write_random_data(@cert8_db)
+            key3_data = write_random_data(@key3_db)
+  
             an_exception = nil
-            begin
+            begin 
               CapybaraSetup.new.instance_exec(profile, @cert_dir) { |profile, certificate_path|
-                update_firefox_profile_with_certificates(profile, certificate_path)
+                update_firefox_profile_with_certificates(profile, certificate_path) 
               }
             rescue RuntimeError => e
               an_exception = e
@@ -628,7 +641,8 @@ def compare_file_data(profile_path, file_name, expected_data)
             an_exception.should_not be_nil
           end
 
-          it 'should update a firefox profile with valid references to certificate db files' do
+          it "should update a firefox profile with valid references to certificate db files" do
+       
             profile = Selenium::WebDriver::Firefox::Profile.new
 
             cert8_data = write_random_data(@cert8_db)
@@ -637,7 +651,7 @@ def compare_file_data(profile_path, file_name, expected_data)
 
             setup = CapybaraSetup.new
             result = setup.instance_exec(profile, @cert_dir) { |profile, certificate_path|
-              update_firefox_profile_with_certificates(profile, certificate_path)
+              update_firefox_profile_with_certificates(profile, certificate_path) 
             }
             profile_path = result.layout_on_disk
             compare_file_data(profile_path, 'cert8.db', cert8_data)
@@ -645,36 +659,41 @@ def compare_file_data(profile_path, file_name, expected_data)
             compare_file_data(profile_path, 'secmod.db', secmod_data)
           end
 
-          it 'should update a firefox profile with references to certificate db files with prefixes' do
+          it "should update a firefox profile with references to certificate db files with prefixes" do
+       
             profile = Selenium::WebDriver::Firefox::Profile.new
             cert_prefix = 'a'
             @cert8_db = @cert_dir + File::SEPARATOR + cert_prefix + 'cert8.db'
             @key3_db = @cert_dir + File::SEPARATOR + cert_prefix + 'key3.db'
             @secmod_db = @cert_dir + File::SEPARATOR + cert_prefix + 'secmod.db'
+ 
             cert8_data = write_random_data(@cert8_db)
             key3_data = write_random_data(@key3_db)
             secmod_data = write_random_data(@secmod_db)
 
             setup = CapybaraSetup.new
-            result = setup.instance_exec(profile, @cert_dir, cert_prefix) { |profile, certificate_path, certificate_prefix, _result|
-              update_firefox_profile_with_certificates(profile, certificate_path, certificate_prefix)
+            result = setup.instance_exec(profile, @cert_dir, cert_prefix) { |profile, certificate_path, certificate_prefix, result|
+              update_firefox_profile_with_certificates(profile, certificate_path, certificate_prefix) 
             }
             profile_path = result.layout_on_disk
             compare_file_data(profile_path, 'cert8.db', cert8_data)
             compare_file_data(profile_path, 'key3.db', key3_data)
             compare_file_data(profile_path, 'secmod.db', secmod_data)
           end
+
         end
+
       end
 
-      describe 'The BBC-INTERNAL firefox profile should be set up with the correct proxy settings whether working behind a proxy or not' do
-        context 'no proxy settings provided' do
+      describe "The BBC-INTERNAL firefox profile should be set up with the correct proxy settings whether working behind a proxy or not" do
+
+        context "no proxy settings provided" do
           before do
             ENV['BROWSER'] = 'firefox'
             ENV['ENVIRONMENT'] = 'test'
           end
 
-          it 'should create the firefox profile settings correctly' do
+          it "should create the firefox profile settings correctly" do
             setup = CapybaraSetup.new
             profile = setup.instance_exec('BBC_INTERNAL', nil) { |profile_name, additional_prefs|
               create_profile(profile_name, additional_prefs)
@@ -686,24 +705,24 @@ def compare_file_data(profile_path, file_name, expected_data)
           end
         end
 
-        context 'proxy settings provided' do
+        context "proxy settings provided" do
           before do
             @proxy_host = 'example.cache.co.uk'
             @proxy_port = 6789
             ENV['BROWSER'] = 'firefox'
             ENV['ENVIRONMENT'] = 'test'
-            ENV['HTTP_PROXY'] = 'http://#{@proxy_host}:#{@proxy_port}'
+            ENV['HTTP_PROXY'] = "http://#{@proxy_host}:#{@proxy_port}"
           end
 
-          it 'should create the firefox profile correctly' do
+          it "should create the firefox profile correctly" do
             setup = CapybaraSetup.new
             profile = setup.instance_exec('BBC_INTERNAL', nil) { |profile_name, additional_prefs|
               create_profile(profile_name, additional_prefs)
             }
 
-            profile.instance_variable_get('@additional_prefs')['network.proxy.type'].should eq 1
-            profile.instance_variable_get('@additional_prefs')['network.proxy.http'].should eq @proxy_host
-            profile.instance_variable_get('@additional_prefs')['network.proxy.http_port'].should eq @proxy_port
+            profile.instance_variable_get('@additional_prefs')['network.proxy.type'].should == 1    
+            profile.instance_variable_get('@additional_prefs')['network.proxy.http'].should == @proxy_host
+            profile.instance_variable_get('@additional_prefs')['network.proxy.http_port'].should == @proxy_port
           end
         end
       end
diff --git a/spec/frameworks_cucumber_spec.rb b/spec/frameworks_cucumber_spec.rb
index cdfbd62..1d10a6a 100644
--- a/spec/frameworks_cucumber_spec.rb
+++ b/spec/frameworks_cucumber_spec.rb
@@ -1,158 +1,162 @@
 require 'spec_helper'
 
 describe Frameworks::EnvHelper do
+
   before do
     ENV.clear
-    ENV['BROWSER'] = 'test' # mandatory data to prevent validation exception
+    ENV['BROWSER'] = 'test' #mandatory data to prevent validation exception
   end
 
-  describe 'set base url correctly' do
+  describe "set base url correctly" do
     include Frameworks::EnvHelper
 
-    it 'should be able to set a local url' do
+    it "should be able to set a local url" do
       ENV['ENVIRONMENT'] = 'sandbox'
       generate_base_urls
-      @base_url.should eq('http://pal.sandbox.dev.bbc.co.uk')
-      @ssl_base_url.should eq('https://ssl.sandbox.dev.bbc.co.uk')
-      @static_base_url.should eq('http://static.sandbox.dev.bbc.co.uk')
-      @m_base_url.should eq('http://m.sandbox.dev.bbc.co.uk')
-      @mobile_base_url.should eq('http://mobile.sandbox.dev.bbc.co.uk')
+      @base_url.should == 'http://pal.sandbox.dev.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.sandbox.dev.bbc.co.uk'
+      @static_base_url.should == 'http://static.sandbox.dev.bbc.co.uk'
+      @m_base_url.should == 'http://m.sandbox.dev.bbc.co.uk'
+      @mobile_base_url.should == 'http://mobile.sandbox.dev.bbc.co.uk'
     end
 
-    it 'should be able to set a local system6 url' do
+    it "should be able to set a local system6 url" do
       ENV['ENVIRONMENT'] = 'sandbox6'
       generate_base_urls
-      @base_url.should eq('http://sandbox.bbc.co.uk')
-      @ssl_base_url.should eq('https://ssl.sandbox.bbc.co.uk')
-      @static_base_url.should eq('http://static.sandbox.bbc.co.uk')
-      @m_base_url.should eq('http://m.sandbox.bbc.co.uk')
-      @mobile_base_url.should eq('http://mobile.sandbox.bbc.co.uk')
+      @base_url.should == 'http://sandbox.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.sandbox.bbc.co.uk'
+      @static_base_url.should == 'http://static.sandbox.bbc.co.uk'
+      @m_base_url.should == 'http://m.sandbox.bbc.co.uk'
+      @mobile_base_url.should == 'http://mobile.sandbox.bbc.co.uk'
     end
 
-    it 'should be able to set a base url' do
+    it "should be able to set a base url" do
       ENV['ENVIRONMENT'] = 'foo'
       generate_base_urls
-      @base_url.should eq('http://www.foo.bbc.co.uk')
-      @ssl_base_url.should eq('https://ssl.foo.bbc.co.uk')
-      @static_base_url.should eq('http://static.foo.bbci.co.uk')
-      @open_base_url.should eq('http://open.foo.bbc.co.uk')
-      @m_base_url.should eq('http://m.foo.bbc.co.uk')
-      @mobile_base_url.should eq('http://mobile.foo.bbc.co.uk')
+      @base_url.should == 'http://www.foo.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.foo.bbc.co.uk'
+      @static_base_url.should == 'http://static.foo.bbci.co.uk'
+      @open_base_url.should == 'http://open.foo.bbc.co.uk'
+      @m_base_url.should == 'http://m.foo.bbc.co.uk'
+      @mobile_base_url.should == 'http://mobile.foo.bbc.co.uk'
     end
 
-    it 'should set correct static base for www.live.bbc.co.uk' do
+    it "should set correct static base for www.live.bbc.co.uk" do
       ENV['ENVIRONMENT'] = 'live'
       generate_base_urls
-      @base_url.should eq('http://www.live.bbc.co.uk')
-      @ssl_base_url.should eq('https://ssl.live.bbc.co.uk')
-      @static_base_url.should eq('http://static.bbci.co.uk')
-      @open_base_url.should eq('http://open.live.bbc.co.uk')
-      @m_base_url.should eq('http://m.live.bbc.co.uk')
-      @mobile_base_url.should eq('http://mobile.live.bbc.co.uk')
+      @base_url.should == 'http://www.live.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.live.bbc.co.uk'
+      @static_base_url.should == 'http://static.bbci.co.uk'
+      @open_base_url.should == 'http://open.live.bbc.co.uk'
+      @m_base_url.should == 'http://m.live.bbc.co.uk'
+      @mobile_base_url.should == 'http://mobile.live.bbc.co.uk'
     end
 
-    it 'should be able to set a base url and not be case sensitive' do
+    it "should be able to set a base url and not be case sensitive" do
       ENV['ENVIRONMENT'] = 'fOo'
       generate_base_urls
-      @base_url.should eq('http://www.foo.bbc.co.uk')
-      @ssl_base_url.should eq('https://ssl.foo.bbc.co.uk')
-      @static_base_url.should eq('http://static.foo.bbci.co.uk')
-      @open_base_url.should eq('http://open.foo.bbc.co.uk')
-      @m_base_url.should eq('http://m.foo.bbc.co.uk')
-      @mobile_base_url.should eq('http://mobile.foo.bbc.co.uk')
+      @base_url.should == 'http://www.foo.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.foo.bbc.co.uk'
+      @static_base_url.should == 'http://static.foo.bbci.co.uk'
+      @open_base_url.should == 'http://open.foo.bbc.co.uk'
+      @m_base_url.should == 'http://m.foo.bbc.co.uk'
+      @mobile_base_url.should == 'http://mobile.foo.bbc.co.uk'
     end
 
-    it 'should set correct static base for www.live.bbc.co.uk and not be case sensitive' do
+    it "should set correct static base for www.live.bbc.co.uk and not be case sensitive" do
       ENV['ENVIRONMENT'] = 'LiVe'
       generate_base_urls
-      @base_url.should eq('http://www.live.bbc.co.uk')
-      @ssl_base_url.should eq('https://ssl.live.bbc.co.uk')
-      @static_base_url.should eq('http://static.bbci.co.uk')
-      @open_base_url.should eq('http://open.live.bbc.co.uk')
-      @m_base_url.should eq('http://m.live.bbc.co.uk')
-      @mobile_base_url.should eq('http://mobile.live.bbc.co.uk')
+      @base_url.should == 'http://www.live.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.live.bbc.co.uk'
+      @static_base_url.should == 'http://static.bbci.co.uk'
+      @open_base_url.should == 'http://open.live.bbc.co.uk'
+      @m_base_url.should == 'http://m.live.bbc.co.uk'
+      @mobile_base_url.should == 'http://mobile.live.bbc.co.uk'
     end
 
+
     it "should be able to set a 'classic' live url and not be case sensitive" do
       ENV['ENVIRONMENT'] = 'Live'
-      ENV['WWW_LIVE'] = 'false'
+      ENV['WWW_LIVE'] = 'false' 
       generate_base_urls
-      @base_url.should eq('http://www.bbc.co.uk')
-      @ssl_base_url.should eq('https://ssl.bbc.co.uk')
-      @static_base_url.should eq('http://static.bbci.co.uk')
-      @open_base_url.should eq('http://open.bbc.co.uk')
-      @m_base_url.should eq('http://m.bbc.co.uk')
-      @mobile_base_url.should eq('http://mobile.bbc.co.uk')
+      @base_url.should == 'http://www.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.bbc.co.uk'
+      @static_base_url.should == 'http://static.bbci.co.uk'
+      @open_base_url.should == 'http://open.bbc.co.uk'
+      @m_base_url.should == 'http://m.bbc.co.uk'
+      @mobile_base_url.should == 'http://mobile.bbc.co.uk'
     end
 
-    it 'should be able to set pal url and not be case sensitive' do
+    it "should be able to set pal url and not be case sensitive" do
       ENV['ENVIRONMENT'] = 'Live'
       generate_base_urls
-      @base_url.should eq('http://www.live.bbc.co.uk')
-      @pal_base_url.should eq('http://pal.live.bbc.co.uk')
-      @ssl_base_url.should eq('https://ssl.live.bbc.co.uk')
-      @static_base_url.should eq('http://static.bbci.co.uk')
-      @open_base_url.should eq('http://open.live.bbc.co.uk')
-      @m_base_url.should eq('http://m.live.bbc.co.uk')
-      @mobile_base_url.should eq('http://mobile.live.bbc.co.uk')
+      @base_url.should == 'http://www.live.bbc.co.uk'
+      @pal_base_url.should == 'http://pal.live.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.live.bbc.co.uk'
+      @static_base_url.should == 'http://static.bbci.co.uk'
+      @open_base_url.should == 'http://open.live.bbc.co.uk'
+      @m_base_url.should == 'http://m.live.bbc.co.uk'
+      @mobile_base_url.should == 'http://mobile.live.bbc.co.uk'
     end
 
-    it 'pal url should still have environment even if asking for classic live url' do
+    it "pal url should still have environment even if asking for classic live url" do
       ENV['ENVIRONMENT'] = 'Live'
-      ENV['WWW_LIVE'] = 'false'
+      ENV['WWW_LIVE'] = 'false' 
       generate_base_urls
-      @base_url.should eq('http://www.bbc.co.uk')
-      @pal_base_url.should eq('http://pal.live.bbc.co.uk')
-      @ssl_base_url.should eq('https://ssl.bbc.co.uk')
-      @static_base_url.should eq('http://static.bbci.co.uk')
-      @open_base_url.should eq('http://open.bbc.co.uk')
-      @m_base_url.should eq('http://m.bbc.co.uk')
-      @mobile_base_url.should eq('http://mobile.bbc.co.uk')
+      @base_url.should == 'http://www.bbc.co.uk'
+      @pal_base_url.should == 'http://pal.live.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.bbc.co.uk'
+      @static_base_url.should == 'http://static.bbci.co.uk'
+      @open_base_url.should == 'http://open.bbc.co.uk'
+      @m_base_url.should == 'http://m.bbc.co.uk'
+      @mobile_base_url.should == 'http://mobile.bbc.co.uk'
     end
 
-    it 'should be able to set scheme to ssl' do
+
+
+    it "should be able to set scheme to ssl" do
       ENV['SCHEME'] = 'https'
       ENV['ENVIRONMENT'] = 'foo'
       generate_base_urls
-      @base_url.should eq('https://www.foo.bbc.co.uk')
-      @ssl_base_url.should eq('https://ssl.foo.bbc.co.uk')
-      @static_base_url.should eq('https://static.foo.bbci.co.uk')
-      @open_base_url.should eq('https://open.foo.bbc.co.uk')
+      @base_url.should == 'https://www.foo.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.foo.bbc.co.uk'
+      @static_base_url.should == 'https://static.foo.bbci.co.uk'
+      @open_base_url.should == 'https://open.foo.bbc.co.uk'
     end
 
-    it 'should be able to set proxy host and port correctly to use in tests using HTTP_PROXY env variable' do
+    it "should be able to set proxy host and port correctly to use in tests using HTTP_PROXY env variable" do
       ENV['ENVIRONMENT'] = 'foo'
       ENV['HTTP_PROXY'] = 'http://mycache.co.uk:8080'
       generate_base_urls
-      @proxy_host.should eq('mycache.co.uk')
-      @proxy_port.should eq('8080')
+      @proxy_host.should == "mycache.co.uk"
+      @proxy_port.should == "8080"
     end
 
-    it 'should be able to set proxy host correctly to use in tests using http_proxy env variable' do
+    it "should be able to set proxy host correctly to use in tests using http_proxy env variable" do
       ENV['ENVIRONMENT'] = 'foo'
       ENV['http_proxy'] = 'http://mycache.co.uk:8080'
       generate_base_urls
-      @proxy_host.should eq('mycache.co.uk')
-      @proxy_port.should eq('8080')
+      @proxy_host.should == "mycache.co.uk"
+      @proxy_port.should == "8080"
     end
 
-    it 'should be able to use 80 as default proxy port when none specified' do
+    it "should be able to use 80 as default proxy port when none specified" do
       ENV['ENVIRONMENT'] = 'foo'
       ENV['http_proxy'] = 'http://mycache.co.uk'
       generate_base_urls
-      @proxy_host.should eq('mycache.co.uk')
-      @proxy_port.should eq('80')
+      @proxy_host.should == "mycache.co.uk"
+      @proxy_port.should == "80"
     end
 
     it "should be able to handle an environment variable which doesn't have the protocol" do
       ENV['ENVIRONMENT'] = 'foo'
       ENV['http_proxy'] = 'mycache.co.uk'
       generate_base_urls
-      @proxy_host.should eq('mycache.co.uk')
-      @proxy_port.should eq('80')
+      @proxy_host.should == "mycache.co.uk"
+      @proxy_port.should == "80"
     end
 
-    it 'should be able to have an empty http_proxy environment variable' do
+    it "should be able to have an empty http_proxy environment variable" do
       ENV['ENVIRONMENT'] = 'foo'
       ENV['http_proxy'] = ''
       generate_base_urls
@@ -160,96 +164,115 @@
       @proxy_port.should be_nil
     end
 
-    it 'should be able to set a local url with expected domain' do
+    it "should be able to set a local url with expected domain" do
       ENV['ENVIRONMENT'] = 'sandbox'
       ENV['FW_BBC_DOMAIN'] = 'bbc.com'
       generate_base_urls
-      @base_url.should eq('http://pal.sandbox.dev.bbc.com')
-      @ssl_base_url.should eq('https://ssl.sandbox.dev.bbc.com')
-      @static_base_url.should eq('http://static.sandbox.dev.bbc.com')
-      @m_base_url.should eq('http://m.sandbox.dev.bbc.com')
-      @mobile_base_url.should eq('http://mobile.sandbox.dev.bbc.com')
+      @base_url.should == 'http://pal.sandbox.dev.bbc.com'
+      @ssl_base_url.should == 'https://ssl.sandbox.dev.bbc.com'
+      @static_base_url.should == 'http://static.sandbox.dev.bbc.com'
+      @m_base_url.should == 'http://m.sandbox.dev.bbc.com'
+      @mobile_base_url.should == 'http://mobile.sandbox.dev.bbc.com'
     end
 
-    it 'should be able to set a local system6 url with expected domain' do
+    it "should be able to set a local system6 url with expected domain" do
       ENV['ENVIRONMENT'] = 'sandbox6'
       ENV['FW_BBC_DOMAIN'] = 'bbc.com'
       generate_base_urls
-      @base_url.should eq('http://sandbox.bbc.com')
-      @ssl_base_url.should eq('https://ssl.sandbox.bbc.com')
-      @static_base_url.should eq('http://static.sandbox.bbc.com')
-      @m_base_url.should eq('http://m.sandbox.bbc.com')
-      @mobile_base_url.should eq('http://mobile.sandbox.bbc.com')
+      @base_url.should == 'http://sandbox.bbc.com'
+      @ssl_base_url.should == 'https://ssl.sandbox.bbc.com'
+      @static_base_url.should == 'http://static.sandbox.bbc.com'
+      @m_base_url.should == 'http://m.sandbox.bbc.com'
+      @mobile_base_url.should == 'http://mobile.sandbox.bbc.com'
     end
 
-    it 'should be able to set a base url with expected domain' do
+    it "should be able to set a base url with expected domain" do
       ENV['ENVIRONMENT'] = 'foo'
       ENV['FW_BBC_DOMAIN'] = 'bbc.com'
       generate_base_urls
-      @base_url.should eq('http://www.foo.bbc.com')
-      @ssl_base_url.should eq('https://ssl.foo.bbc.com')
-      @static_base_url.should eq('http://static.foo.bbci.co.uk')
-      @open_base_url.should eq('http://open.foo.bbc.com')
-      @m_base_url.should eq('http://m.foo.bbc.com')
-      @mobile_base_url.should eq('http://mobile.foo.bbc.com')
+      @base_url.should == 'http://www.foo.bbc.com'
+      @ssl_base_url.should == 'https://ssl.foo.bbc.com'
+      @static_base_url.should == 'http://static.foo.bbci.co.uk'
+      @open_base_url.should == 'http://open.foo.bbc.com'
+      @m_base_url.should == 'http://m.foo.bbc.com'
+      @mobile_base_url.should == 'http://mobile.foo.bbc.com'
     end
 
-    it 'should set public facing live domain' do
+    it "should set public facing live domain" do
       ENV['ENVIRONMENT'] = 'live'
       ENV['WWW_LIVE'] = 'false'
       ENV['FW_BBC_DOMAIN'] = 'bbc.com'
       generate_base_urls
-      @base_url.should eq('http://www.bbc.com')
-      @ssl_base_url.should eq('https://ssl.bbc.com')
-      @static_base_url.should eq('http://static.bbci.co.uk')
-      @open_base_url.should eq('http://open.bbc.com')
-      @m_base_url.should eq('http://m.bbc.com')
-      @mobile_base_url.should eq('http://mobile.bbc.com')
+      @base_url.should == 'http://www.bbc.com'
+      @ssl_base_url.should == 'https://ssl.bbc.com'
+      @static_base_url.should == 'http://static.bbci.co.uk'
+      @open_base_url.should == 'http://open.bbc.com'
+      @m_base_url.should == 'http://m.bbc.com'
+      @mobile_base_url.should == 'http://mobile.bbc.com'
+    end
+
+=begin
+#don't want to push proxy addr online
+    it "should be able to validate xhtml online" do
+      @proxy_host = ''
+      @proxy_port = ''
+      xhtml = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>a</title></head><body><p>a</p></body></html>'
+      validate_online(xhtml)
+    end
+
+    it "should be able to report errors for invalid markup" do
+      @proxy_host = ''
+      @proxy_port = ''
+      xhtml = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><nosuchelement><title>a</title></head><body><p>a</p></body></html>'
+      expect {
+        validate_online(xhtml)
+      }.to raise_error(RuntimeError)
     end
+=end
   end
 
-  describe 'independent mechanize agent' do
+    describe "independent mechanize agent" do
     include Frameworks::EnvHelper
 
-    it 'should allow you to create an independent, configured mechanize object' do
+    it "should allow you to create an independent, configured mechanize object" do
       ENV['HTTP_PROXY'] = 'http://mycache.co.uk:80'
       agent = new_mechanize
       agent.should be_a_kind_of Mechanize
-      agent.proxy_addr.should eq('mycache.co.uk')
+      agent.proxy_addr.should == 'mycache.co.uk'
     end
 
-    it 'the proxy should be separately configurable' do
-      agent = new_mechanize('http://mycache.co.uk:80')
+    it "the proxy should be separately configurable" do
+      agent = new_mechanize(http_proxy='http://mycache.co.uk:80')
       agent.should be_a_kind_of Mechanize
-      agent.proxy_addr.should eq('mycache.co.uk')
+      agent.proxy_addr.should == 'mycache.co.uk'
     end
 
-    it 'the proxy should be ignored if the no_proxy exclusion is set' do
+   it "the proxy should be ignored if the no_proxy exclusion is set" do
       proxy_host = 'mycache.co.uk'
       proxy_port = '80'
-      proxy_uri = 'http://' + proxy_host + ':' + proxy_port
+      proxy_uri = 'http://'  + proxy_host + ':' + proxy_port
       no_proxy = 'ignore_this_host'
       ENV['NO_PROXY'] = no_proxy
-      agent = new_mechanize(proxy_uri)
+      agent = new_mechanize(http_proxy=proxy_uri)
       expect(agent).to be_a_kind_of Mechanize
       expect(agent.agent.http.proxy_uri.host).to eq(proxy_host)
       expect(agent.agent.http.proxy_uri.port).to eq(proxy_port.to_i)
-      no_proxy_array = [no_proxy]
+      no_proxy_array = [ no_proxy ]
       expect(agent.agent.http.no_proxy).to eq(no_proxy_array)
     end
 
-    it 'the proxy should be ignored if the no_proxy exclusion is set with multiple values' do
+    it "the proxy should be ignored if the no_proxy exclusion is set with multiple values" do
       proxy_host = 'mycache.co.uk'
       proxy_port = '80'
-      proxy_uri = 'http://' + proxy_host + ':' + proxy_port
+      proxy_uri = 'http://'  + proxy_host + ':' + proxy_port
       no_proxy1 = 'ignore_this_host'
       no_proxy2 = '.and.this.domain'
       ENV['NO_PROXY'] = no_proxy1 + ', ' + no_proxy2
-      agent = new_mechanize(proxy_uri)
+      agent = new_mechanize(http_proxy=proxy_uri)
       expect(agent).to be_a_kind_of Mechanize
       expect(agent.agent.http.proxy_uri.host).to eq(proxy_host)
       expect(agent.agent.http.proxy_uri.port).to eq(proxy_port.to_i)
-      no_proxy_array = [no_proxy1, no_proxy2]
+      no_proxy_array = [ no_proxy1, no_proxy2 ]
       expect(agent.agent.http.no_proxy).to eq(no_proxy_array)
     end
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 02cc03a..07f6632 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -9,7 +9,7 @@
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift "#{dir}/../lib"
 c = Cucumber::Configuration.new
-Cucumber::RbSupport::RbLanguage.new(Cucumber::Runtime.new, c) # Need to load Cucumber runtime, so World is available
+Cucumber::RbSupport::RbLanguage.new(Cucumber::Runtime.new, c) #Need to load Cucumber runtime, so World is available 
 
 require 'frameworks/capybara'
 require 'frameworks/cucumber'
diff --git a/spec/unit_test_monkeypatches.rb b/spec/unit_test_monkeypatches.rb
index b721543..56dcc88 100644
--- a/spec/unit_test_monkeypatches.rb
+++ b/spec/unit_test_monkeypatches.rb
@@ -4,14 +4,17 @@
 module Selenium
   module WebDriver
     module Firefox
+
       # @api private
       module Util
         module_function
 
         def app_data_path
-          File.dirname(__FILE__)
+           File.dirname(__FILE__)
         end
+
       end # Util
     end # Firefox
   end # WebDriver
 end # Selenium
+
diff --git a/spec/wait_spec.rb b/spec/wait_spec.rb
index bf87887..c94338a 100644
--- a/spec/wait_spec.rb
+++ b/spec/wait_spec.rb
@@ -4,18 +4,19 @@
   let(:test) { Class.new { include FrameworksCapybara::Wait }.new }
 
   describe 'wait_for' do
-    it 'should exit silently if the block returns true' do
+    it "should exit silently if the block returns true" do
       test.wait_for { true }
     end
 
-    it 'should raise an exception if the default timeout expires' do
+    it "should raise an exception if the default timeout expires" do
+      start_time = Time.now
       expect { test.wait_for('foo') { true == false } }.to raise_error
     end
 
-    it 'should raise an exception if the specified timeout expires' do
+    it "should raise an exception if the specified timeout expires" do
       start_time = Time.now
       expect {
-        test.wait_for('', timeout: 1) do
+        test.wait_for('',timeout: 1) do
           Time.now > (start_time + (2 * 60))
         end
       }.to raise_error
@@ -36,12 +37,12 @@
   describe 'wait for an arbitrary assertion' do
     it 'should catch provided exception until block no longer raises it' do
       error = ZeroDivisionError
-      expect(test.wait_for_no_exception('msg', error) { 1 / 1 == 1 }).to eql true
+      expect(test.wait_for_no_exception('msg', error) { 1/1 == 1 }).to eql true
     end
 
     it 'should catch provided exception until block no longer raises it or timeout' do
       error = ZeroDivisionError
-      expect { test.wait_for_no_exception('msg', error) { expect(1 / 0).to eql 1 } }.to raise_error(error)
+      expect { test.wait_for_no_exception('msg', error) { expect(1/0).to eql 1 } }.to raise_error(error)
     end
   end
 end

From 77b94f5f78699fbe7005dda89d6d790370a15cd5 Mon Sep 17 00:00:00 2001
From: Swati Tabib <swati.tabib.ext@bbc.co.uk>
Date: Fri, 28 Jul 2017 16:14:10 +0100
Subject: [PATCH 47/62] removing chrome driver code

---
 lib/frameworks/capybara.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index 0120860..3a887b2 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -70,14 +70,11 @@ def initialize
     # always register in case we are using a configuration that swaps between drivers
     mech_driver = register_mechanize_driver(capybara_opts)
     poltergeist_driver = register_poltergeist_driver(capybara_opts)
-    headless_chromium_driver = register_headless_chromium_driver(capybara_opts)
     case capybara_opts[:browser]
     when :mechanize then
       @driver = mech_driver
     when :poltergeist then
       @driver = poltergeist_driver
-    when :headless_chromium then
-      @driver = headless_chromium_driver
     else
       @driver = register_selenium_driver(capybara_opts, selenium_remote_opts, custom_opts)
     end

From 15c9023845986703d9b47462fde757a4e4345db0 Mon Sep 17 00:00:00 2001
From: Ankit Jain <ankit.jain.ext@bbc.co.uk>
Date: Fri, 28 Jul 2017 16:30:31 +0100
Subject: [PATCH 48/62] Revert "Revert "Rubocop fixes""

---
 .rubocop.yml                                  |  14 +
 README.rdoc                                   |   4 +-
 Rakefile                                      |   6 +-
 frameworks-capybara.gemspec                   |  47 +-
 lib/frameworks/capybara.rb                    | 175 +++----
 lib/frameworks/cucumber.rb                    |  96 ++--
 .../extensions/capybara-extensions.rb         |  69 ---
 .../capybara-mechanize-extensions.rb          |  70 ---
 lib/frameworks/extensions/patches.rb          |  16 +-
 lib/frameworks/logger.rb                      |   4 +-
 lib/frameworks/utils.rb                       |   5 +-
 lib/frameworks/wait.rb                        |   7 +-
 lib/tasks/frameworks-tasks.rb                 |  46 +-
 lib/tasks/merge_cucumber_json_reports.rb      |   4 +-
 lib/tasks/parallel-tasks.rb                   |  13 +-
 lib/version.rb                                |   2 +-
 spec/frameworks_capybara_spec.rb              | 489 +++++++++---------
 spec/frameworks_cucumber_spec.rb              | 269 +++++-----
 spec/spec_helper.rb                           |   2 +-
 spec/unit_test_monkeypatches.rb               |   5 +-
 spec/wait_spec.rb                             |  13 +-
 21 files changed, 586 insertions(+), 770 deletions(-)
 create mode 100644 .rubocop.yml
 delete mode 100644 lib/frameworks/extensions/capybara-extensions.rb
 delete mode 100644 lib/frameworks/extensions/capybara-mechanize-extensions.rb

diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 0000000..08750bd
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,14 @@
+Metrics/LineLength:
+  Max: 150
+
+Metrics/AbcSize:
+  Max: 21
+
+Metrics/MethodLength:
+  Max: 25
+
+Metrics/ClassLength:
+  Max: 250
+
+Metrics/CyclomaticComplexity:
+  Max: 10
\ No newline at end of file
diff --git a/README.rdoc b/README.rdoc
index ce677d1..a0ef305 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -10,10 +10,10 @@ The principle behind this gem is to factor out all the common setup code for reg
 
 Below are the current drivers that can be registered:
 
-* Selenium-Webdriver (Selenium2) - LOCAL: This can be used to drive 'in-browser' tests runnong on your local machine in IE, Firefox and Chrome (and any other browsers as and when they are added into the Selenium-Webdriver project)
+* Selenium-Webdriver (Selenium2) - LOCAL: This can be used to drive 'in-browser' tests running on your local machine in IE, Firefox and Chrome (and any other browsers as and when they are added into the Selenium-Webdriver project)
 
 
-* Selenium-Webdriver (Selenium2) - REMOTE: This can be used to drive 'in-browser' tests on a remote macine, this could be another macine on your local network which is running a Selenium-Webdriver server or indeed a cloud service such as 'Sauce Labs'
+* Selenium-Webdriver (Selenium2) - REMOTE: This can be used to drive 'in-browser' tests on a remote machine, this could be another machine on your local network which is running a Selenium-Webdriver server or indeed a cloud service such as 'Sauce Labs'
 
 * Mechanize-Caybara: This can be used, by setting BROWSER=mechanize
 
diff --git a/Rakefile b/Rakefile
index ed6c73a..89db265 100644
--- a/Rakefile
+++ b/Rakefile
@@ -5,8 +5,8 @@ require 'cucumber/rake/task'
 
 Bundler::GemHelper.install_tasks
 
-desc "Run all examples"
+desc 'Run all examples'
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = %w[--color]
+  t.rspec_opts = %w(--color)
 end
-task :default => [:spec]
+task default: [:spec]
diff --git a/frameworks-capybara.gemspec b/frameworks-capybara.gemspec
index fd2cd27..789847e 100644
--- a/frameworks-capybara.gemspec
+++ b/frameworks-capybara.gemspec
@@ -1,35 +1,34 @@
 # -*- encoding: utf-8 -*-
+
 lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
 require 'version'
 
 Gem::Specification.new do |s|
-  s.name = "frameworks-capybara"
+  s.name = 'frameworks-capybara'
   s.version = FrameworksCapybara::VERSION
 
-  s.authors = ["matt robbins"]
-  s.email = ["mcrobbins@gmail.com"]
-  s.description = "Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches"
-
-  s.files = Dir.glob("{features,lib,bin,config,vendor,.bundle}/**/*") +  %w(Gemfile Gemfile.lock)
-
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.4.2"
-  s.summary = "Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches"
+  s.authors = ['Radio and Music Test team']
+  s.email = ['']
+  s.description = 'Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches'
 
-  s.files         = `git ls-files`.split("\n")
+  s.files = Dir.glob('{features,lib,bin,config,vendor,.bundle}/**/*') + %w(Gemfile Gemfile.lock)
 
-  s.add_runtime_dependency("selenium-webdriver")
-  s.add_runtime_dependency("capybara", '~> 2.5')
-  s.add_runtime_dependency("mechanize")
-  s.add_runtime_dependency("capybara-mechanize")
-  s.add_runtime_dependency("poltergeist")
-  s.add_runtime_dependency("json")
-  s.add_runtime_dependency("cucumber")
-  s.add_runtime_dependency("logging")
-  s.add_runtime_dependency("show_me_the_cookies")
-  s.add_runtime_dependency("w3c_validators")
-  s.add_development_dependency("rake")
-  s.add_development_dependency("rspec")
+  s.require_paths = ['lib']
+  s.rubygems_version = '2.4.2'
+  s.summary = 'Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches'
+  s.files = `git ls-files`.split("\n")
+  s.add_runtime_dependency('selenium-webdriver')
+  s.add_runtime_dependency('capybara', '~> 2.5')
+  s.add_runtime_dependency('mechanize')
+  s.add_runtime_dependency('capybara-mechanize')
+  s.add_runtime_dependency('poltergeist')
+  s.add_runtime_dependency('json')
+  s.add_runtime_dependency('cucumber')
+  s.add_runtime_dependency('logging')
+  s.add_runtime_dependency('show_me_the_cookies')
+  s.add_runtime_dependency('w3c_validators')
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rspec')
 end
diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index 3deae83..0120860 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -3,77 +3,81 @@
 require 'capybara/mechanize'
 require 'capybara/poltergeist'
 require 'selenium-webdriver'
-require 'frameworks/extensions/capybara-extensions'
-require 'frameworks/extensions/capybara-mechanize-extensions'
 
+# Register drivers
 class CapybaraSetup
-
   attr_reader :driver
 
   def initialize
-
     http_proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
     browser_cli_args = ENV['BROWSER_CLI_ARGS'].split(/\s+/).compact if ENV['BROWSER_CLI_ARGS']
 
-    capybara_opts = {:environment => ENV['ENVIRONMENT'],
-      :http_proxy => http_proxy,
-      :profile => ENV['FIREFOX_PROFILE'],
-      :browser => ENV['BROWSER'],
-      :webdriver_proxy_on => ENV['PROXY_ON'],
-      :url => ENV['REMOTE_URL'],
-      :chrome_switches => ENV['CHROME_SWITCHES'],
-      :firefox_prefs => ENV['FIREFOX_PREFS'],
-      :args => browser_cli_args
+    capybara_opts = {
+      environment: ENV['ENVIRONMENT'],
+      http_proxy: http_proxy,
+      profile: ENV['FIREFOX_PROFILE'],
+      browser: ENV['BROWSER'],
+      webdriver_proxy_on: ENV['PROXY_ON'],
+      url: ENV['REMOTE_URL'],
+      chrome_switches: ENV['CHROME_SWITCHES'],
+      firefox_prefs: ENV['FIREFOX_PREFS'],
+      args: browser_cli_args
     }
 
-    selenium_remote_opts = {:os => ENV['PLATFORM'],
-      :os_version => ENV['PLATFORM_VERSION'],
-      :browser_name => ENV['REMOTE_BROWSER'],
-      :browser_version => ENV['REMOTE_BROWSER_VERSION'],
-      :url => ENV['REMOTE_URL']
+    selenium_remote_opts = {
+      os: ENV['PLATFORM'],
+      os_version: ENV['PLATFORM_VERSION'],
+      browser_name: ENV['REMOTE_BROWSER'],
+      browser_version: ENV['REMOTE_BROWSER_VERSION'],
+      url: ENV['REMOTE_URL']
     }
 
-    custom_opts = {:job_name => ENV['SAUCE_JOB_NAME'],
-      :max_duration => ENV['SAUCE_MAX_DURATION'],
-      :firefox_cert_path => ENV['FIREFOX_CERT_PATH'],
-      :firefox_cert_prefix => ENV['FIREFOX_CERT_PREFIX'],
-      :browserstack_build => ENV['BS_BUILD'],
-      :browserstack_debug => ENV['BS_DEBUG'] || 'true', # BrowserStack debug mode on by default
-      :browserstack_device => ENV['BS_DEVICE'],
-      :browserstack_device_orientation => ENV['BS_DEVICE_ORIENTATION'],
-      :browserstack_project => ENV['BS_PROJECT'],
-      :browserstack_resolution => ENV['BS_RESOLUTION'],
-      :appium_platform => ENV['APPIUM_PLATFORM'],
-      :appium_device => ENV['APPIUM_DEVICE'],
-      :appium_browser => ENV['APPIUM_BROWSER'],
-      :appium_udid => ENV['APPIUM_UDID']
+    custom_opts = {
+      job_name: ENV['SAUCE_JOB_NAME'],
+      max_duration: ENV['SAUCE_MAX_DURATION'],
+      firefox_cert_path: ENV['FIREFOX_CERT_PATH'],
+      firefox_cert_prefix: ENV['FIREFOX_CERT_PREFIX'],
+      browserstack_build: ENV['BS_BUILD'],
+      browserstack_debug: ENV['BS_DEBUG'] || 'true', # BrowserStack debug mode on by default
+      browserstack_device: ENV['BS_DEVICE'],
+      browserstack_device_orientation: ENV['BS_DEVICE_ORIENTATION'],
+      browserstack_project: ENV['BS_PROJECT'],
+      browserstack_resolution: ENV['BS_RESOLUTION'],
+      appium_platform: ENV['APPIUM_PLATFORM'],
+      appium_device: ENV['APPIUM_DEVICE'],
+      appium_browser: ENV['APPIUM_BROWSER'],
+      appium_udid: ENV['APPIUM_UDID']
     }
+    # validate environment variables set using cucumber.yml or passed via command line
+    validate_env_vars(capybara_opts.merge(selenium_remote_opts), custom_opts)
 
-    validate_env_vars(capybara_opts.merge(selenium_remote_opts), custom_opts) #validate environment variables set using cucumber.yml or passed via command line
-
-    if(capybara_opts[:http_proxy])
+    if capybara_opts[:http_proxy]
       proxy_uri = URI(capybara_opts[:http_proxy])
       @proxy_host = proxy_uri.host
       @proxy_port = proxy_uri.port
     end
-    capybara_opts[:browser] = capybara_opts[:browser].intern #update :browser value to be a symbol, required for Selenium
-    selenium_remote_opts[:browser_name] = selenium_remote_opts[:browser_name].intern if selenium_remote_opts[:browser_name]#update :browser value to be a symbol, required for Selenium
-
-    Capybara.run_server = false #Disable rack server
-
-    [capybara_opts, selenium_remote_opts, custom_opts].each do |opts| #delete nil options and environment (which is only used for validation)
-
-      opts.delete_if {|k,v| (v.nil? or k == :environment)}
+    # update :browser value to be a symbol, required for Selenium
+    capybara_opts[:browser] = capybara_opts[:browser].intern
+    # update :browser value to be a symbol, required for Selenium
+    selenium_remote_opts[:browser_name] = selenium_remote_opts[:browser_name].intern if selenium_remote_opts[:browser_name]
+
+    Capybara.run_server = false # Disable rack server
+    # delete nil options and environment (which is only used for validation)
+    [capybara_opts, selenium_remote_opts, custom_opts].each do |opts|
+      opts.delete_if { |k, v| (v.nil? || k == :environment) }
     end
 
     # always register in case we are using a configuration that swaps between drivers
     mech_driver = register_mechanize_driver(capybara_opts)
     poltergeist_driver = register_poltergeist_driver(capybara_opts)
+    headless_chromium_driver = register_headless_chromium_driver(capybara_opts)
     case capybara_opts[:browser]
     when :mechanize then
       @driver = mech_driver
     when :poltergeist then
       @driver = poltergeist_driver
+    when :headless_chromium then
+      @driver = headless_chromium_driver
     else
       @driver = register_selenium_driver(capybara_opts, selenium_remote_opts, custom_opts)
     end
@@ -87,12 +91,12 @@ def validate_env_vars(opts, custom_opts)
     msg1 = 'Please ensure following environment variables are set ENVIRONMENT [int|test|stage|live], BROWSER[headless|ie|chrome|firefox] and HTTP_PROXY (if required)'
     msg2 = 'Please ensure the following environment variables are set PLATFORM, REMOTE_URL, REMOTE_BROWSER (browser to use on remote machine), HTTP_PROXY (if required), REMOTE_BROWSER_PROXY (if required) and BROWSER_VERSION (if required)'
 
-    [:environment, :browser].each { |item| !opts.has_key?(item) or opts[item]==nil ? raise(msg1) : '' }
+    [:environment, :browser].each { |item| !opts.key?(item) || opts[item].nil? ? raise(msg1) : '' }
 
     if custom_opts[:appium_platform]
-      [:url].each { |item| !opts.has_key?(item) or opts[item]==nil ? raise(msg2) : '' }
-    elsif opts[:browser]=='remote'
-      [:url, :browser_name].each { |item| !opts.has_key?(item) or opts[item]==nil ? raise(msg2) : '' }
+      [:url].each { |item| !opts.key?(item) || opts[item].nil? ? raise(msg2) : '' }
+    elsif opts[:browser] == 'remote'
+      [:url, :browser_name].each { |item| !opts.key?(item) || opts[item].nil? ? raise(msg2) : '' }
     end
   end
 
@@ -102,11 +106,11 @@ def update_firefox_profile_with_certificates(profile, certificate_path, certific
 
     # Create links to the certificate files in the profile directory
     ['cert8.db', 'key3.db', 'secmod.db'].each do |cert_file|
-      source_file = "#{certificate_prefix}#{cert_file}"
+      source_file = '#{certificate_prefix}#{cert_file}'
       source_path = "#{certificate_path}" + File::SEPARATOR + source_file
       dest_path = profile_path + File::SEPARATOR + cert_file
-      if(! File.exist?(source_path))
-        raise "Firefox cert db file #{source_path} does not exist."
+      unless File.exist?(source_path)
+        raise 'Firefox cert db file #{source_path} does not exist.'
       end
       FileUtils.cp(source_path, dest_path)
     end
@@ -115,14 +119,13 @@ def update_firefox_profile_with_certificates(profile, certificate_path, certific
     profile = Selenium::WebDriver::Firefox::Profile.new(profile_path)
 
     # Avoid Firefox certificate alerts
-    profile["security.default_personal_cert"] = 'Select Automatically'
+    profile['security.default_personal_cert'] = 'Select Automatically'
 
-    return profile
+    # return profile
   end
 
-  def register_selenium_driver(opts,remote_opts,custom_opts)
+  def register_selenium_driver(opts, remote_opts, custom_opts)
     Capybara.register_driver :selenium do |app|
-
       if opts[:firefox_prefs] || opts[:profile]
         opts[:profile] = create_profile(opts[:profile], opts[:firefox_prefs])
 
@@ -131,7 +134,7 @@ def register_selenium_driver(opts,remote_opts,custom_opts)
         end
       end
 
-      opts[:switches] = [opts.delete(:chrome_switches)] if(opts[:chrome_switches])
+      opts[:switches] = [opts.delete(:chrome_switches)] if opts[:chrome_switches]
 
       if opts[:browser] == :remote
         client = Selenium::WebDriver::Remote::Http::Default.new
@@ -140,27 +143,25 @@ def register_selenium_driver(opts,remote_opts,custom_opts)
         remote_opts[:firefox_profile] = opts.delete :profile if opts[:profile]
         remote_opts['chrome.switches'] = opts.delete :switches if opts[:switches]
         caps = Selenium::WebDriver::Remote::Capabilities.new(remote_opts)
-
-        add_custom_caps(caps, custom_opts) if remote_opts[:url].include? 'saucelabs' #set sauce specific parameters - will this scupper other on sauce remote jobs?
-
-        add_browserstack_caps(caps, custom_opts) if remote_opts[:url].include? 'browserstack' #set browserstack specific parameters
-
-        add_appium_caps(caps, custom_opts) if custom_opts.keys.join.include?('appium')  #set appium specific parameters
+        # set sauce specific parameters - will this scupper other on sauce remote jobs?
+        add_custom_caps(caps, custom_opts) if remote_opts[:url].include? 'saucelabs'
+        # set browserstack specific parameters
+        add_browserstack_caps(caps, custom_opts) if remote_opts[:url].include? 'browserstack'
+        # set appium specific parameters
+        add_appium_caps(caps, custom_opts) if custom_opts.keys.join.include?('appium')
 
         opts[:desired_capabilities] = caps
         opts[:http_client] = client
       end
 
       clean_opts(opts, :http_proxy, :webdriver_proxy_on, :firefox_prefs)
-      Capybara::Selenium::Driver.new(app,opts)
+      Capybara::Selenium::Driver.new(app, opts)
     end
     :selenium
   end
 
-  def add_custom_caps(caps, custom_opts)
-    sauce_time_limit = custom_opts.delete(:max_duration).to_i #note nil.to_i == 0
-    # This no longer works with the latest selenium-webdriver release
-    #caps.custom_capabilities({:'job-name' => (custom_opts[:job_name] or 'frameworks-unamed-job'), :'max-duration' => ((sauce_time_limit if sauce_time_limit != 0) or 1800)})
+  def add_custom_caps(_caps, custom_opts)
+    custom_opts.delete(:max_duration).to_i # note nil.to_i == 0
   end
 
   def add_browserstack_caps(caps, custom_opts)
@@ -180,43 +181,41 @@ def add_appium_caps(caps, custom_opts)
   end
 
   def set_client_proxy(opts)
-    Selenium::WebDriver::Proxy.new(:http => opts[:http_proxy]) if opts[:http_proxy] && opts[:webdriver_proxy_on] != 'false' #set proxy on client connection if required, note you may use ENV['HTTP_PROXY'] for setting in browser (ff profile) but not for client conection, hence allow for PROXY_ON=false
+    # set proxy on client connection if required, note you may use ENV['HTTP_PROXY'] for setting in browser (ff profile) but not for client conection, hence allow for PROXY_ON=false
+    Selenium::WebDriver::Proxy.new(http: opts[:http_proxy]) if opts[:http_proxy] && opts[:webdriver_proxy_on] != 'false'
   end
 
   def create_profile(profile_name = nil, additional_prefs = nil)
     additional_prefs = JSON.parse(additional_prefs) if additional_prefs
-    if(additional_prefs && !profile_name)
+    if additional_prefs && !profile_name
       profile = Selenium::WebDriver::Firefox::Profile.new
-      profile.native_events = true
-    elsif(profile_name == 'BBC_INTERNAL')
+    elsif profile_name == 'BBC_INTERNAL'
       profile = Selenium::WebDriver::Firefox::Profile.new
-      if(@proxy_host && @proxy_port)
-        profile["network.proxy.type"] = 1
-        profile["network.proxy.no_proxies_on"] = "*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk"
-        profile["network.proxy.http"] = @proxy_host
-        profile["network.proxy.ssl"] = @proxy_host
-        profile["network.proxy.http_port"] = @proxy_port
-        profile["network.proxy.ssl_port"] = @proxy_port
+      if @proxy_host && @proxy_port
+        profile['network.proxy.type'] = 1
+        profile['network.proxy.no_proxies_on'] = '*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk'
+        profile['network.proxy.http'] = @proxy_host
+        profile['network.proxy.ssl'] = @proxy_host
+        profile['network.proxy.http_port'] = @proxy_port
+        profile['network.proxy.ssl_port'] = @proxy_port
       end
-      profile.native_events = true
     else
       profile = Selenium::WebDriver::Firefox::Profile.from_name profile_name
-      profile.native_events = true
     end
+    profile.native_events = true
 
     if additional_prefs
       additional_prefs.each do |k, v|
         profile[k] = v
       end
     end
-
     profile
   end
 
-  def register_mechanize_driver(opts)
+  def register_mechanize_driver(_opts)
     # Mechanize needs a Rack application: create a dummy one
     app = Proc.new do |env|
-      ['200', {'Content-Type' => 'text/html'}, ['A barebones rack app.']]
+      ['200', { 'Content-Type' => 'text/html' }, ['A barebones rack app.']]
     end
     Capybara.app = app
     Capybara.run_server = false
@@ -226,11 +225,10 @@ def register_mechanize_driver(opts)
     :mechanize
   end
 
-
   def register_poltergeist_driver(opts)
-    ## Poltergiest needs a Rack application: create a dummy one
-    app = Proc.new do |env|
-      ['200', {'Content-Type' => 'text/html'}, ['A barebones rack app.']]
+    # Poltergiest needs a Rack application: create a dummy one
+    app = Proc.new do
+      ['200', { 'Content-Type' => 'text/html' }, ['A barebones rack app.']]
     end
     phantom_opts = %w(--ignore-ssl-errors=true)
     phantom_opts.push "--ssl-client-certificate-file=#{ENV['FW_CERT_LOCATION']}" if ENV['FW_CERT_LOCATION']
@@ -238,7 +236,7 @@ def register_poltergeist_driver(opts)
     Capybara.app = app
     Capybara.run_server = false
     options = {
-      js_errors: false,
+      js_errors: true,
       timeout:   120,
       window_size: [1200, 1000],
       phantomjs_options: phantom_opts,
@@ -246,7 +244,7 @@ def register_poltergeist_driver(opts)
     }
     options[:phantomjs] = ENV['PHANTOMJS_PATH'] if ENV['PHANTOMJS_PATH'] && !ENV['PHANTOMJS_PATH'].empty?
     Capybara.register_driver :poltergeist do |app|
-      Capybara.app_host = "http://www.bbc.co.uk"
+      Capybara.app_host = 'http://www.bbc.co.uk'
       Capybara::Poltergeist::Driver.new(app, options)
     end
     :poltergeist
@@ -257,5 +255,4 @@ def clean_opts(opts, *args)
       opts.delete arg
     end
   end
-
 end
diff --git a/lib/frameworks/cucumber.rb b/lib/frameworks/cucumber.rb
index c4e16bd..11118d3 100644
--- a/lib/frameworks/cucumber.rb
+++ b/lib/frameworks/cucumber.rb
@@ -2,28 +2,29 @@
 require 'w3c_validators'
 
 module Frameworks
+  # Generate base urls to use in Cucumber step defs
   module EnvHelper
     include W3CValidators
-    #Generate base urls to use in Cucumber step defs
-    def generate_base_urls 
-      environment = ENV['ENVIRONMENT'].downcase #be defensive
+    # Generate base urls to use in Cucumber step defs
+    def generate_base_urls
+      environment = ENV['ENVIRONMENT'].downcase # be defensive
 
       prepare_host
 
-      if(environment =='sandbox')
-        @base_url = @sandbox + @bbc_domain 
-        @pal_base_url = @sandbox + @bbc_domain 
+      if environment == 'sandbox'
+        @base_url = @sandbox + @bbc_domain
+        @pal_base_url = @sandbox + @bbc_domain
         @ssl_base_url = @sslsandbox + @bbc_domain
         @static_base_url = @static_sandbox + @bbc_domain
-        @mobile_base_url = @mobiledot_prefix + "sandbox.dev" + @bbc_domain
-        @m_base_url = @mdot_prefix + "sandbox.dev" + @bbc_domain
-      elsif(environment =='sandbox6')
-        @base_url = @sandbox6 + @bbc_domain 
-        @pal_base_url = @sandbox6 + @bbc_domain 
+        @mobile_base_url = @mobiledot_prefix + 'sandbox.dev' + @bbc_domain
+        @m_base_url = @mdot_prefix + 'sandbox.dev' + @bbc_domain
+      elsif environment == 'sandbox6'
+        @base_url = @sandbox6 + @bbc_domain
+        @pal_base_url = @sandbox6 + @bbc_domain
         @ssl_base_url = @sslsandbox6 + @bbc_domain
         @static_base_url = @static_sandbox6 + @bbc_domain
-        @mobile_base_url = @mobiledot_prefix + "sandbox" + @bbc_domain
-        @m_base_url = @mdot_prefix + "sandbox" + @bbc_domain
+        @mobile_base_url = @mobiledot_prefix + 'sandbox' + @bbc_domain
+        @m_base_url = @mdot_prefix + 'sandbox' + @bbc_domain
       elsif environment == 'live'
         @base_url = @www_prefix.chop + @bbc_domain
         @pal_base_url = @pal_prefix + environment + @bbc_domain
@@ -43,48 +44,43 @@ def generate_base_urls
         @m_base_url = @mdot_prefix + environment + @bbc_domain
       end
 
-      proxy = ENV['http_proxy'] || ENV['HTTP_PROXY'] 
-      proxy_parts = proxy.scan(/(?:http:\/\/)?([^\:]+)(?::(\d+))?/) if proxy && !proxy.empty?
+      proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
+      proxy_parts = proxy.scan(%r{(?:http://)?([^\:]+)(?::(\d+))?}) if proxy && !proxy.empty?
       if proxy_parts && !proxy_parts.empty?
-          @proxy_host = proxy_parts[0][0]
-          if proxy_parts[0][1]
-              @proxy_port = proxy_parts[0][1]
-          else
-              @proxy_port = "80"
-          end
+        @proxy_host = proxy_parts[0][0]
+        @proxy_port = if proxy_parts[0][1]
+                        proxy_parts[0][1]
+                      else
+                        '80'
+                      end
       end
     end
 
     def validate_online(src, validator_args = nil)
-
-      args = {:proxy_host => @proxy_host,:proxy_port => @proxy_port} 
-      if(validator_args != nil)
-         args = args.merge(validator_args)
-      end    
+      args = { proxy_host: @proxy_host, proxy_port: @proxy_port }
+      args = args.merge(validator_args) unless validator_args.nil?
       @validator = MarkupValidator.new(args)
 
       @validator.set_doctype!(:xhtml)
       begin
-
         results = @validator.validate_text(src)
 
-        if results.errors.length > 0
+        unless results.errors.empty?
           results.errors.each do |err|
             puts err.to_s
           end
-          raise "W3C Validation failed."
+          raise 'W3C Validation failed.'
         end
-
       rescue SystemCallError => e
-        puts "System error whilst performing request to W3C: #{e}"  
+        puts "System error whilst performing request to W3C: #{e}"
       end
     end
 
     def prepare_host
-      ENV['SCHEME']=='https' ? scheme = 'https' : scheme = 'http'
+      scheme = ENV['SCHEME'] == 'https' ? 'https' : 'http'
       @www_prefix = "#{scheme}://www."
       @pal_prefix = "#{scheme}://pal."
-      @ssl_prefix = "https://ssl."
+      @ssl_prefix = 'https://ssl.'
       @static_prefix = "#{scheme}://static."
       @open_prefix = "#{scheme}://open."
       @bbc_domain = '.' + (ENV['FW_BBC_DOMAIN'] || 'bbc.co.uk')
@@ -93,57 +89,55 @@ def prepare_host
       @sandbox6 = "#{scheme}://sandbox"
       @mobiledot_prefix = "#{scheme}://mobile."
       @mdot_prefix = "#{scheme}://m."
-      @sslsandbox = "https://ssl.sandbox.dev"
-      @sslsandbox6 = "https://ssl.sandbox"
+      @sslsandbox = 'https://ssl.sandbox.dev'
+      @sslsandbox6 = 'https://ssl.sandbox'
       @static_sandbox = "#{scheme}://static.sandbox.dev"
-      @static_sandbox6 = "#{scheme}://static.sandbox"      
+      @static_sandbox6 = "#{scheme}://static.sandbox"
     end
 
-    def setup_mechanize(agent, http_proxy=nil)
+    def setup_mechanize(agent, http_proxy = nil)
       http_proxy = http_proxy || ENV['HTTP_PROXY'] || ENV['http_proxy']
 
       if ENV['FW_CERT_LOCATION']
-        agent.cert, agent.key = ENV['FW_CERT_LOCATION'], ENV['FW_CERT_LOCATION'] 
+        agent.cert = ENV['FW_CERT_LOCATION']
+        agent.key = ENV['FW_CERT_LOCATION']
       end
 
       agent.ca_file = ENV['CA_CERT_LOCATION'] if ENV['CA_CERT_LOCATION']
-      agent.set_proxy(http_proxy.scan(/http:\/\/(.*):80/)[0][0].to_s,80) if http_proxy && !http_proxy.empty?
+      agent.set_proxy(http_proxy.scan(%r{http://(.*):80})[0][0].to_s, 80) if http_proxy && !http_proxy.empty?
 
       # The above proxy setting ignores any no_proxy variable setting:
       # added the following to circumvent this
-      if(http_proxy)
+      if http_proxy
         no_proxy = ENV['NO_PROXY'] || ENV['no_proxy']
-        if(no_proxy)
+        if no_proxy
           # The no_proxy query string argument must not contain spaces
-          no_proxy_qs = no_proxy.gsub(/[, ]+/,',')
+          no_proxy_qs = no_proxy.gsub(/[, ]+/, ',')
           agent.agent.http.proxy = URI(http_proxy + '?no_proxy=' + no_proxy_qs)
         end
       end
 
-      #This is necessary because Mech2 does not ship with root certs like Mech1 did and boxes may not have the OpenSSL set installed
+      # This is necessary because Mech2 does not ship with root certs like Mech1 did and boxes may not have the OpenSSL set installed
       agent.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
       # This prevents Mechanize from raising a Mechanize::ResponseCodeError
       # when the HTTP Response Code is 404 or 503. This lets capybara continue the journey.
-      agent.agent.allowed_error_codes = ['404', '503']
+      agent.agent.allowed_error_codes = %w(404 503)
     end
 
-    def new_mechanize(http_proxy=nil)
+    def new_mechanize(http_proxy = nil)
       require 'mechanize'
       agent = Mechanize.new
       setup_mechanize(agent, http_proxy)
       agent
     end
+  end # EnvHelper
+end # Frameworks
 
-  end #EnvHelper
-end #Frameworks
-
-
-#Add module into world to ensure visibility of instance variables within Cucumber
+# Add module into world to ensure visibility of instance variables within Cucumber
 World(Frameworks::EnvHelper)
 
 Before do
   setup_mechanize(page.driver.browser.agent) if page.driver.class == Capybara::Mechanize::Driver
   generate_base_urls
 end
-
diff --git a/lib/frameworks/extensions/capybara-extensions.rb b/lib/frameworks/extensions/capybara-extensions.rb
deleted file mode 100644
index f910d31..0000000
--- a/lib/frameworks/extensions/capybara-extensions.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'selenium-webdriver'
-
-#
-# Cookie utility methods
-#
-class Capybara::Selenium::Driver
-  def cookies
-    browser.manage.all_cookies
-  end
-
-  def cookie_named(name)
-    browser.manage.cookie_named(name)
-  end
-
-  def delete_cookie(cookie)
-    browser.manage.delete_cookie(cookie)
-  end
-
-  def delete_all_cookies
-    browser.manage.delete_all_cookies
-  end
-
-  def add_cookie(attribs)
-    browser.manage.add_cookie(attribs)
-  end
-
-   def delete_cookies_in_domain(domain)
-    browser.manage.delete_cookies_in_domain(domain)
-  end
-end
-
-module Capybara
-  class Session
-    ##
-    # Get all cookies
-    #
-    # @return [Array<Hash>] list of cookies
-    #
-    def cookies
-      driver.cookies
-    end
-
-    ##
-    # Get the cookie with the given name
-    #
-    # @param [String] name the name of the cookie
-    # @return [Hash, nil] the cookie, or nil if it wasn't found.
-    #
-    def cookie_named(name)
-      driver.cookie_named(name)
-    end
-
-    def delete_cookie(cookie)
-      driver.delete_cookie(cookie)
-    end
-
-    def delete_all_cookies
-      driver.delete_all_cookies
-    end
-
-    def add_cookie(attribs)
-      driver.add_cookie(attribs)
-    end
-
-    def delete_cookies_in_domain(domain)
-      driver.delete_cookies_in_domain(domain)
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/frameworks/extensions/capybara-mechanize-extensions.rb b/lib/frameworks/extensions/capybara-mechanize-extensions.rb
deleted file mode 100644
index 662d19b..0000000
--- a/lib/frameworks/extensions/capybara-mechanize-extensions.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-require 'capybara/mechanize/cucumber' 
-
-# Cookie handling extensions
-class Capybara::Mechanize::Driver
-
-  def cookies
-    cookies = []
-
-    browser.agent.cookie_jar.jar.each do |domain|
-      domain[1].each do |path|
-        path[1].each do |cookie|
-          
-          cookies.push({
-            :name => cookie[1].name,
-            :value => cookie[1].value,
-            :domain => cookie[1].domain,
-            :secure => cookie[1].secure,
-            :expires => cookie[1].expires,
-            :httponly => cookie[1].httponly,
-            :path => cookie[1].path
-          })
-        end
-      end
-    end
-    cookies
-  end
-
-  def cookie_named(name)
-    cookies.find { |c| c[:name] == name }
-  end
-
-  def delete_cookie(cookie_name)
-    browser.agent.cookie_jar.jar.each do |domain|
-      domain[1].each do |path|
-        path[1].each do |cookie|
-          if cookie[0] == cookie_name
-            browser.agent.cookie_jar.jar[domain[0]][path[0]].delete(cookie[0])
-          end
-        end
-      end
-    end
-  end
-
-  def delete_all_cookies
-    browser.agent.cookie_jar.clear!
-  end
-
-  def delete_cookies_in_domain(domain)
-    cookies.each do |cookie|
-      delete_cookie(cookie[:name]) if cookie[:domain].include?(domain)
-    end
-  end
-
-  def add_cookie(attribs)
-    
-    cookie = HTTP::Cookie.new(
-      attribs[:name],
-      attribs[:value],
-      :domain => attribs[:domain],
-      :for_domain => true,
-      :path => '/',
-      :expires => attribs[:expires],
-      :secure => attribs[:secure],
-      :httponly => attribs[:httponly]
-    )
-
-    browser.agent.cookie_jar.add(cookie)
-
-  end
-end
diff --git a/lib/frameworks/extensions/patches.rb b/lib/frameworks/extensions/patches.rb
index 38544a6..ae29935 100644
--- a/lib/frameworks/extensions/patches.rb
+++ b/lib/frameworks/extensions/patches.rb
@@ -1,20 +1,21 @@
 require 'show_me_the_cookies'
 require 'capybara'
 require 'frameworks/logger'
+
 # monkey patches live here - beware!
 module Capybara
   # override behaviour of visit to surpress bbc survey
   class Session
     include ShowMeTheCookies
     include FrameworksCapybara::Logger
-
-    alias_method :old_visit, :visit
+    
+    alias old_visit visit
     def visit(url)
+      Capybara.current_driver
       old_visit url
       return if [:mechanize, :poltergeist].include?(Capybara.current_driver)
       surpress_cookies_prompt
-      #reload_if_survey_appears
-      close_music_banner
+      # reload_if_survey_appears
     end
 
     def surpress_cookies_prompt
@@ -26,16 +27,11 @@ def reload_if_survey_appears
       reload = false
       within_frame('edr_l_first') do
         if has_selector?('#layer_wrap', wait: 1)
-          log.info 'Found survey, will now reload page - only true x browser solution for now'
+          log.info 'Found survey, will now reload the page'
           reload = true
         end
       end
       visit current_url if reload
     end
-
-    def close_music_banner
-      close_banner_button = '#mn-prompt--where-is-playlister button'
-      find(close_banner_button).click if has_selector?(close_banner_button, wait: 1)
-    end
   end
 end
diff --git a/lib/frameworks/logger.rb b/lib/frameworks/logger.rb
index af943cc..813ef5f 100644
--- a/lib/frameworks/logger.rb
+++ b/lib/frameworks/logger.rb
@@ -4,7 +4,7 @@ module FrameworksCapybara
   # configure logging
   module Logger
     def log_level
-      log_levels = %w(warn info debug)
+      log_levels = %w[warn info debug]
       env_log_level = (ENV['LOG_LEVEL'] || '').downcase
       log_levels.include?(env_log_level) ? env_log_level.to_sym : :debug
     end
@@ -24,7 +24,7 @@ def default_style
       scheme = 'pldefault'
       Logging.color_scheme(
         scheme,
-        levels: { info:  :green, warn:  :yellow, error: :red },
+        levels: { info: :green, warn: :yellow, error: :red },
         date:    :cyan,
         logger:  :cyan,
         message: :cyan
diff --git a/lib/frameworks/utils.rb b/lib/frameworks/utils.rb
index 1f6c228..eda4804 100644
--- a/lib/frameworks/utils.rb
+++ b/lib/frameworks/utils.rb
@@ -1,5 +1,6 @@
 # generic util methods
 module FrameworksCapybara
+  # generic util methods
   module Utils
     def rubyize(english_string)
       english_string.tr(' ', '_').downcase
@@ -17,8 +18,8 @@ def clean_id_cookies
     def browser
       if Capybara.current_driver == :selenium
         Capybara.current_session.driver.browser.manage
-        .instance_variable_get('@bridge')
-        .instance_variable_get('@capabilities')[:browser_name]
+                .instance_variable_get('@bridge')
+                .instance_variable_get('@capabilities')[:browser_name]
       else
         Capybara.current_driver
       end
diff --git a/lib/frameworks/wait.rb b/lib/frameworks/wait.rb
index ae1817f..3b6e59c 100644
--- a/lib/frameworks/wait.rb
+++ b/lib/frameworks/wait.rb
@@ -1,8 +1,8 @@
 require 'time'
 
 module FrameworksCapybara
+  # wait for elements methods
   module Wait
-    ##
     # Execute a block until it returns true.
     # Optionally pass a message and timeout (default 10 seconds).
     #
@@ -15,7 +15,6 @@ def wait_for(message = '', options = { timeout: 5 })
       end
     end
 
-    ##
     # Execute a block containing RSpec assertion, catch failures and wait till it passes
     # Pass an exception message to be outputted on failure and a block
     # Optionally pass a timeout, sleep interval
@@ -40,13 +39,13 @@ def wait_for_assertion(exception_message, timeout = Capybara.default_max_wait_ti
     # end
     #
     def wait_for_no_exception(exception_message, exception, timeout = Capybara.default_max_wait_time, sleep_interval = 1, &block)
-      fail 'You need to provide a block' unless block_given?
+      raise 'You need to provide a block' unless block_given?
       test_exception = 'check did not return within timeout window.'
       begin
         Timeout.timeout(timeout) do
           loop do
             begin
-              block.call
+              yield
               return true
             rescue exception => assertion_exception
               puts "#{exception_message} - rescuing: #{exception.to_s} and trying to call block again!"
diff --git a/lib/tasks/frameworks-tasks.rb b/lib/tasks/frameworks-tasks.rb
index 14296c4..e9832c2 100644
--- a/lib/tasks/frameworks-tasks.rb
+++ b/lib/tasks/frameworks-tasks.rb
@@ -1,13 +1,14 @@
+# Rake Tasks
 class RakeHelpers
-  INVOKE_CUCUMBER = "bin/cucumber -r features"
+  INVOKE_CUCUMBER = 'bin/cucumber -r features'.freeze
 
   class << self
     def install
-      system('bundle install --no-cache --binstubs --path vendor/bundle') 
+      system('bundle install --no-cache --binstubs --path vendor/bundle')
     end
 
     def color(text, options = {})
-      #ANSI color codes
+      # ANSI color codes
       case options[:color]
       when :red
         text = "\033[31m#{text}\033[0m"
@@ -20,54 +21,53 @@ def color(text, options = {})
     end
 
     def list_profiles
-      puts 'Available profiles:' 
+      puts 'Available profiles:'
       f =  File.open('config/cucumber.yml', 'r')
       linenum = 0
       @profiles = {}
       f.readlines.each do |line|
         line.scan(/.*?: /) do |match|
           linenum += 1
-          puts color(linenum.to_s + '. ', :color => :yellow) + color(match.gsub(':',''), :color => :green)
-          @profiles[linenum.to_s] = match.gsub(':','')
+          puts color(linenum.to_s + '. ', color: yellow) + color(match.delete(':', ''), color: green)
+          @profiles[linenum.to_s] = match.delete(':', '')
         end
       end
     end
 
     def update
-      system('bundle update') 
+      system('bundle update')
     end
 
-    def run_feature(feature, profile='default')
+    def run_feature(feature, profile = 'default')
       system("#{INVOKE_CUCUMBER} -p #{profile} features/#{feature}.feature")
     end
 
-    def run_profile(profile='default')
+    def run_profile(profile = 'default')
       system("#{INVOKE_CUCUMBER} -p #{profile}")
     end
 
-
     def start_app
-      $: << File.dirname( __FILE__)
+      $LOAD_PATH << File.dirname(__FILE__)
       require 'lib/spec/test_app'
-      Rack::Handler::WEBrick.run TestApp, :Port => 8070
+      Rack::Handler::WEBrick.run TestApp, Port: 8070
     end
 
     def run_local
-      if(RUBY_PLATFORM == 'java')
-        abort color("This script only works if you are running on MRI ('normal') Ruby....sorry....", :color => :red) 
+      if RUBY_PLATFORM == 'java'
+        abort color("This script only works if you are running on MRI ('normal') Ruby....sorry....", color: red)
       end
-      puts color('*********************************************',:color => :green)
-      puts color('*                                           *',:color => :green)
-      puts color('* Cucumber Acceptance Tests                 *',:color => :green)
-      puts color('* Pre-Requisites:                           *',:color => :green)
-      puts color('* ruby 1.8.7, bundler, rake                 *',:color => :green)
-      puts color('*                                           *',:color => :green)
-      puts color('*********************************************',:color => :green)
+      puts color('*********************************************', color: green)
+      puts color('*                                           *', color: green)
+      puts color('* Cucumber Acceptance Tests                 *', color: green)
+      puts color('* Pre-Requisites:                           *', color: green)
+      puts color('* ruby 1.8.7, bundler, rake                 *', color: green)
+      puts color('*                                           *', color: green)
+      puts color('*********************************************', color: green)
       list_profiles
       puts 'Above is a list of the available profiles, please enter the number of the profile you wish to run: '
       profile = STDIN.gets.chomp
-      #TODO: Add some input validation?
-      puts "The profile chosen is: #{color(@profiles[profile], :color => :red)}"
+      # TODO: Add some input validation?
+      puts "The profile chosen is: #{color(@profiles[profile], color: red)}"
       puts 'Preparing to bundle required gems...'
       install
       puts 'Preparing to run tests...'
diff --git a/lib/tasks/merge_cucumber_json_reports.rb b/lib/tasks/merge_cucumber_json_reports.rb
index 70d190b..4e74eb1 100644
--- a/lib/tasks/merge_cucumber_json_reports.rb
+++ b/lib/tasks/merge_cucumber_json_reports.rb
@@ -31,8 +31,8 @@ def update(fname, feature, report)
   end
 
   def rerun
-    puts "Processing rerun json"
-    json_rerun = Dir.glob "reports/rerun.json"
+    puts 'Processing rerun json'
+    json_rerun = Dir.glob 'reports/rerun.json'
     if json_rerun.empty?
       puts 'no rerun file found'
     else
diff --git a/lib/tasks/parallel-tasks.rb b/lib/tasks/parallel-tasks.rb
index a237667..1632126 100644
--- a/lib/tasks/parallel-tasks.rb
+++ b/lib/tasks/parallel-tasks.rb
@@ -1,3 +1,4 @@
+# parallel tasks
 class ParallelTasks
   include Rake::DSL if defined? Rake::DSL
 
@@ -47,7 +48,7 @@ def get_thread_count
     end
 
     def write_confluence_report(passfail)
-      require "erb"
+      require 'erb'
       green = '#4CD672'
       red = '#EA4D61'
       template = File.read(File.dirname(__FILE__) + '/confluence.erb')
@@ -80,7 +81,7 @@ def write_confluence_report(passfail)
     end
 
     desc 'Run cukes on production in parallel with browserstack chrome'
-    task :parallel_cuke do |t|
+    task :parallel_cuke do
       sh "#{bundle_exec}parallel_cucumber -n #{get_thread_count} -o '#{tags} #{env}' #{features_dir}"
     end
 
@@ -97,7 +98,7 @@ def write_confluence_report(passfail)
       result = (selenium_successful || rerun_successful) == true ? 'pass' : 'fail'
       puts "Overall result is #{result}"
       write_confluence_report(result)
-      fail 'Cucumber Failure' if result == 'fail'
+      raise 'Cucumber Failure' if result == 'fail'
     end
 
     desc 'Remove all files from the ./reports and ./doc directory'
@@ -118,11 +119,11 @@ def write_confluence_report(passfail)
         original_reports = Dir.entries junit_dir
         thread_reports = Dir.entries "#{junit_dir}#{thread}"
         thread_reports.reject { |f| File.directory?(f) }.each do |report|
-          if  original_reports.include?(report)
+          if original_reports.include?(report)
             sh "#{bundle_exec}junit_merge #{junit_dir}#{thread}/#{report} #{junit_dir}/#{report}"
           else
-            puts  "copy #{junit_dir}#{thread}/#{report} to #{junit_dir}"
-            FileUtils.cp  "#{junit_dir}#{thread}/#{report}", junit_dir
+            puts "copy #{junit_dir}#{thread}/#{report} to #{junit_dir}"
+            FileUtils.cp "#{junit_dir}#{thread}/#{report}", junit_dir
           end
         end
       end
diff --git a/lib/version.rb b/lib/version.rb
index c0f8fe8..4514fc7 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -1,3 +1,3 @@
 module FrameworksCapybara
-  VERSION = '3.0.0'
+  VERSION = '3.0.0'.freeze
 end
diff --git a/spec/frameworks_capybara_spec.rb b/spec/frameworks_capybara_spec.rb
index 22ec3ab..97416e1 100644
--- a/spec/frameworks_capybara_spec.rb
+++ b/spec/frameworks_capybara_spec.rb
@@ -1,12 +1,12 @@
 require 'spec_helper'
 require 'securerandom'
-##
-#Monkey Patch
-#This is required because Capybara has module methods (singletons) which create
-#a session and then re-use this whenever Capybara is referenced in the current process. 
-#Therefore even creating new instances of CapybaraSetup will use the same session and driver instance
-#...not picking up changes in the different tests below.  
-#Hence the only option is to clean out the session before each test.
+
+# Monkey Patch
+# This is required because Capybara has module methods (singletons) which create
+# a session and then re-use this whenever Capybara is referenced in the current process.
+# Therefore even creating new instances of CapybaraSetup will use the same session and driver instance
+# not picking up changes in the different tests below.
+# Hence the only option is to clean out the session before each test.
 module Capybara
   class << self
     def delete_session
@@ -15,105 +15,104 @@ def delete_session
   end
 end
 
-shared_examples_for "Selenium Driver Options Array" do
-  it "should contain no nil values for unset options" do
-    #TODO: Test for nil elements in options - there shouldn't be any that we insert
-    #i.e. anything in our ENV options should not end up being nil in Selenium
-    Capybara.current_session.driver.options[:environment].should == nil
-    Capybara.current_session.driver.options[:http_proxy].should == nil
-    Capybara.current_session.driver.options[:webdriver_proxy_on].should == nil
-    Capybara.current_session.driver.options[:platform].should == nil
-    Capybara.current_session.driver.options[:browser_name].should == nil
-    Capybara.current_session.driver.options[:version].should == nil
-    Capybara.current_session.driver.options[:job_name].should == nil
-    Capybara.current_session.driver.options[:chrome_switches].should == nil
-    Capybara.current_session.driver.options[:firefox_prefs].should == nil
-    Capybara.current_session.driver.options[:max_duration].should == nil
+shared_examples_for 'Selenium Driver Options Array' do
+  it 'should contain no nil values for unset options' do
+    # TODO: Test for nil elements in options - there shouldn't be any that we insert
+    # i.e. anything in our ENV options should not end up being nil in Selenium
+    Capybara.current_session.driver.options[:environment].should eq nil
+    Capybara.current_session.driver.options[:http_proxy].should eq nil
+    Capybara.current_session.driver.options[:webdriver_proxy_on].should eq nil
+    Capybara.current_session.driver.options[:platform].should eq nil
+    Capybara.current_session.driver.options[:browser_name].should eq nil
+    Capybara.current_session.driver.options[:version].should eq nil
+    Capybara.current_session.driver.options[:job_name].should eq nil
+    Capybara.current_session.driver.options[:chrome_switches].should eq nil
+    Capybara.current_session.driver.options[:firefox_prefs].should eq nil
+    Capybara.current_session.driver.options[:max_duration].should eq nil
     Capybara.current_session.driver.options[:profile].should_not be_a_kind_of String
     Capybara.current_session.driver.options[:browser].should_not be_a_kind_of String
   end
 end
 
 describe CapybaraSetup do
-
   before(:each) do
     home = ENV['HOME']
     appdata = ENV['APPDATA']
     ENV.clear
-    ENV['HOME'] = home #Want to clear some env variables but HOME is used by Webdriver, therefore need to preserve it
+    ENV['HOME'] = home # Want to clear some env variables but HOME is used by Webdriver, therefore need to preserve it
     ENV['APPDATA'] = appdata
   end
 
-  describe "should validate options" do
+  describe 'should validate options' do
     before(:each) do
       Capybara.delete_session
     end
 
-    it "should require as a minimum ENVIRONMENT and BROWSER" do
-      lambda {CapybaraSetup.new}.should raise_error(RuntimeError,'Please ensure following environment variables are set ENVIRONMENT [int|test|stage|live], BROWSER[headless|ie|chrome|firefox] and HTTP_PROXY (if required)')
+    it 'should require as a minimum ENVIRONMENT and BROWSER' do
+      lambda { CapybaraSetup.new }.should raise_error(RuntimeError, 'Please ensure following environment variables are set ENVIRONMENT [int|test|stage|live], BROWSER[headless|ie|chrome|firefox] and HTTP_PROXY (if required)')
     end
 
-    it "should require as a minimum ENVIRONMENT, BROWSER and REMOTE_BROWSER if running a Remote Selenium Instance" do
+    it 'should require as a minimum ENVIRONMENT, BROWSER and REMOTE_BROWSER if running a Remote Selenium Instance' do
       ENV['BROWSER'] = 'remote'
       ENV['ENVIRONMENT'] = 'test'
-      lambda {CapybaraSetup.new}.should raise_error(RuntimeError,'Please ensure the following environment variables are set PLATFORM, REMOTE_URL, REMOTE_BROWSER (browser to use on remote machine), HTTP_PROXY (if required), REMOTE_BROWSER_PROXY (if required) and BROWSER_VERSION (if required)')
+      lambda { CapybaraSetup.new }.should raise_error(RuntimeError, 'Please ensure the following environment variables are set PLATFORM, REMOTE_URL, REMOTE_BROWSER (browser to use on remote machine), HTTP_PROXY (if required), REMOTE_BROWSER_PROXY (if required) and BROWSER_VERSION (if required)')
     end
 
-    it "should not error if ENVIRONMENT and BROWSER are provided" do
+    it 'should not error if ENVIRONMENT and BROWSER are provided' do
       ENV['BROWSER'] = 'headless'
       ENV['ENVIRONMENT'] = 'test'
-      lambda {CapybaraSetup.new}.should_not raise_error
+      lambda { CapybaraSetup.new }.should_not raise_error
     end
 
-    it "should not error if ENVIRONMENT, BROWSER and REMOTE_BROSWER are provided if running a Remote Selenium Instance" do
+    it 'should not error if ENVIRONMENT, BROWSER and REMOTE_BROSWER are provided if running a Remote Selenium Instance' do
       ENV['BROWSER'] = 'remote'
       ENV['ENVIRONMENT'] = 'test'
       ENV['REMOTE_BROWSER'] = 'test'
       ENV['REMOTE_URL'] = 'test'
-      lambda {CapybaraSetup.new}.should_not raise_error
+      lambda { CapybaraSetup.new }.should_not raise_error
     end
   end
 
-  describe "should allow Capybara drivers to be created" do
+  describe 'should allow Capybara drivers to be created' do
     before do
       ENV['ENVIRONMENT'] = 'test'
     end
 
-    describe "should allow Selenium driver to be created" do
-      context "with minimal Selenium driver" do
+    describe 'should allow Selenium driver to be created' do
+      context 'with minimal Selenium driver' do
         before do
           ENV['BROWSER'] = 'firefox'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :firefox
+          Capybara.current_session.driver.options[:browser].should eq :firefox
         end
 
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with no command-line arguments supplied" do
+      context 'with no command-line arguments supplied' do
         before do
           ENV['BROWSER'] = 'phantomjs'
         end
 
-        it "should be initialized correctly" do
+        it 'should be initialized correctly' do
           Capybara.delete_session
           expect(CapybaraSetup.new.driver).to eq :selenium
           expect(Capybara.current_session.driver.options[:args]).to be nil
         end
       end
 
-      context "with single command-line argument supplied" do
+      context 'with single command-line argument supplied' do
         before do
           ENV['BROWSER'] = 'phantomjs'
           ENV['BROWSER_CLI_ARGS'] = '--ignore-ssl-errors=true'
         end
 
-        it "should be initialized correctly" do
+        it 'should be initialized correctly' do
           Capybara.delete_session
           expect(CapybaraSetup.new.driver).to eq :selenium
           args = Capybara.current_session.driver.options[:args]
@@ -123,13 +122,13 @@ def delete_session
         end
       end
 
-      context "with multiple command-line arguments supplied" do
+      context 'with multiple command-line arguments supplied' do
         before do
           ENV['BROWSER'] = 'phantomjs'
           ENV['BROWSER_CLI_ARGS'] = '--ignore-ssl-errors=true --remote-debugger-port=9000'
         end
 
-        it "should be initialized correctly" do
+        it 'should be initialized correctly' do
           Capybara.delete_session
           expect(CapybaraSetup.new.driver).to eq :selenium
           args = Capybara.current_session.driver.options[:args]
@@ -140,25 +139,24 @@ def delete_session
         end
       end
 
-      context "with Selenium driver and default firefox profile (from profiles.ini)" do
+      context 'with Selenium driver and default firefox profile (from profiles.ini)' do
         before do
           ENV['BROWSER'] = 'firefox'
           ENV['FIREFOX_PROFILE'] = 'default'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :firefox
+          Capybara.current_session.driver.options[:browser].should eq :firefox
           Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@model).should include "default"
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@model).should include 'default'
         end
-        it_behaves_like "Selenium Driver Options Array"
-
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Selenium driver and programtically created profile" do
+      context 'with Selenium driver and programtically created profile' do
         before do
           ENV['BROWSER'] = 'firefox'
           ENV['FIREFOX_PROFILE'] = 'BBC_INTERNAL'
@@ -166,40 +164,39 @@ def delete_session
           ENV['PROXY_ON'] = 'false'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :firefox
+          Capybara.current_session.driver.options[:browser].should eq :firefox
           Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.type'].should == 1
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.no_proxies_on'].should == '*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk'
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.http'].should == 'example.cache.co.uk'
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.http_port'].should == 80
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl'].should == 'example.cache.co.uk'
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl_port'].should == 80
-        end
-        it_behaves_like "Selenium Driver Options Array"
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.type'].should eq 1
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.no_proxies_on'].should eq '*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk'
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.http'].should eq 'example.cache.co.uk'
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.http_port'].should eq 80
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl'].should eq 'example.cache.co.uk'
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl_port'].should eq 80
+        end
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Selenium driver and custom chrome options" do
+      context 'with Selenium driver and custom chrome options' do
         before do
           ENV['BROWSER'] = 'chrome'
           ENV['CHROME_SWITCHES'] = '--user-agent=Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :chrome
-          Capybara.current_session.driver.options[:switches].should == ['--user-agent=Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10']
+          Capybara.current_session.driver.options[:browser].should eq :chrome
+          Capybara.current_session.driver.options[:switches].should eq ['--user-agent=Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10']
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-
-      context "with Remote Selenium driver" do
+      context 'with Remote Selenium driver' do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'firefox'
@@ -207,23 +204,23 @@ def delete_session
           ENV['REMOTE_URL'] = 'http://example.com'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :remote
-          Capybara.current_session.driver.options[:url].should == 'http://example.com'
-          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
-          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities 
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :firefox
+          Capybara.current_session.driver.options[:browser].should eq :remote
+          Capybara.current_session.driver.options[:url].should eq 'http://example.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
+          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should eq :firefox
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@model).should include 'default'
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Remote Selenium driver and client proxy" do
+      context 'with Remote Selenium driver and client proxy' do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'firefox'
@@ -232,20 +229,20 @@ def delete_session
           ENV['HTTP_PROXY'] = 'http://example.cache.co.uk:80'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :remote
-          Capybara.current_session.driver.options[:url].should == 'http://example.com'
-          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
+          Capybara.current_session.driver.options[:browser].should eq :remote
+          Capybara.current_session.driver.options[:url].should eq 'http://example.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
           Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should be_a_kind_of Selenium::WebDriver::Proxy
           Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).instance_variable_get(:@http).should == 'http://example.cache.co.uk:80'
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Remote Selenium driver, programtically cretated Firefox profile using proxy but client not using proxy" do
+      context 'with Remote Selenium driver, programtically cretated Firefox profile using proxy but client not using proxy' do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'firefox'
@@ -255,25 +252,25 @@ def delete_session
           ENV['PROXY_ON'] = 'false'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :remote
+          Capybara.current_session.driver.options[:browser].should eq :remote
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.type'].should == 1
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.no_proxies_on'].should == '*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk'
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.http'].should == 'example.cache.co.uk'
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.http_port'].should == 80
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl'].should == 'example.cache.co.uk'
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl_port'].should == 80
-          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
-        end
-        it_behaves_like "Selenium Driver Options Array"
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.type'].should eq 1
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.no_proxies_on'].should eq '*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.http'].should eq 'example.cache.co.uk'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.http_port'].should eq 80
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl'].should eq 'example.cache.co.uk'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl_port'].should eq 80
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
+        end
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Remote Selenium driver (specifying platform and browser version) and default Custom Capabilites (e.g. for Sauce Labs)" do
+      context 'with Remote Selenium driver (specifying platform and browser version) and default Custom Capabilites (e.g. for Sauce Labs)' do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'firefox'
@@ -283,27 +280,25 @@ def delete_session
           ENV['REMOTE_URL'] = 'http://saucelabs.com'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :remote
-          Capybara.current_session.driver.options[:url].should == 'http://saucelabs.com'
-          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
-          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities 
-          #Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'job-name'].should == 'frameworks-unamed-job' 
-          #Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'max-duration'].should == 1800 
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :firefox
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_version].should == '4'
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:os].should == 'windows'
+          Capybara.current_session.driver.options[:browser].should eq :remote
+          Capybara.current_session.driver.options[:url].should eq 'http://saucelabs.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
+          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should eq :firefox
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_version].should eq '4'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:os].should eq 'windows'
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@model).should include 'default'
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Selenium driver and hardcoded bbc internal profile and additional firefox preferences" do
+      context 'with Selenium driver and hardcoded bbc internal profile and additional firefox preferences' do
         before do
           ENV['BROWSER'] = 'firefox'
           ENV['HTTP_PROXY'] = 'http://example.cache.co.uk:80'
@@ -311,55 +306,53 @@ def delete_session
           ENV['FIREFOX_PREFS'] = '{"javascript.enabled":false}'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :firefox
+          Capybara.current_session.driver.options[:browser].should eq :firefox
           Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should == false
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should eq false
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-
-      context "with Selenium driver and additional firefox preferences" do
+      context 'with Selenium driver and additional firefox preferences' do
         before do
           ENV['BROWSER'] = 'firefox'
           ENV['FIREFOX_PROFILE'] = 'default'
           ENV['FIREFOX_PREFS'] = '{"javascript.enabled":false}'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :firefox
+          Capybara.current_session.driver.options[:browser].should eq :firefox
           Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should == false
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should eq false
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-
-      context "with Selenium driver and new profile and custom prefs" do
+      context 'with Selenium driver and new profile and custom prefs' do
         before do
           ENV['BROWSER'] = 'firefox'
           ENV['FIREFOX_PREFS'] = '{"javascript.enabled":false}'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :firefox
+          Capybara.current_session.driver.options[:browser].should eq :firefox
           Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should == false
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should eq false
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Remote Selenium driver and specified Chrome Switches" do
+      context 'with Remote Selenium driver and specified Chrome Switches' do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'chrome'
@@ -367,23 +360,23 @@ def delete_session
           ENV['CHROME_SWITCHES'] = '--user-agent=Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :remote
-          Capybara.current_session.driver.options[:switches].should == nil
-          Capybara.current_session.driver.options[:url].should == 'http://saucelabs.com'
-          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
-          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities 
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :chrome
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)['chrome.switches'].should == ['--user-agent=Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10'] 
-        end
-        it_behaves_like "Selenium Driver Options Array"
+          Capybara.current_session.driver.options[:browser].should eq :remote
+          Capybara.current_session.driver.options[:switches].should eq nil
+          Capybara.current_session.driver.options[:url].should eq 'http://saucelabs.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
+          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should eq :chrome
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)['chrome.switches'].should eq ['--user-agent=Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10']
+        end
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Remote Selenium driver and specified Custom Capabilites (e.g. for Sauce Labs)" do
+      context 'with Remote Selenium driver and specified Custom Capabilites (e.g. for Sauce Labs)' do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'firefox'
@@ -394,44 +387,42 @@ def delete_session
           ENV['REMOTE_URL'] = 'http://saucelabs.com'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :remote
-          Capybara.current_session.driver.options[:url].should == 'http://saucelabs.com'
-          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
-          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities 
-          #Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'job-name'].should == 'myjobname' 
-          #Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'max-duration'].should == 2000 
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :firefox
+          Capybara.current_session.driver.options[:browser].should eq :remote
+          Capybara.current_session.driver.options[:url].should eq 'http://saucelabs.com'
+          Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
+          Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should eq :firefox
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@model).should include 'default'
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Remote Selenium driver and most minimal Capabilites for BrowserStack" do
+      context 'with Remote Selenium driver and most minimal Capabilites for BrowserStack' do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_BROWSER'] = 'ie'
           ENV['REMOTE_URL'] = 'http://hub.browserstack.com'
         end
 
-        it "should be initialized correctly" do
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :remote
-          Capybara.current_session.driver.options[:url].should == ENV['REMOTE_URL']
+          Capybara.current_session.driver.options[:browser].should eq :remote
+          Capybara.current_session.driver.options[:url].should eq ENV['REMOTE_URL']
           Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:'browserstack.debug'].should == 'true'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:'browserstack.debug'].should eq 'true'
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Remote Selenium driver and specified Custom Capabilites for BrowserStack" do
+      context 'with Remote Selenium driver and specified Custom Capabilites for BrowserStack' do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['BS_BUILD'] = 'browserstack build 1'
@@ -447,30 +438,30 @@ def delete_session
           ENV['REMOTE_URL'] = 'http://hub.browserstack.com'
         end
 
-        it "should be initialized correctly" do
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :remote
-          Capybara.current_session.driver.options[:url].should == ENV['REMOTE_URL']
+          Capybara.current_session.driver.options[:browser].should eq :remote
+          Capybara.current_session.driver.options[:url].should eq ENV['REMOTE_URL']
           Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
           Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:build].should == ENV['BS_BUILD']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:'browserstack.debug'].should == ENV['BS_DEBUG']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:device].should == ENV['BS_DEVICE']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:deviceOrientation].should == ENV['BS_DEVICE_ORIENTATION']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:project].should == ENV['BS_PROJECT']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:resolution].should == ENV['BS_RESOLUTION']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:os].should == ENV['PLATFORM']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:os_version].should == ENV['PLATFORM_VERSION']
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :iPhone
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_version].should == ENV['REMOTE_BROWSER_VERSION']
-        end
-        it_behaves_like "Selenium Driver Options Array"
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:build].should eq ENV['BS_BUILD']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:'browserstack.debug'].should eq ENV['BS_DEBUG']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:device].should eq ENV['BS_DEVICE']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:deviceOrientation].should eq ENV['BS_DEVICE_ORIENTATION']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:project].should eq ENV['BS_PROJECT']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:resolution].should eq ENV['BS_RESOLUTION']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:os].should eq ENV['PLATFORM']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:os_version].should eq ENV['PLATFORM_VERSION']
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should eq :iPhone
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_version].should eq ENV['REMOTE_BROWSER_VERSION']
+        end
+        it_behaves_like 'Selenium Driver Options Array'
       end
 
-      context "with Remote Selenium driver and specified Custom Capabilites for Appium" do
+      context 'with Remote Selenium driver and specified Custom Capabilites for Appium' do
         before do
           ENV['BROWSER'] = 'remote'
           ENV['REMOTE_URL'] = 'http://127.0.0.1:4273'
@@ -480,86 +471,84 @@ def delete_session
           ENV['APPIUM_UDID'] = 'abd234'
         end
 
-        it "should be initialized correctly" do
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
+          CapybaraSetup.new.driver.should eq :selenium
           Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :remote
+          Capybara.current_session.driver.options[:browser].should eq :remote
           Capybara.current_session.driver.options[:url].should == ENV['REMOTE_URL']
           Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default
-          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
+          Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should eq nil
           Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities
         end
-        it_behaves_like "Selenium Driver Options Array"
+        it_behaves_like 'Selenium Driver Options Array'
       end
     end
 
-    describe "should allow Mechanize driver to be created" do
-      context "with minimal Mechanize driver" do
+    describe 'should allow Mechanize driver to be created' do
+      context 'with minimal Mechanize driver' do
         before do
           ENV['BROWSER'] = 'mechanize'
         end
 
-        it "should be initialized correctly" do 
+        it 'should be initialized correctly' do
           Capybara.delete_session
           CapybaraSetup.new.driver.should == :mechanize
           Capybara.current_session.driver.should be_a_kind_of Capybara::Mechanize::Driver
         end
 
-        context "with maximal Mechanize driver" do
+        context 'with maximal Mechanize driver' do
           before do
             ENV['BROWSER'] = 'mechanize'
             ENV['ENVIRONMENT'] = 'test'
             ENV['HTTP_PROXY'] = 'http://example.cache.co.uk:80'
           end
 
-          it "should be initialized correctly" do
+          it 'should be initialized correctly' do
             Capybara.delete_session
-            CapybaraSetup.new.driver.should == :mechanize
+            CapybaraSetup.new.driver.should eq :mechanize
             Capybara.current_session.driver.should be_a_kind_of Capybara::Mechanize::Driver
-            #note can no longer unit test this due to change in Capybara wiping brower instance
-            #Capybara.current_session.driver.browser.agent.proxy_addr.should == 'example.cache.co.uk'
-            #Capybara.current_session.driver.browser.agent.proxy_port.should == 80
-
+            # note can no longer unit test this due to change in Capybara wiping brower instance
+            # Capybara.current_session.driver.browser.agent.proxy_addr.should == 'example.cache.co.uk'
+            # Capybara.current_session.driver.browser.agent.proxy_port.should == 80
           end
         end
       end
 
-    describe "should allow Poltergeist driver to be created" do
-      context "with minimal Poltergeist driver" do
+    describe 'should allow Poltergeist driver to be created' do
+      context 'with minimal Poltergeist driver' do
         before do
           ENV['BROWSER'] = 'poltergeist'
         end
 
-        it "should be initialized correctly" do
+        it 'should be initialized correctly' do
           Capybara.delete_session
-          CapybaraSetup.new.driver.should == :poltergeist
+          CapybaraSetup.new.driver.should eq :poltergeist
           Capybara.current_session.driver.should be_a_kind_of Capybara::Poltergeist::Driver
         end
 
-        context "with maximal Poltergeist driver" do
+        context 'with maximal Poltergeist driver' do
           before do
             ENV['BROWSER'] = 'poltergeist'
             ENV['ENVIRONMENT'] = 'test'
             ENV['HTTP_PROXY'] = 'http://example.cache.co.uk:80'
           end
 
-          it "should be initialized correctly" do
+          it 'should be initialized correctly' do
             Capybara.delete_session
-            CapybaraSetup.new.driver.should == :poltergeist
+            CapybaraSetup.new.driver.should eq :poltergeist
             Capybara.current_session.driver.should be_a_kind_of Capybara::Poltergeist::Driver
           end
         end
       end
     end
 
-      describe "should permit certificate files to be incorporated into firefox profiles" do
-
-        context "integration tests for update_firefox_profile_with_certificates() method" do
+      describe 'should permit certificate files to be incorporated into firefox profiles' do
+        context 'integration tests for update_firefox_profile_with_certificates() method' do
           before do
-            def write_random_data(file_path) 
+            def write_random_data(file_path)
               file_data = SecureRandom.hex
-              File.open(file_path, "w") { |a_file|
+              File.open(file_path, 'w') { |a_file|
                 a_file.write(file_data)
               }
               file_data
@@ -568,10 +557,10 @@ def write_random_data(file_path)
             def compare_file_data(profile_path, file_name, expected_data)
               profile_file = profile_path + File::SEPARATOR + file_name
               actual_data = nil
-              File.open(profile_file, "r") { |a_file|
+              File.open(profile_file, 'r') { |a_file|
                 actual_data = a_file.read
               }
-              expected_data.should == actual_data 
+              expected_data.should == actual_data
             end
 
             ENV['BROWSER'] = 'firefox'
@@ -587,16 +576,16 @@ def compare_file_data(profile_path, file_name, expected_data)
             FileUtils.remove_entry @cert_dir
           end
 
-          it "should raise an exception if the cert8.db file is missing in the source directory" do
+          it 'should raise an exception if the cert8.db file is missing in the source directory' do
             profile = Selenium::WebDriver::Firefox::Profile.new
 
-            key3_data = write_random_data(@key3_db)
-            secmod_data = write_random_data(@secmod_db)
+            write_random_data(@key3_db)
+            write_random_data(@secmod_db)
 
             an_exception = nil
-            begin 
+            begin
               CapybaraSetup.new.instance_exec(profile, @cert_dir) { |profile, certificate_path|
-                update_firefox_profile_with_certificates(profile, certificate_path) 
+                update_firefox_profile_with_certificates(profile, certificate_path)
               }
             rescue RuntimeError => e
               an_exception = e
@@ -605,16 +594,15 @@ def compare_file_data(profile_path, file_name, expected_data)
             an_exception.should_not be_nil
           end
 
-          it "should raise an exception if the key3.db file is missing in the source directory" do
+          it 'should raise an exception if the key3.db file is missing in the source directory' do
             profile = Selenium::WebDriver::Firefox::Profile.new
 
-            cert8_data = write_random_data(@cert8_db)
-            secmod_data = write_random_data(@secmod_db)
-           
+            write_random_data(@cert8_db)
+            write_random_data(@secmod_db)
             an_exception = nil
-            begin 
+            begin
               CapybaraSetup.new.instance_exec(profile, @cert_dir) { |profile, certificate_path|
-                update_firefox_profile_with_certificates(profile, certificate_path) 
+                update_firefox_profile_with_certificates(profile, certificate_path)
               }
             rescue RuntimeError => e
               an_exception = e
@@ -622,17 +610,16 @@ def compare_file_data(profile_path, file_name, expected_data)
 
             an_exception.should_not be_nil
           end
-          
-          it "should raise an exception if the secmod.db file is missing in the source directory" do
+
+          it 'should raise an exception if the secmod.db file is missing in the source directory' do
             profile = Selenium::WebDriver::Firefox::Profile.new
 
-            cert8_data = write_random_data(@cert8_db)
-            key3_data = write_random_data(@key3_db)
-  
+            write_random_data(@cert8_db)
+            write_random_data(@key3_db)
             an_exception = nil
-            begin 
+            begin
               CapybaraSetup.new.instance_exec(profile, @cert_dir) { |profile, certificate_path|
-                update_firefox_profile_with_certificates(profile, certificate_path) 
+                update_firefox_profile_with_certificates(profile, certificate_path)
               }
             rescue RuntimeError => e
               an_exception = e
@@ -641,8 +628,7 @@ def compare_file_data(profile_path, file_name, expected_data)
             an_exception.should_not be_nil
           end
 
-          it "should update a firefox profile with valid references to certificate db files" do
-       
+          it 'should update a firefox profile with valid references to certificate db files' do
             profile = Selenium::WebDriver::Firefox::Profile.new
 
             cert8_data = write_random_data(@cert8_db)
@@ -651,7 +637,7 @@ def compare_file_data(profile_path, file_name, expected_data)
 
             setup = CapybaraSetup.new
             result = setup.instance_exec(profile, @cert_dir) { |profile, certificate_path|
-              update_firefox_profile_with_certificates(profile, certificate_path) 
+              update_firefox_profile_with_certificates(profile, certificate_path)
             }
             profile_path = result.layout_on_disk
             compare_file_data(profile_path, 'cert8.db', cert8_data)
@@ -659,41 +645,36 @@ def compare_file_data(profile_path, file_name, expected_data)
             compare_file_data(profile_path, 'secmod.db', secmod_data)
           end
 
-          it "should update a firefox profile with references to certificate db files with prefixes" do
-       
+          it 'should update a firefox profile with references to certificate db files with prefixes' do
             profile = Selenium::WebDriver::Firefox::Profile.new
             cert_prefix = 'a'
             @cert8_db = @cert_dir + File::SEPARATOR + cert_prefix + 'cert8.db'
             @key3_db = @cert_dir + File::SEPARATOR + cert_prefix + 'key3.db'
             @secmod_db = @cert_dir + File::SEPARATOR + cert_prefix + 'secmod.db'
- 
             cert8_data = write_random_data(@cert8_db)
             key3_data = write_random_data(@key3_db)
             secmod_data = write_random_data(@secmod_db)
 
             setup = CapybaraSetup.new
-            result = setup.instance_exec(profile, @cert_dir, cert_prefix) { |profile, certificate_path, certificate_prefix, result|
-              update_firefox_profile_with_certificates(profile, certificate_path, certificate_prefix) 
+            result = setup.instance_exec(profile, @cert_dir, cert_prefix) { |profile, certificate_path, certificate_prefix, _result|
+              update_firefox_profile_with_certificates(profile, certificate_path, certificate_prefix)
             }
             profile_path = result.layout_on_disk
             compare_file_data(profile_path, 'cert8.db', cert8_data)
             compare_file_data(profile_path, 'key3.db', key3_data)
             compare_file_data(profile_path, 'secmod.db', secmod_data)
           end
-
         end
-
       end
 
-      describe "The BBC-INTERNAL firefox profile should be set up with the correct proxy settings whether working behind a proxy or not" do
-
-        context "no proxy settings provided" do
+      describe 'The BBC-INTERNAL firefox profile should be set up with the correct proxy settings whether working behind a proxy or not' do
+        context 'no proxy settings provided' do
           before do
             ENV['BROWSER'] = 'firefox'
             ENV['ENVIRONMENT'] = 'test'
           end
 
-          it "should create the firefox profile settings correctly" do
+          it 'should create the firefox profile settings correctly' do
             setup = CapybaraSetup.new
             profile = setup.instance_exec('BBC_INTERNAL', nil) { |profile_name, additional_prefs|
               create_profile(profile_name, additional_prefs)
@@ -705,24 +686,24 @@ def compare_file_data(profile_path, file_name, expected_data)
           end
         end
 
-        context "proxy settings provided" do
+        context 'proxy settings provided' do
           before do
             @proxy_host = 'example.cache.co.uk'
             @proxy_port = 6789
             ENV['BROWSER'] = 'firefox'
             ENV['ENVIRONMENT'] = 'test'
-            ENV['HTTP_PROXY'] = "http://#{@proxy_host}:#{@proxy_port}"
+            ENV['HTTP_PROXY'] = 'http://#{@proxy_host}:#{@proxy_port}'
           end
 
-          it "should create the firefox profile correctly" do
+          it 'should create the firefox profile correctly' do
             setup = CapybaraSetup.new
             profile = setup.instance_exec('BBC_INTERNAL', nil) { |profile_name, additional_prefs|
               create_profile(profile_name, additional_prefs)
             }
 
-            profile.instance_variable_get('@additional_prefs')['network.proxy.type'].should == 1    
-            profile.instance_variable_get('@additional_prefs')['network.proxy.http'].should == @proxy_host
-            profile.instance_variable_get('@additional_prefs')['network.proxy.http_port'].should == @proxy_port
+            profile.instance_variable_get('@additional_prefs')['network.proxy.type'].should eq 1
+            profile.instance_variable_get('@additional_prefs')['network.proxy.http'].should eq @proxy_host
+            profile.instance_variable_get('@additional_prefs')['network.proxy.http_port'].should eq @proxy_port
           end
         end
       end
diff --git a/spec/frameworks_cucumber_spec.rb b/spec/frameworks_cucumber_spec.rb
index 1d10a6a..cdfbd62 100644
--- a/spec/frameworks_cucumber_spec.rb
+++ b/spec/frameworks_cucumber_spec.rb
@@ -1,162 +1,158 @@
 require 'spec_helper'
 
 describe Frameworks::EnvHelper do
-
   before do
     ENV.clear
-    ENV['BROWSER'] = 'test' #mandatory data to prevent validation exception
+    ENV['BROWSER'] = 'test' # mandatory data to prevent validation exception
   end
 
-  describe "set base url correctly" do
+  describe 'set base url correctly' do
     include Frameworks::EnvHelper
 
-    it "should be able to set a local url" do
+    it 'should be able to set a local url' do
       ENV['ENVIRONMENT'] = 'sandbox'
       generate_base_urls
-      @base_url.should == 'http://pal.sandbox.dev.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.sandbox.dev.bbc.co.uk'
-      @static_base_url.should == 'http://static.sandbox.dev.bbc.co.uk'
-      @m_base_url.should == 'http://m.sandbox.dev.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.sandbox.dev.bbc.co.uk'
+      @base_url.should eq('http://pal.sandbox.dev.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.sandbox.dev.bbc.co.uk')
+      @static_base_url.should eq('http://static.sandbox.dev.bbc.co.uk')
+      @m_base_url.should eq('http://m.sandbox.dev.bbc.co.uk')
+      @mobile_base_url.should eq('http://mobile.sandbox.dev.bbc.co.uk')
     end
 
-    it "should be able to set a local system6 url" do
+    it 'should be able to set a local system6 url' do
       ENV['ENVIRONMENT'] = 'sandbox6'
       generate_base_urls
-      @base_url.should == 'http://sandbox.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.sandbox.bbc.co.uk'
-      @static_base_url.should == 'http://static.sandbox.bbc.co.uk'
-      @m_base_url.should == 'http://m.sandbox.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.sandbox.bbc.co.uk'
+      @base_url.should eq('http://sandbox.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.sandbox.bbc.co.uk')
+      @static_base_url.should eq('http://static.sandbox.bbc.co.uk')
+      @m_base_url.should eq('http://m.sandbox.bbc.co.uk')
+      @mobile_base_url.should eq('http://mobile.sandbox.bbc.co.uk')
     end
 
-    it "should be able to set a base url" do
+    it 'should be able to set a base url' do
       ENV['ENVIRONMENT'] = 'foo'
       generate_base_urls
-      @base_url.should == 'http://www.foo.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.foo.bbc.co.uk'
-      @static_base_url.should == 'http://static.foo.bbci.co.uk'
-      @open_base_url.should == 'http://open.foo.bbc.co.uk'
-      @m_base_url.should == 'http://m.foo.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.foo.bbc.co.uk'
+      @base_url.should eq('http://www.foo.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.foo.bbc.co.uk')
+      @static_base_url.should eq('http://static.foo.bbci.co.uk')
+      @open_base_url.should eq('http://open.foo.bbc.co.uk')
+      @m_base_url.should eq('http://m.foo.bbc.co.uk')
+      @mobile_base_url.should eq('http://mobile.foo.bbc.co.uk')
     end
 
-    it "should set correct static base for www.live.bbc.co.uk" do
+    it 'should set correct static base for www.live.bbc.co.uk' do
       ENV['ENVIRONMENT'] = 'live'
       generate_base_urls
-      @base_url.should == 'http://www.live.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.live.bbc.co.uk'
-      @static_base_url.should == 'http://static.bbci.co.uk'
-      @open_base_url.should == 'http://open.live.bbc.co.uk'
-      @m_base_url.should == 'http://m.live.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.live.bbc.co.uk'
+      @base_url.should eq('http://www.live.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.live.bbc.co.uk')
+      @static_base_url.should eq('http://static.bbci.co.uk')
+      @open_base_url.should eq('http://open.live.bbc.co.uk')
+      @m_base_url.should eq('http://m.live.bbc.co.uk')
+      @mobile_base_url.should eq('http://mobile.live.bbc.co.uk')
     end
 
-    it "should be able to set a base url and not be case sensitive" do
+    it 'should be able to set a base url and not be case sensitive' do
       ENV['ENVIRONMENT'] = 'fOo'
       generate_base_urls
-      @base_url.should == 'http://www.foo.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.foo.bbc.co.uk'
-      @static_base_url.should == 'http://static.foo.bbci.co.uk'
-      @open_base_url.should == 'http://open.foo.bbc.co.uk'
-      @m_base_url.should == 'http://m.foo.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.foo.bbc.co.uk'
+      @base_url.should eq('http://www.foo.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.foo.bbc.co.uk')
+      @static_base_url.should eq('http://static.foo.bbci.co.uk')
+      @open_base_url.should eq('http://open.foo.bbc.co.uk')
+      @m_base_url.should eq('http://m.foo.bbc.co.uk')
+      @mobile_base_url.should eq('http://mobile.foo.bbc.co.uk')
     end
 
-    it "should set correct static base for www.live.bbc.co.uk and not be case sensitive" do
+    it 'should set correct static base for www.live.bbc.co.uk and not be case sensitive' do
       ENV['ENVIRONMENT'] = 'LiVe'
       generate_base_urls
-      @base_url.should == 'http://www.live.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.live.bbc.co.uk'
-      @static_base_url.should == 'http://static.bbci.co.uk'
-      @open_base_url.should == 'http://open.live.bbc.co.uk'
-      @m_base_url.should == 'http://m.live.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.live.bbc.co.uk'
+      @base_url.should eq('http://www.live.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.live.bbc.co.uk')
+      @static_base_url.should eq('http://static.bbci.co.uk')
+      @open_base_url.should eq('http://open.live.bbc.co.uk')
+      @m_base_url.should eq('http://m.live.bbc.co.uk')
+      @mobile_base_url.should eq('http://mobile.live.bbc.co.uk')
     end
 
-
     it "should be able to set a 'classic' live url and not be case sensitive" do
       ENV['ENVIRONMENT'] = 'Live'
-      ENV['WWW_LIVE'] = 'false' 
+      ENV['WWW_LIVE'] = 'false'
       generate_base_urls
-      @base_url.should == 'http://www.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.bbc.co.uk'
-      @static_base_url.should == 'http://static.bbci.co.uk'
-      @open_base_url.should == 'http://open.bbc.co.uk'
-      @m_base_url.should == 'http://m.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.bbc.co.uk'
+      @base_url.should eq('http://www.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.bbc.co.uk')
+      @static_base_url.should eq('http://static.bbci.co.uk')
+      @open_base_url.should eq('http://open.bbc.co.uk')
+      @m_base_url.should eq('http://m.bbc.co.uk')
+      @mobile_base_url.should eq('http://mobile.bbc.co.uk')
     end
 
-    it "should be able to set pal url and not be case sensitive" do
+    it 'should be able to set pal url and not be case sensitive' do
       ENV['ENVIRONMENT'] = 'Live'
       generate_base_urls
-      @base_url.should == 'http://www.live.bbc.co.uk'
-      @pal_base_url.should == 'http://pal.live.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.live.bbc.co.uk'
-      @static_base_url.should == 'http://static.bbci.co.uk'
-      @open_base_url.should == 'http://open.live.bbc.co.uk'
-      @m_base_url.should == 'http://m.live.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.live.bbc.co.uk'
+      @base_url.should eq('http://www.live.bbc.co.uk')
+      @pal_base_url.should eq('http://pal.live.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.live.bbc.co.uk')
+      @static_base_url.should eq('http://static.bbci.co.uk')
+      @open_base_url.should eq('http://open.live.bbc.co.uk')
+      @m_base_url.should eq('http://m.live.bbc.co.uk')
+      @mobile_base_url.should eq('http://mobile.live.bbc.co.uk')
     end
 
-    it "pal url should still have environment even if asking for classic live url" do
+    it 'pal url should still have environment even if asking for classic live url' do
       ENV['ENVIRONMENT'] = 'Live'
-      ENV['WWW_LIVE'] = 'false' 
+      ENV['WWW_LIVE'] = 'false'
       generate_base_urls
-      @base_url.should == 'http://www.bbc.co.uk'
-      @pal_base_url.should == 'http://pal.live.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.bbc.co.uk'
-      @static_base_url.should == 'http://static.bbci.co.uk'
-      @open_base_url.should == 'http://open.bbc.co.uk'
-      @m_base_url.should == 'http://m.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.bbc.co.uk'
+      @base_url.should eq('http://www.bbc.co.uk')
+      @pal_base_url.should eq('http://pal.live.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.bbc.co.uk')
+      @static_base_url.should eq('http://static.bbci.co.uk')
+      @open_base_url.should eq('http://open.bbc.co.uk')
+      @m_base_url.should eq('http://m.bbc.co.uk')
+      @mobile_base_url.should eq('http://mobile.bbc.co.uk')
     end
 
-
-
-    it "should be able to set scheme to ssl" do
+    it 'should be able to set scheme to ssl' do
       ENV['SCHEME'] = 'https'
       ENV['ENVIRONMENT'] = 'foo'
       generate_base_urls
-      @base_url.should == 'https://www.foo.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.foo.bbc.co.uk'
-      @static_base_url.should == 'https://static.foo.bbci.co.uk'
-      @open_base_url.should == 'https://open.foo.bbc.co.uk'
+      @base_url.should eq('https://www.foo.bbc.co.uk')
+      @ssl_base_url.should eq('https://ssl.foo.bbc.co.uk')
+      @static_base_url.should eq('https://static.foo.bbci.co.uk')
+      @open_base_url.should eq('https://open.foo.bbc.co.uk')
     end
 
-    it "should be able to set proxy host and port correctly to use in tests using HTTP_PROXY env variable" do
+    it 'should be able to set proxy host and port correctly to use in tests using HTTP_PROXY env variable' do
       ENV['ENVIRONMENT'] = 'foo'
       ENV['HTTP_PROXY'] = 'http://mycache.co.uk:8080'
       generate_base_urls
-      @proxy_host.should == "mycache.co.uk"
-      @proxy_port.should == "8080"
+      @proxy_host.should eq('mycache.co.uk')
+      @proxy_port.should eq('8080')
     end
 
-    it "should be able to set proxy host correctly to use in tests using http_proxy env variable" do
+    it 'should be able to set proxy host correctly to use in tests using http_proxy env variable' do
       ENV['ENVIRONMENT'] = 'foo'
       ENV['http_proxy'] = 'http://mycache.co.uk:8080'
       generate_base_urls
-      @proxy_host.should == "mycache.co.uk"
-      @proxy_port.should == "8080"
+      @proxy_host.should eq('mycache.co.uk')
+      @proxy_port.should eq('8080')
     end
 
-    it "should be able to use 80 as default proxy port when none specified" do
+    it 'should be able to use 80 as default proxy port when none specified' do
       ENV['ENVIRONMENT'] = 'foo'
       ENV['http_proxy'] = 'http://mycache.co.uk'
       generate_base_urls
-      @proxy_host.should == "mycache.co.uk"
-      @proxy_port.should == "80"
+      @proxy_host.should eq('mycache.co.uk')
+      @proxy_port.should eq('80')
     end
 
     it "should be able to handle an environment variable which doesn't have the protocol" do
       ENV['ENVIRONMENT'] = 'foo'
       ENV['http_proxy'] = 'mycache.co.uk'
       generate_base_urls
-      @proxy_host.should == "mycache.co.uk"
-      @proxy_port.should == "80"
+      @proxy_host.should eq('mycache.co.uk')
+      @proxy_port.should eq('80')
     end
 
-    it "should be able to have an empty http_proxy environment variable" do
+    it 'should be able to have an empty http_proxy environment variable' do
       ENV['ENVIRONMENT'] = 'foo'
       ENV['http_proxy'] = ''
       generate_base_urls
@@ -164,115 +160,96 @@
       @proxy_port.should be_nil
     end
 
-    it "should be able to set a local url with expected domain" do
+    it 'should be able to set a local url with expected domain' do
       ENV['ENVIRONMENT'] = 'sandbox'
       ENV['FW_BBC_DOMAIN'] = 'bbc.com'
       generate_base_urls
-      @base_url.should == 'http://pal.sandbox.dev.bbc.com'
-      @ssl_base_url.should == 'https://ssl.sandbox.dev.bbc.com'
-      @static_base_url.should == 'http://static.sandbox.dev.bbc.com'
-      @m_base_url.should == 'http://m.sandbox.dev.bbc.com'
-      @mobile_base_url.should == 'http://mobile.sandbox.dev.bbc.com'
+      @base_url.should eq('http://pal.sandbox.dev.bbc.com')
+      @ssl_base_url.should eq('https://ssl.sandbox.dev.bbc.com')
+      @static_base_url.should eq('http://static.sandbox.dev.bbc.com')
+      @m_base_url.should eq('http://m.sandbox.dev.bbc.com')
+      @mobile_base_url.should eq('http://mobile.sandbox.dev.bbc.com')
     end
 
-    it "should be able to set a local system6 url with expected domain" do
+    it 'should be able to set a local system6 url with expected domain' do
       ENV['ENVIRONMENT'] = 'sandbox6'
       ENV['FW_BBC_DOMAIN'] = 'bbc.com'
       generate_base_urls
-      @base_url.should == 'http://sandbox.bbc.com'
-      @ssl_base_url.should == 'https://ssl.sandbox.bbc.com'
-      @static_base_url.should == 'http://static.sandbox.bbc.com'
-      @m_base_url.should == 'http://m.sandbox.bbc.com'
-      @mobile_base_url.should == 'http://mobile.sandbox.bbc.com'
+      @base_url.should eq('http://sandbox.bbc.com')
+      @ssl_base_url.should eq('https://ssl.sandbox.bbc.com')
+      @static_base_url.should eq('http://static.sandbox.bbc.com')
+      @m_base_url.should eq('http://m.sandbox.bbc.com')
+      @mobile_base_url.should eq('http://mobile.sandbox.bbc.com')
     end
 
-    it "should be able to set a base url with expected domain" do
+    it 'should be able to set a base url with expected domain' do
       ENV['ENVIRONMENT'] = 'foo'
       ENV['FW_BBC_DOMAIN'] = 'bbc.com'
       generate_base_urls
-      @base_url.should == 'http://www.foo.bbc.com'
-      @ssl_base_url.should == 'https://ssl.foo.bbc.com'
-      @static_base_url.should == 'http://static.foo.bbci.co.uk'
-      @open_base_url.should == 'http://open.foo.bbc.com'
-      @m_base_url.should == 'http://m.foo.bbc.com'
-      @mobile_base_url.should == 'http://mobile.foo.bbc.com'
+      @base_url.should eq('http://www.foo.bbc.com')
+      @ssl_base_url.should eq('https://ssl.foo.bbc.com')
+      @static_base_url.should eq('http://static.foo.bbci.co.uk')
+      @open_base_url.should eq('http://open.foo.bbc.com')
+      @m_base_url.should eq('http://m.foo.bbc.com')
+      @mobile_base_url.should eq('http://mobile.foo.bbc.com')
     end
 
-    it "should set public facing live domain" do
+    it 'should set public facing live domain' do
       ENV['ENVIRONMENT'] = 'live'
       ENV['WWW_LIVE'] = 'false'
       ENV['FW_BBC_DOMAIN'] = 'bbc.com'
       generate_base_urls
-      @base_url.should == 'http://www.bbc.com'
-      @ssl_base_url.should == 'https://ssl.bbc.com'
-      @static_base_url.should == 'http://static.bbci.co.uk'
-      @open_base_url.should == 'http://open.bbc.com'
-      @m_base_url.should == 'http://m.bbc.com'
-      @mobile_base_url.should == 'http://mobile.bbc.com'
-    end
-
-=begin
-#don't want to push proxy addr online
-    it "should be able to validate xhtml online" do
-      @proxy_host = ''
-      @proxy_port = ''
-      xhtml = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>a</title></head><body><p>a</p></body></html>'
-      validate_online(xhtml)
-    end
-
-    it "should be able to report errors for invalid markup" do
-      @proxy_host = ''
-      @proxy_port = ''
-      xhtml = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><nosuchelement><title>a</title></head><body><p>a</p></body></html>'
-      expect {
-        validate_online(xhtml)
-      }.to raise_error(RuntimeError)
+      @base_url.should eq('http://www.bbc.com')
+      @ssl_base_url.should eq('https://ssl.bbc.com')
+      @static_base_url.should eq('http://static.bbci.co.uk')
+      @open_base_url.should eq('http://open.bbc.com')
+      @m_base_url.should eq('http://m.bbc.com')
+      @mobile_base_url.should eq('http://mobile.bbc.com')
     end
-=end
   end
 
-    describe "independent mechanize agent" do
+  describe 'independent mechanize agent' do
     include Frameworks::EnvHelper
 
-    it "should allow you to create an independent, configured mechanize object" do
+    it 'should allow you to create an independent, configured mechanize object' do
       ENV['HTTP_PROXY'] = 'http://mycache.co.uk:80'
       agent = new_mechanize
       agent.should be_a_kind_of Mechanize
-      agent.proxy_addr.should == 'mycache.co.uk'
+      agent.proxy_addr.should eq('mycache.co.uk')
     end
 
-    it "the proxy should be separately configurable" do
-      agent = new_mechanize(http_proxy='http://mycache.co.uk:80')
+    it 'the proxy should be separately configurable' do
+      agent = new_mechanize('http://mycache.co.uk:80')
       agent.should be_a_kind_of Mechanize
-      agent.proxy_addr.should == 'mycache.co.uk'
+      agent.proxy_addr.should eq('mycache.co.uk')
     end
 
-   it "the proxy should be ignored if the no_proxy exclusion is set" do
+    it 'the proxy should be ignored if the no_proxy exclusion is set' do
       proxy_host = 'mycache.co.uk'
       proxy_port = '80'
-      proxy_uri = 'http://'  + proxy_host + ':' + proxy_port
+      proxy_uri = 'http://' + proxy_host + ':' + proxy_port
       no_proxy = 'ignore_this_host'
       ENV['NO_PROXY'] = no_proxy
-      agent = new_mechanize(http_proxy=proxy_uri)
+      agent = new_mechanize(proxy_uri)
       expect(agent).to be_a_kind_of Mechanize
       expect(agent.agent.http.proxy_uri.host).to eq(proxy_host)
       expect(agent.agent.http.proxy_uri.port).to eq(proxy_port.to_i)
-      no_proxy_array = [ no_proxy ]
+      no_proxy_array = [no_proxy]
       expect(agent.agent.http.no_proxy).to eq(no_proxy_array)
     end
 
-    it "the proxy should be ignored if the no_proxy exclusion is set with multiple values" do
+    it 'the proxy should be ignored if the no_proxy exclusion is set with multiple values' do
       proxy_host = 'mycache.co.uk'
       proxy_port = '80'
-      proxy_uri = 'http://'  + proxy_host + ':' + proxy_port
+      proxy_uri = 'http://' + proxy_host + ':' + proxy_port
       no_proxy1 = 'ignore_this_host'
       no_proxy2 = '.and.this.domain'
       ENV['NO_PROXY'] = no_proxy1 + ', ' + no_proxy2
-      agent = new_mechanize(http_proxy=proxy_uri)
+      agent = new_mechanize(proxy_uri)
       expect(agent).to be_a_kind_of Mechanize
       expect(agent.agent.http.proxy_uri.host).to eq(proxy_host)
       expect(agent.agent.http.proxy_uri.port).to eq(proxy_port.to_i)
-      no_proxy_array = [ no_proxy1, no_proxy2 ]
+      no_proxy_array = [no_proxy1, no_proxy2]
       expect(agent.agent.http.no_proxy).to eq(no_proxy_array)
     end
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 07f6632..02cc03a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -9,7 +9,7 @@
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift "#{dir}/../lib"
 c = Cucumber::Configuration.new
-Cucumber::RbSupport::RbLanguage.new(Cucumber::Runtime.new, c) #Need to load Cucumber runtime, so World is available 
+Cucumber::RbSupport::RbLanguage.new(Cucumber::Runtime.new, c) # Need to load Cucumber runtime, so World is available
 
 require 'frameworks/capybara'
 require 'frameworks/cucumber'
diff --git a/spec/unit_test_monkeypatches.rb b/spec/unit_test_monkeypatches.rb
index 56dcc88..b721543 100644
--- a/spec/unit_test_monkeypatches.rb
+++ b/spec/unit_test_monkeypatches.rb
@@ -4,17 +4,14 @@
 module Selenium
   module WebDriver
     module Firefox
-
       # @api private
       module Util
         module_function
 
         def app_data_path
-           File.dirname(__FILE__)
+          File.dirname(__FILE__)
         end
-
       end # Util
     end # Firefox
   end # WebDriver
 end # Selenium
-
diff --git a/spec/wait_spec.rb b/spec/wait_spec.rb
index c94338a..bf87887 100644
--- a/spec/wait_spec.rb
+++ b/spec/wait_spec.rb
@@ -4,19 +4,18 @@
   let(:test) { Class.new { include FrameworksCapybara::Wait }.new }
 
   describe 'wait_for' do
-    it "should exit silently if the block returns true" do
+    it 'should exit silently if the block returns true' do
       test.wait_for { true }
     end
 
-    it "should raise an exception if the default timeout expires" do
-      start_time = Time.now
+    it 'should raise an exception if the default timeout expires' do
       expect { test.wait_for('foo') { true == false } }.to raise_error
     end
 
-    it "should raise an exception if the specified timeout expires" do
+    it 'should raise an exception if the specified timeout expires' do
       start_time = Time.now
       expect {
-        test.wait_for('',timeout: 1) do
+        test.wait_for('', timeout: 1) do
           Time.now > (start_time + (2 * 60))
         end
       }.to raise_error
@@ -37,12 +36,12 @@
   describe 'wait for an arbitrary assertion' do
     it 'should catch provided exception until block no longer raises it' do
       error = ZeroDivisionError
-      expect(test.wait_for_no_exception('msg', error) { 1/1 == 1 }).to eql true
+      expect(test.wait_for_no_exception('msg', error) { 1 / 1 == 1 }).to eql true
     end
 
     it 'should catch provided exception until block no longer raises it or timeout' do
       error = ZeroDivisionError
-      expect { test.wait_for_no_exception('msg', error) { expect(1/0).to eql 1 } }.to raise_error(error)
+      expect { test.wait_for_no_exception('msg', error) { expect(1 / 0).to eql 1 } }.to raise_error(error)
     end
   end
 end

From c1bd8d19a5e414baafbce94d47251d1c32f0666b Mon Sep 17 00:00:00 2001
From: Swati Tabib <swati.tabib.ext@bbc.co.uk>
Date: Fri, 28 Jul 2017 17:14:50 +0100
Subject: [PATCH 49/62] removing chrome driver code

---
 lib/frameworks/capybara.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index 0120860..3a887b2 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -70,14 +70,11 @@ def initialize
     # always register in case we are using a configuration that swaps between drivers
     mech_driver = register_mechanize_driver(capybara_opts)
     poltergeist_driver = register_poltergeist_driver(capybara_opts)
-    headless_chromium_driver = register_headless_chromium_driver(capybara_opts)
     case capybara_opts[:browser]
     when :mechanize then
       @driver = mech_driver
     when :poltergeist then
       @driver = poltergeist_driver
-    when :headless_chromium then
-      @driver = headless_chromium_driver
     else
       @driver = register_selenium_driver(capybara_opts, selenium_remote_opts, custom_opts)
     end

From f10354e2059eb7f012dcc098defe72d93f880ca0 Mon Sep 17 00:00:00 2001
From: Swati Tabib <swati.tabib.ext@bbc.co.uk>
Date: Mon, 31 Jul 2017 12:37:06 +0100
Subject: [PATCH 50/62] removing JS error opt

---
 lib/frameworks/capybara.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index 3a887b2..b07a972 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -233,7 +233,6 @@ def register_poltergeist_driver(opts)
     Capybara.app = app
     Capybara.run_server = false
     options = {
-      js_errors: true,
       timeout:   120,
       window_size: [1200, 1000],
       phantomjs_options: phantom_opts,

From 527da2b0746b9c06b4aea7576db7d84a71f5d93d Mon Sep 17 00:00:00 2001
From: Swati Tabib <swati.tabib.ext@bbc.co.uk>
Date: Tue, 1 Aug 2017 14:40:54 +0100
Subject: [PATCH 51/62] setting JS error opt to false

---
 lib/frameworks/capybara.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/frameworks/capybara.rb b/lib/frameworks/capybara.rb
index b07a972..84ea8e7 100644
--- a/lib/frameworks/capybara.rb
+++ b/lib/frameworks/capybara.rb
@@ -233,6 +233,7 @@ def register_poltergeist_driver(opts)
     Capybara.app = app
     Capybara.run_server = false
     options = {
+      js_errors: false,
       timeout:   120,
       window_size: [1200, 1000],
       phantomjs_options: phantom_opts,

From f19ee3bfe60d5c8f22a80aeaa309cf7ac5a4fdc5 Mon Sep 17 00:00:00 2001
From: Pratyush Sharma <sharmp09@mc-s104902.national.core.bbc.co.uk>
Date: Thu, 3 Aug 2017 16:06:49 +0100
Subject: [PATCH 52/62] Added new method for a section

---
 lib/frameworks/utils.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/frameworks/utils.rb b/lib/frameworks/utils.rb
index eda4804..5e5d0b0 100644
--- a/lib/frameworks/utils.rb
+++ b/lib/frameworks/utils.rb
@@ -47,6 +47,13 @@ def check_expected_section_items(sections, table)
       end
     end
 
+    def check_expected_section_item(section, table)
+        table.raw.flatten.each do |section_item|
+          section_method = "have_#{rubyize(section_item)}"
+          expect(section).to send(section_method) unless section_item.include? '(optional)'
+        end
+    end
+
     def switch_to_last_opened_window
       Capybara.page.switch_to_window(Capybara.page.windows.last)
       Capybara.page.windows.first.close

From 487d798121bbc6ae6ed4150a4117af563dd3fe09 Mon Sep 17 00:00:00 2001
From: Patrick Cunningham <patrick.cunningham@bbc.co.uk>
Date: Thu, 17 Aug 2017 12:01:42 +0100
Subject: [PATCH 53/62] Add privileges to spec files to allow deletion on
 jenkins

---
 spec/frameworks_capybara_spec.rb | 0
 spec/frameworks_cucumber_spec.rb | 0
 spec/logger_spec.rb              | 0
 spec/mock.default/prefs.js       | 0
 spec/profiles.ini                | 0
 spec/spec_helper.rb              | 0
 spec/unit_test_monkeypatches.rb  | 0
 spec/utils_spec.rb               | 0
 spec/wait_spec.rb                | 0
 9 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 spec/frameworks_capybara_spec.rb
 mode change 100644 => 100755 spec/frameworks_cucumber_spec.rb
 mode change 100644 => 100755 spec/logger_spec.rb
 mode change 100644 => 100755 spec/mock.default/prefs.js
 mode change 100644 => 100755 spec/profiles.ini
 mode change 100644 => 100755 spec/spec_helper.rb
 mode change 100644 => 100755 spec/unit_test_monkeypatches.rb
 mode change 100644 => 100755 spec/utils_spec.rb
 mode change 100644 => 100755 spec/wait_spec.rb

diff --git a/spec/frameworks_capybara_spec.rb b/spec/frameworks_capybara_spec.rb
old mode 100644
new mode 100755
diff --git a/spec/frameworks_cucumber_spec.rb b/spec/frameworks_cucumber_spec.rb
old mode 100644
new mode 100755
diff --git a/spec/logger_spec.rb b/spec/logger_spec.rb
old mode 100644
new mode 100755
diff --git a/spec/mock.default/prefs.js b/spec/mock.default/prefs.js
old mode 100644
new mode 100755
diff --git a/spec/profiles.ini b/spec/profiles.ini
old mode 100644
new mode 100755
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
old mode 100644
new mode 100755
diff --git a/spec/unit_test_monkeypatches.rb b/spec/unit_test_monkeypatches.rb
old mode 100644
new mode 100755
diff --git a/spec/utils_spec.rb b/spec/utils_spec.rb
old mode 100644
new mode 100755
diff --git a/spec/wait_spec.rb b/spec/wait_spec.rb
old mode 100644
new mode 100755

From 2c546e211f354ff73325105d02562bef001e7888 Mon Sep 17 00:00:00 2001
From: Ankit Jain <jaina07@mc-s089994.national.core.bbc.co.uk>
Date: Wed, 13 Sep 2017 14:03:44 +0100
Subject: [PATCH 54/62] Added method for translations

---
 lib/frameworks/utils.rb | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/frameworks/utils.rb b/lib/frameworks/utils.rb
index 5e5d0b0..937e2cb 100644
--- a/lib/frameworks/utils.rb
+++ b/lib/frameworks/utils.rb
@@ -48,10 +48,17 @@ def check_expected_section_items(sections, table)
     end
 
     def check_expected_section_item(section, table)
-        table.raw.flatten.each do |section_item|
-          section_method = "have_#{rubyize(section_item)}"
-          expect(section).to send(section_method) unless section_item.include? '(optional)'
-        end
+      table.raw.flatten.each do |section_item|
+        section_method = "have_#{rubyize(section_item)}"
+        expect(section).to send(section_method) unless section_item.include? '(optional)'
+      end
+    end
+
+    def check_expected_section_translation(section, table)
+      table.rows_hash.each do |key, value|
+        element = key.downcase.tr(' ', '_').tr(',', '')
+        expect(section.send(element).text).to eql value
+      end
     end
 
     def switch_to_last_opened_window

From d23e97f47c33f222c8927723ef11404922acc12e Mon Sep 17 00:00:00 2001
From: Ankit Jain <jaina07@mc-s089994.national.core.bbc.co.uk>
Date: Wed, 20 Sep 2017 16:55:40 +0100
Subject: [PATCH 55/62] Added

---
 lib/frameworks/utils.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lib/frameworks/utils.rb b/lib/frameworks/utils.rb
index 937e2cb..09ad160 100644
--- a/lib/frameworks/utils.rb
+++ b/lib/frameworks/utils.rb
@@ -66,6 +66,22 @@ def switch_to_last_opened_window
       Capybara.page.windows.first.close
     end
 
+    def wait_until_page_is_fully_loaded
+      Timeout.timeout(Capybara.default_max_wait_time) do
+        loop until (value = Capybara.page.evaluate_script('document.readyState').eql?('complete'))
+        value
+      end
+    end
+
+    def return_random_element(section, elements)
+      section.send(elements).sample
+      playspace.recommendations.more_info.first
+    end
+
+    def scroll_to_element(element)
+      page.execute_script("arguments[0].scrollIntoView(true);", element)
+    end
+
     def save_and_link_screenshot
       FileUtils.mkdir_p('reports') unless File.directory?('reports')
       current_time = Time.new.strftime('%Y-%m-%d-%H-%M-%S')

From bd3b61e5119e7c384f7b385581cf4b886e86aeb8 Mon Sep 17 00:00:00 2001
From: Ankit Jain <jaina07@mc-s089994.national.core.bbc.co.uk>
Date: Wed, 20 Sep 2017 16:56:54 +0100
Subject: [PATCH 56/62] Added few methods

---
 lib/frameworks/utils.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/frameworks/utils.rb b/lib/frameworks/utils.rb
index 09ad160..f28650a 100644
--- a/lib/frameworks/utils.rb
+++ b/lib/frameworks/utils.rb
@@ -73,11 +73,6 @@ def wait_until_page_is_fully_loaded
       end
     end
 
-    def return_random_element(section, elements)
-      section.send(elements).sample
-      playspace.recommendations.more_info.first
-    end
-
     def scroll_to_element(element)
       page.execute_script("arguments[0].scrollIntoView(true);", element)
     end

From f0976f92cd2b8601b2f4c00ea0e02b5bcc129d58 Mon Sep 17 00:00:00 2001
From: Ankit Jain <jaina07@mc-s089994.national.core.bbc.co.uk>
Date: Thu, 21 Sep 2017 11:17:14 +0100
Subject: [PATCH 57/62] Added element translation method

---
 lib/frameworks/utils.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/frameworks/utils.rb b/lib/frameworks/utils.rb
index f28650a..17a69d7 100644
--- a/lib/frameworks/utils.rb
+++ b/lib/frameworks/utils.rb
@@ -61,6 +61,13 @@ def check_expected_section_translation(section, table)
       end
     end
 
+    def check_expected_element_translation(page, table)
+      table.rows_hash.each do |key, value|
+        element = key.downcase.tr(' ', '_').tr(',', '')
+        expect(page.send(element).text).to eql value
+      end
+    end
+
     def switch_to_last_opened_window
       Capybara.page.switch_to_window(Capybara.page.windows.last)
       Capybara.page.windows.first.close

From 86739213c4c962ee911766e2bccad2882b9a10da Mon Sep 17 00:00:00 2001
From: Swati Tabib <swati.tabib.ext@bbc.co.uk>
Date: Fri, 29 Sep 2017 13:58:22 +0100
Subject: [PATCH 58/62] downgrading cucumber gem version to 2.4.0 due to
 failures in parallel_tests

---
 frameworks-capybara.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frameworks-capybara.gemspec b/frameworks-capybara.gemspec
index 789847e..7779a09 100644
--- a/frameworks-capybara.gemspec
+++ b/frameworks-capybara.gemspec
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('capybara-mechanize')
   s.add_runtime_dependency('poltergeist')
   s.add_runtime_dependency('json')
-  s.add_runtime_dependency('cucumber')
+  s.add_runtime_dependency('cucumber', '~> 2.4.0')
   s.add_runtime_dependency('logging')
   s.add_runtime_dependency('show_me_the_cookies')
   s.add_runtime_dependency('w3c_validators')

From c5d54c4fcf909ea1ec00e7e1618f962de0baad4c Mon Sep 17 00:00:00 2001
From: Ankit Jain <jaina07@mc-s089994.national.core.bbc.co.uk>
Date: Mon, 2 Oct 2017 17:42:33 +0100
Subject: [PATCH 59/62] Added method for msi

---
 lib/frameworks/utils.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/frameworks/utils.rb b/lib/frameworks/utils.rb
index 17a69d7..696ae85 100644
--- a/lib/frameworks/utils.rb
+++ b/lib/frameworks/utils.rb
@@ -15,6 +15,11 @@ def clean_id_cookies
       Capybara.current_session.delete_cookie 'IDENTITIY_ENV'
     end
 
+    def set_cookie_for_uk
+      page.execute_script 'document.cookie="ckns_orb_fig_cache={%22uk%22:1%2C%22ck%22:1%2C%22ad%22:0%2C%22ap%22:0%2C%22tb%22:0%2C%22mb%22:0%2C%22eu%22:1}; path=/; domain=.bbc.co.uk";'
+      visit current_url
+    end
+
     def browser
       if Capybara.current_driver == :selenium
         Capybara.current_session.driver.browser.manage

From 880fdc909f360df61904d459e49d6fa7dfdb1745 Mon Sep 17 00:00:00 2001
From: Ajay Kumar <kumara48@mc-s103089.local>
Date: Tue, 21 Nov 2017 11:25:22 +0000
Subject: [PATCH 60/62] created a method to get logs

---
 lib/frameworks/utils.rb | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/lib/frameworks/utils.rb b/lib/frameworks/utils.rb
index 696ae85..455ef34 100644
--- a/lib/frameworks/utils.rb
+++ b/lib/frameworks/utils.rb
@@ -95,5 +95,34 @@ def save_and_link_screenshot
       Capybara.current_session.driver.save_screenshot("./reports/Screenshot_#{current_time}.png")
       embed "./reports/Screenshot_#{current_time}.png", 'image/png', "Actual screenshot of the error at #{current_url}"
     end
+
+    def getting_console_errors(type)
+    case type
+    when 'errors'
+      errors = page.driver.browser.manage.logs.get(:browser).select {|e| e.level == "SEVERE"}.map(&:message).to_a
+       if errors.present?
+         puts "Below are the errors found."
+         raise StandardError, errors.join("\n\n")
+       else
+         puts "No Error found in console"
+       end
+     when 'warnings'
+       warnings = page.driver.browser.manage.logs.get(:browser).select {|e| e.level != "SEVERE"}.map(&:message).to_a
+       if warnings.present?
+         puts "Below are the warnings found."
+         raise StandardError, warnings.join("\n\n")
+       else
+         puts "No warnings found in console"
+       end
+     when 'all'
+       errors = page.driver.browser.manage.logs.get(:browser).map(&:message).join("\n\n")
+       if errors.present?
+         puts "Below are the errors/warnings found."
+         raise StandardError, errors
+       else
+         puts "No Error/warnings found in console"
+       end
+    end
+    end
   end
 end

From 24d71182a72c605c20ce46ef9da405dd36b8b5e4 Mon Sep 17 00:00:00 2001
From: Ajay Kumar <kumara48@mc-s103089.local>
Date: Wed, 22 Nov 2017 09:52:24 +0000
Subject: [PATCH 61/62] Incorporated review comments

---
 lib/frameworks/utils.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/frameworks/utils.rb b/lib/frameworks/utils.rb
index 455ef34..67a4cfc 100644
--- a/lib/frameworks/utils.rb
+++ b/lib/frameworks/utils.rb
@@ -96,7 +96,7 @@ def save_and_link_screenshot
       embed "./reports/Screenshot_#{current_time}.png", 'image/png', "Actual screenshot of the error at #{current_url}"
     end
 
-    def getting_console_errors(type)
+    def get_console_logs(type)
     case type
     when 'errors'
       errors = page.driver.browser.manage.logs.get(:browser).select {|e| e.level == "SEVERE"}.map(&:message).to_a
@@ -114,7 +114,7 @@ def getting_console_errors(type)
        else
          puts "No warnings found in console"
        end
-     when 'all'
+     when 'errors_and_warnings'
        errors = page.driver.browser.manage.logs.get(:browser).map(&:message).join("\n\n")
        if errors.present?
          puts "Below are the errors/warnings found."

From 3f8488278db726110224cf1b12577fc473f20675 Mon Sep 17 00:00:00 2001
From: Anthony Kalu Uma <anthony.kaluuma@bbc.co.uk>
Date: Thu, 23 Nov 2017 13:38:12 +0000
Subject: [PATCH 62/62] Added include method

---
 lib/frameworks/utils.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/frameworks/utils.rb b/lib/frameworks/utils.rb
index 67a4cfc..3f9ed26 100644
--- a/lib/frameworks/utils.rb
+++ b/lib/frameworks/utils.rb
@@ -66,6 +66,13 @@ def check_expected_section_translation(section, table)
       end
     end
 
+    def check_expected_section_translation_includes(section, table)
+      table.rows_hash.each do |key, value|
+        element = key.downcase.tr(' ', '_').tr(',', '')
+        expect(section.send(element).text).to include value
+      end
+    end
+
     def check_expected_element_translation(page, table)
       table.rows_hash.each do |key, value|
         element = key.downcase.tr(' ', '_').tr(',', '')