[rb] update specs for Ruby 2.4 and RSpec 3.0

Author: titusfortner

rb/selenium-webdriver.gemspec

@@ -26,9 +26,9 @@ HTML of the application.'
   s.add_runtime_dependency 'childprocess', ['~> 0.5']
   s.add_runtime_dependency 'websocket', ['~> 1.0']
 
-  s.add_development_dependency 'rspec', ['~> 2.99.0']
+  s.add_development_dependency 'rspec', ['~> 3.0']
   s.add_development_dependency 'rack', ['~> 1.0']
   s.add_development_dependency 'ci_reporter', ['~> 1.6', '>= 1.6.2']
-  s.add_development_dependency 'webmock', ['~> 1.7', '>= 1.7.5']
+  s.add_development_dependency 'webmock', ['~> 2.0']
   s.add_development_dependency 'yard', ['~> 0.8.7']
 end

rb/spec/integration/selenium/webdriver/firefox/profile_spec.rb

@@ -22,161 +22,163 @@
 module Selenium
   module WebDriver
     module Firefox
-      describe Profile do
-        let(:profile) { Profile.new }
-        let(:browser) { GlobalTestEnv.driver == :remote ? :remote : :firefox }
+      compliant_on browser: :firefox do
+        describe Profile do
+          let(:profile) { Profile.new }
+          let(:browser) { GlobalTestEnv.driver == :remote ? :remote : :firefox }
 
-        def read_generated_prefs(from = nil)
-          prof = from || profile
-          dir = prof.layout_on_disk
+          def read_generated_prefs(from = nil)
+            prof = from || profile
+            dir = prof.layout_on_disk
 
-          File.read(File.join(dir, 'user.js'))
-        end
+            File.read(File.join(dir, 'user.js'))
+          end
 
-        def profile_opts
-          if GlobalTestEnv.driver == :remote
-            opt = { desired_capabilities: GlobalTestEnv.remote_capabilities.dup }
-            opt[:desired_capabilities][:firefox_profile] = profile
-            opt[:url] = GlobalTestEnv.remote_server.webdriver_url if GlobalTestEnv.remote_server?
-            opt
-          else
-            { desired_capabilities: Remote::Capabilities.firefox(marionette: GlobalTestEnv.browser == :firefox),
-              profile: profile }
+          def profile_opts
+            if GlobalTestEnv.driver == :remote
+              opt = {desired_capabilities: GlobalTestEnv.remote_capabilities.dup}
+              opt[:desired_capabilities][:firefox_profile] = profile
+              opt[:url] = GlobalTestEnv.remote_server.webdriver_url if GlobalTestEnv.remote_server?
+              opt
+            else
+              {desired_capabilities: Remote::Capabilities.firefox(marionette: GlobalTestEnv.browser == :firefox),
+               profile: profile}
+            end
           end
-        end
 
-        it 'should set additional preferences' do
-          profile['foo.number'] = 123
-          profile['foo.boolean'] = true
-          profile['foo.string'] = 'bar'
+          it 'should set additional preferences' do
+            profile['foo.number'] = 123
+            profile['foo.boolean'] = true
+            profile['foo.string'] = 'bar'
 
-          string = read_generated_prefs
-          expect(string).to include('user_pref("foo.number", 123)')
-          expect(string).to include('user_pref("foo.boolean", true)')
-          expect(string).to include(%{user_pref("foo.string", "bar")})
-        end
+            string = read_generated_prefs
+            expect(string).to include('user_pref("foo.number", 123)')
+            expect(string).to include('user_pref("foo.boolean", true)')
+            expect(string).to include(%{user_pref("foo.string", "bar")})
+          end
 
-        it 'should be serializable to JSON' do
-          profile['foo.boolean'] = true
+          it 'should be serializable to JSON' do
+            profile['foo.boolean'] = true
 
-          new_profile = Profile.from_json(profile.to_json)
-          string = read_generated_prefs(new_profile)
-          expect(string).to include('user_pref("foo.boolean", true)')
-        end
+            new_profile = Profile.from_json(profile.to_json)
+            string = read_generated_prefs(new_profile)
+            expect(string).to include('user_pref("foo.boolean", true)')
+          end
 
-        it 'should not let user override defaults' do
-          profile['app.update.enabled'] = true
+          it 'should not let user override defaults' do
+            profile['app.update.enabled'] = true
 
-          string = read_generated_prefs
-          expect(string).to include('user_pref("app.update.enabled", false)')
-        end
-
-        it 'should properly handle escaped characters' do
-          profile['foo'] = 'C:\\r\\n'
+            string = read_generated_prefs
+            expect(string).to include('user_pref("app.update.enabled", false)')
+          end
 
-          string = read_generated_prefs
-          expect(string).to include('user_pref("foo", "C:\\\\r\\\\n");')
-        end
+          it 'should properly handle escaped characters' do
+            profile['foo'] = 'C:\\r\\n'
 
-        it 'should let the user override some specific prefs' do
-          profile['browser.startup.page'] = 'http://example.com'
+            string = read_generated_prefs
+            expect(string).to include('user_pref("foo", "C:\\\\r\\\\n");')
+          end
 
-          string = read_generated_prefs
-          expect(string).to include(%{user_pref("browser.startup.page", "http://example.com")})
-        end
+          it 'should let the user override some specific prefs' do
+            profile['browser.startup.page'] = 'http://example.com'
 
-        it 'should raise an error if the value given is not a string, number or boolean' do
-          expect { profile['foo.bar'] = [] }.to raise_error(TypeError)
-        end
+            string = read_generated_prefs
+            expect(string).to include(%{user_pref("browser.startup.page", "http://example.com")})
+          end
 
-        it 'should raise an error if the value is already stringified' do
-          expect { profile['foo.bar'] = '"stringified"' }.to raise_error(ArgumentError)
-        end
+          it 'should raise an error if the value given is not a string, number or boolean' do
+            expect { profile['foo.bar'] = [] }.to raise_error(TypeError)
+          end
 
-        it 'should enable secure SSL' do
-          profile.secure_ssl = true
+          it 'should raise an error if the value is already stringified' do
+            expect { profile['foo.bar'] = '"stringified"' }.to raise_error(ArgumentError)
+          end
 
-          string = read_generated_prefs
-          expect(string).to include('user_pref("webdriver_accept_untrusted_certs", false)')
-        end
+          it 'should enable secure SSL' do
+            profile.secure_ssl = true
 
-        it 'should disable secure SSL' do
-          profile.secure_ssl = false
+            string = read_generated_prefs
+            expect(string).to include('user_pref("webdriver_accept_untrusted_certs", false)')
+          end
 
-          string = read_generated_prefs
-          expect(string).to include('user_pref("webdriver_accept_untrusted_certs", true)')
-        end
+          it 'should disable secure SSL' do
+            profile.secure_ssl = false
 
-        it 'should change the setting for untrusted certificate issuer' do
-          profile.assume_untrusted_certificate_issuer = false
+            string = read_generated_prefs
+            expect(string).to include('user_pref("webdriver_accept_untrusted_certs", true)')
+          end
 
-          string = read_generated_prefs
-          expect(string).to include('user_pref("webdriver_assume_untrusted_issuer", false)')
-        end
+          it 'should change the setting for untrusted certificate issuer' do
+            profile.assume_untrusted_certificate_issuer = false
 
-        it 'can configure a manual proxy' do
-          proxy = Proxy.new(
-            http: 'foo:123',
-            ftp: 'bar:234',
-            ssl: 'baz:345',
-            no_proxy: 'localhost'
-          )
+            string = read_generated_prefs
+            expect(string).to include('user_pref("webdriver_assume_untrusted_issuer", false)')
+          end
 
-          profile.proxy = proxy
-          string = read_generated_prefs
+          it 'can configure a manual proxy' do
+            proxy = Proxy.new(
+                http: 'foo:123',
+                ftp: 'bar:234',
+                ssl: 'baz:345',
+                no_proxy: 'localhost'
+            )
 
-          expect(string).to include('user_pref("network.proxy.http", "foo")')
-          expect(string).to include('user_pref("network.proxy.http_port", 123)')
+            profile.proxy = proxy
+            string = read_generated_prefs
 
-          expect(string).to include('user_pref("network.proxy.ftp", "bar")')
-          expect(string).to include('user_pref("network.proxy.ftp_port", 234)')
+            expect(string).to include('user_pref("network.proxy.http", "foo")')
+            expect(string).to include('user_pref("network.proxy.http_port", 123)')
 
-          expect(string).to include('user_pref("network.proxy.ssl", "baz")')
-          expect(string).to include('user_pref("network.proxy.ssl_port", 345)')
+            expect(string).to include('user_pref("network.proxy.ftp", "bar")')
+            expect(string).to include('user_pref("network.proxy.ftp_port", 234)')
 
-          expect(string).to include('user_pref("network.proxy.no_proxies_on", "localhost")')
-          expect(string).to include('user_pref("network.proxy.type", 1)')
-        end
+            expect(string).to include('user_pref("network.proxy.ssl", "baz")')
+            expect(string).to include('user_pref("network.proxy.ssl_port", 345)')
 
-        it 'can configure a PAC proxy' do
-          profile.proxy = Proxy.new(pac: 'http://foo/bar.pac')
-          string = read_generated_prefs
+            expect(string).to include('user_pref("network.proxy.no_proxies_on", "localhost")')
+            expect(string).to include('user_pref("network.proxy.type", 1)')
+          end
 
-          expect(string).to include('user_pref("network.proxy.autoconfig_url", "http://foo/bar.pac")')
-          expect(string).to include('user_pref("network.proxy.type", 2)')
-        end
+          it 'can configure a PAC proxy' do
+            profile.proxy = Proxy.new(pac: 'http://foo/bar.pac')
+            string = read_generated_prefs
 
-        it 'can configure an auto-detected proxy' do
-          profile.proxy = Proxy.new(auto_detect: true)
-          string = read_generated_prefs
+            expect(string).to include('user_pref("network.proxy.autoconfig_url", "http://foo/bar.pac")')
+            expect(string).to include('user_pref("network.proxy.type", 2)')
+          end
 
-          expect(string).to include('user_pref("network.proxy.type", 4)')
-        end
+          it 'can configure an auto-detected proxy' do
+            profile.proxy = Proxy.new(auto_detect: true)
+            string = read_generated_prefs
 
-        describe 'with browser' do
-          before(:each) do
-            profile['browser.startup.homepage'] = url_for('simpleTest.html')
-            profile['browser.startup.page'] = 1
+            expect(string).to include('user_pref("network.proxy.type", 4)')
           end
 
-          it 'should instantiate the browser with the correct profile' do
-            begin
-              driver1 = WebDriver.for(browser, profile_opts.dup)
-              expect{ wait(5).until { driver1.find_element(id: 'oneline') } }.to_not raise_error
-            ensure
-              driver1.quit
+          describe 'with browser' do
+            before(:each) do
+              profile['browser.startup.homepage'] = url_for('simpleTest.html')
+              profile['browser.startup.page'] = 1
+            end
+
+            it 'should instantiate the browser with the correct profile' do
+              begin
+                driver1 = WebDriver.for(browser, profile_opts.dup)
+                expect { wait(5).until { driver1.find_element(id: 'oneline') } }.to_not raise_error
+              ensure
+                driver1.quit
+              end
             end
-          end
 
-          it 'should be able to use the same profile more than once' do
-            begin
-              driver1 = WebDriver.for(browser, profile_opts.dup)
-              expect{ wait(5).until { driver1.find_element(id: 'oneline') } }.to_not raise_error
-              driver2 = WebDriver.for(browser, profile_opts.dup)
-              expect{ wait(5).until { driver2.find_element(id: 'oneline') } }.to_not raise_error
-            ensure
-              driver1.quit if driver1
-              driver2.quit if driver2
+            it 'should be able to use the same profile more than once' do
+              begin
+                driver1 = WebDriver.for(browser, profile_opts.dup)
+                expect { wait(5).until { driver1.find_element(id: 'oneline') } }.to_not raise_error
+                driver2 = WebDriver.for(browser, profile_opts.dup)
+                expect { wait(5).until { driver2.find_element(id: 'oneline') } }.to_not raise_error
+              ensure
+                driver1.quit if driver1
+                driver2.quit if driver2
+              end
             end
           end
         end

rb/spec/integration/selenium/webdriver/spec_support/rack_server.rb

@@ -48,7 +48,7 @@ def start
         end
 
         def run
-          handler.run @app, Host: @host, Port: @port
+          handler.run @app, Host: @host, Port: @port, AccessLog: []
         end
 
         def where_is(file)

rb/spec/unit/selenium/webdriver/chrome/bridge_spec.rb

@@ -117,7 +117,7 @@ module Chrome
         end
 
         it 'accepts :service_log_path' do
-          expect(Service).to receive(:new).with(Chrome.driver_path, Service::DEFAULT_PORT, '--log-path=/foo/bar')
+          expect(Service).to receive(:new).with(nil, Service::DEFAULT_PORT, '--log-path=/foo/bar')
           Bridge.new(http_client: http, service_log_path: '/foo/bar')
         end
       end

rb/spec/unit/selenium/webdriver/chrome/profile_spec.rb

@@ -31,7 +31,7 @@ module Chrome
           allow(File).to receive(:exist?).with(model).and_return true
           allow(File).to receive(:directory?).with(model).and_return true
 
-          Dir.stub(mktmpdir: '/tmp/some/path')
+          allow(Dir).to receive(:mktmpdir).and_return('/tmp/some/path')
           allow(FileUtils).to receive(:rm_rf)
           allow(FileUtils).to receive(:mkdir_p)
           allow(FileUtils).to receive(:cp_r)

rb/spec/unit/selenium/webdriver/common/driver_extensions/has_network_connection_spec.rb

@@ -25,27 +25,31 @@ module DriverExtensions
       describe HasNetworkConnection do
         class FakeDriver
           include HasNetworkConnection
+          attr_reader :bridge
+          def initialize(bridge)
+            @bridge = bridge
+          end
         end
 
-        let(:driver) { FakeDriver.new }
+        let(:driver) { FakeDriver.new(double(Remote::Bridge)) }
 
         describe '#network_connection' do
           it 'returns the correct connection type' do
-            allow(@bridge).to receive(:network_connection) { 1 }
+            allow(driver.bridge).to receive(:network_connection) { 1 }
 
             expect(driver.network_connection_type).to eq :airplane_mode
           end
 
           it 'returns an unknown connection value' do
-            allow(@bridge).to receive(:network_connection) { 5 }
+            allow(driver.bridge).to receive(:network_connection) { 5 }
 
             expect(driver.network_connection_type).to eq 5
           end
         end
 
         describe '#network_connection=' do
           it 'sends out the correct connection value' do
-            expect(@bridge).to receive(:network_connection=).with(1)
+            expect(driver.bridge).to receive(:network_connection=).with(1)
 
             driver.network_connection_type = :airplane_mode
           end

rb/spec/unit/selenium/webdriver/firefox/extension_spec.rb

@@ -24,7 +24,7 @@ module WebDriver
     module Firefox
       describe Extension do
         before do
-          File.stub(exist?: true)
+          allow(File).to receive(:exist?).and_return(true)
         end
 
         let(:extension) do

rb/spec/unit/selenium/webdriver/ie/bridge_spec.rb

@@ -65,7 +65,7 @@ module IE
         end
 
         it 'sets the server log level and log file' do
-          expect(Service).to receive(:new).with(IE.driver_path, Service::DEFAULT_PORT, '--log-level=TRACE', '--log-file=/foo/bar')
+          expect(Service).to receive(:new).with(nil, Service::DEFAULT_PORT, '--log-level=TRACE', '--log-file=/foo/bar')
 
           Bridge.new(
             log_level: :trace,
@@ -75,7 +75,7 @@ module IE
         end
 
         it 'should be able to set implementation' do
-          expect(Service).to receive(:new).with(IE.driver_path, Service::DEFAULT_PORT, '--implementation=VENDOR')
+          expect(Service).to receive(:new).with(nil, Service::DEFAULT_PORT, '--implementation=VENDOR')
 
           Bridge.new(
             implementation: :vendor,