webdrivers 4.2.0 → 4.5.0

data/spec/webdrivers/edgedriver_spec.rb

@@ -114,15 +114,16 @@ describe Webdrivers::Edgedriver do
       end
     end
 
-    it 'makes a network call if cached driver does not match the browser' do
+    it 'makes network calls if cached driver does not match the browser' do
       Webdrivers::System.cache_version('msedgedriver', '71.0.3578.137')
-      allow(edgedriver).to receive(:browser_version).and_return(Gem::Version.new('73.0.3683.68'))
+      allow(edgedriver).to receive(:current_version).and_return Gem::Version.new('71.0.3578.137')
+      allow(edgedriver).to receive(:browser_version).and_return Gem::Version.new('73.0.3683.68')
       allow(Webdrivers::Network).to receive(:get).and_return('73.0.3683.68'.encode('UTF-16'))
       allow(Webdrivers::System).to receive(:download)
 
       edgedriver.update
 
-      expect(Webdrivers::Network).to have_received(:get).once
+      expect(Webdrivers::Network).to have_received(:get).twice
     end
 
     context 'when required version is 0' do
@@ -163,13 +164,13 @@ describe Webdrivers::Edgedriver do
 
   describe '#latest_version' do
     it 'returns the correct point release for a production version' do
-      allow(edgedriver).to receive(:browser_version).and_return '77.0.207.0'
+      allow(edgedriver).to receive(:browser_version).and_return Gem::Version.new('77.0.207.0')
 
       expect(edgedriver.latest_version).to be_between(Gem::Version.new('77.0.207.0'), Gem::Version.new('78'))
     end
 
     it 'raises VersionError for beta version' do
-      allow(edgedriver).to receive(:browser_version).and_return('100.0.0')
+      allow(edgedriver).to receive(:browser_version).and_return Gem::Version.new('100.0.0')
       msg = 'Unable to find latest point release version for 100.0.0. '\
 'You appear to be using a non-production version of Edge. '\
 'Please set `Webdrivers::Edgedriver.required_version = <desired driver version>` '\
@@ -196,28 +197,31 @@ describe Webdrivers::Edgedriver do
     end
 
     it 'creates cached file' do
-      allow(edgedriver).to receive(:browser_version).and_return('77.0.207.0')
+      allow(edgedriver).to receive(:browser_version).and_return Gem::Version.new('77.0.207.0')
       allow(Webdrivers::Network).to receive(:get).and_return('77.0.207.0'.encode('UTF-16'))
 
       edgedriver.latest_version
       expect(File.exist?("#{Webdrivers::System.install_dir}/msedgedriver.version")).to eq true
     end
 
-    it 'does not make network call if cache is valid' do
+    it 'does not make network calls if cache is valid and driver exists' do
       allow(Webdrivers).to receive(:cache_time).and_return(3600)
-      Webdrivers::System.cache_version('msedgedriver', '77.0.207.0')
+      Webdrivers::System.cache_version('msedgedriver', '82.0.445.0')
+      allow(edgedriver).to receive(:current_version).and_return Gem::Version.new('82.0.445.0')
+      allow(edgedriver).to receive(:browser_version).and_return Gem::Version.new('82.0.445.0')
+      allow(Webdrivers::System).to receive(:exists?).and_return(true)
       allow(Webdrivers::Network).to receive(:get)
 
-      expect(edgedriver.latest_version).to eq Gem::Version.new('77.0.207.0')
+      expect(edgedriver.latest_version).to eq Gem::Version.new('82.0.445.0')
 
       expect(Webdrivers::Network).not_to have_received(:get)
     end
 
-    it 'makes a network call if cache is expired' do
+    it 'makes network calls if cache is expired' do
       Webdrivers::System.cache_version('msedgedriver', '71.0.3578.137')
       allow(Webdrivers::Network).to receive(:get).and_return('77.0.207.0'.encode('UTF-16'))
-      allow(Webdrivers::System).to receive(:valid_cache?)
-      allow(edgedriver).to receive(:browser_version).and_return('77.0.207.0')
+      allow(Webdrivers::System).to receive(:valid_cache?).and_return(false)
+      allow(edgedriver).to receive(:browser_version).and_return Gem::Version.new('77.0.207.0')
 
       expect(edgedriver.latest_version).to eq Gem::Version.new('77.0.207.0')
 

data/spec/webdrivers/geckodriver_spec.rb

@@ -135,9 +135,10 @@ You can obtain a copy of the license at https://mozilla.org/MPL/2.0/"
       expect(File.exist?("#{Webdrivers::System.install_dir}/geckodriver.version")).to eq true
     end
 
-    it 'does not make network call if cache is valid' do
+    it 'does not make network calls if cache is valid and driver exists' do
       allow(Webdrivers).to receive(:cache_time).and_return(3600)
       Webdrivers::System.cache_version('geckodriver', '0.23.0')
+      allow(Webdrivers::System).to receive(:exists?).and_return(true)
       allow(Webdrivers::Network).to receive(:get)
 
       expect(geckodriver.latest_version).to eq Gem::Version.new('0.23.0')

data/spec/webdrivers/i_edriver_spec.rb

@@ -115,9 +115,10 @@ describe Webdrivers::IEdriver do
       expect(File.exist?("#{Webdrivers::System.install_dir}/IEDriverServer.version")).to eq true
     end
 
-    it 'does not make network call if cache is valid' do
+    it 'does not make network calls if cache is valid and driver exists' do
       allow(Webdrivers).to receive(:cache_time).and_return(3600)
       Webdrivers::System.cache_version('IEDriverServer', '3.4.0')
+      allow(Webdrivers::System).to receive(:exists?).and_return(true)
       allow(Webdrivers::Network).to receive(:get)
 
       expect(iedriver.latest_version).to eq Gem::Version.new('3.4.0')

data/spec/webdrivers/system_spec.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Webdrivers::System do
+  describe '#wsl_v1?' do
+    subject { described_class.wsl_v1? }
+
+    before do
+      allow(described_class).to receive(:platform).and_return(platform)
+      allow(File).to receive(:open).with('/proc/version').and_return(StringIO.new(wsl_proc_version_contents))
+    end
+
+    let(:platform) { 'linux' }
+    let(:wsl_proc_version_contents) { '' }
+
+    context 'when the current platform is linux and WSL version is 1' do
+      let(:wsl_proc_version_contents) do
+        'Linux version 4.4.0-18362-Microsoft'\
+        '(Microsoft@Microsoft.com) (gcc version 5.4.0 (GCC) )'\
+        '#836-Microsoft Mon May 05 16:04:00 PST 2020'
+      end
+
+      it { is_expected.to eq true }
+    end
+
+    context 'when the current platform is linux and WSL version is 2' do
+      let(:wsl_proc_version_contents) do
+        'Linux version 4.19.84-microsoft-standard '\
+        '(oe-user@oe-host) (gcc version 8.2.0 (GCC)) '\
+        '#1 SMP Wed Nov 13 11:44:37 UTC 2019'
+      end
+
+      it { is_expected.to eq false }
+    end
+
+    context 'when the current platform is mac' do
+      let(:platform) { 'mac' }
+
+      it { is_expected.to eq false }
+    end
+  end
+
+  describe '#to_win32_path' do
+    before { allow(described_class).to receive(:call).and_return("C:\\path\\to\\folder\n") }
+
+    it 'uses wslpath' do
+      described_class.to_win32_path '/c/path/to/folder'
+
+      expect(described_class).to have_received(:call).with('wslpath -w \'/c/path/to/folder\'')
+    end
+
+    it 'removes the trailing newline' do
+      expect(described_class.to_win32_path('/c/path/to/folder')).not_to end_with('\n')
+    end
+
+    context 'when the path is already in Windows format' do
+      it 'returns early' do
+        expect(described_class.to_win32_path('D:\\')).to eq 'D:\\'
+
+        expect(described_class).not_to have_received(:call)
+      end
+    end
+  end
+
+  describe '#to_wsl_path' do
+    before { allow(described_class).to receive(:call).and_return("/c/path/to/folder\n") }
+
+    it 'uses wslpath' do
+      described_class.to_wsl_path 'C:\\path\\to\\folder'
+
+      expect(described_class).to have_received(:call).with('wslpath -u \'C:\\path\\to\\folder\'')
+    end
+
+    it 'removes the trailing newline' do
+      expect(described_class.to_wsl_path('/c/path/to/folder')).not_to end_with('\n')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webdrivers
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.5.0
 platform: ruby
 authors:
 - Titus Fortner
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-27 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -26,20 +26,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: irb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -55,47 +41,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: reline
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.89'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.89'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-packaging
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.66'
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.66'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -116,14 +102,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.32'
+        version: '1.42'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.32'
+        version: '1.42'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -195,17 +181,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/ISSUE_TEMPLATE.md"
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- appveyor.yml
-- gemfiles/Gemfile.edge
 - lib/webdrivers.rb
 - lib/webdrivers/Rakefile
 - lib/webdrivers/chrome_finder.rb
@@ -227,19 +205,46 @@ files:
 - spec/spec_helper.rb
 - spec/webdrivers/chrome_finder_spec.rb
 - spec/webdrivers/chromedriver_spec.rb
+- spec/webdrivers/coverage/assets/0.10.2/application.css
+- spec/webdrivers/coverage/assets/0.10.2/application.js
+- spec/webdrivers/coverage/assets/0.10.2/colorbox/border.png
+- spec/webdrivers/coverage/assets/0.10.2/colorbox/controls.png
+- spec/webdrivers/coverage/assets/0.10.2/colorbox/loading.gif
+- spec/webdrivers/coverage/assets/0.10.2/colorbox/loading_background.png
+- spec/webdrivers/coverage/assets/0.10.2/favicon_green.png
+- spec/webdrivers/coverage/assets/0.10.2/favicon_red.png
+- spec/webdrivers/coverage/assets/0.10.2/favicon_yellow.png
+- spec/webdrivers/coverage/assets/0.10.2/loading.gif
+- spec/webdrivers/coverage/assets/0.10.2/magnify.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-icons_222222_256x240.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-icons_2e83ff_256x240.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-icons_454545_256x240.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-icons_888888_256x240.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-icons_cd0a0a_256x240.png
+- spec/webdrivers/coverage/index.html
 - spec/webdrivers/edge_finder_spec.rb
 - spec/webdrivers/edgedriver_spec.rb
 - spec/webdrivers/geckodriver_spec.rb
 - spec/webdrivers/i_edriver_spec.rb
+- spec/webdrivers/system_spec.rb
 - spec/webdrivers/webdrivers_spec.rb
 - spec/webdrivers_proxy_support_spec.rb
-- support/install_jruby.ps1
-- support/install_msedge.ps1
-- webdrivers.gemspec
 homepage: https://github.com/titusfortner/webdrivers
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/titusfortner/webdrivers/issues
+  changelog_uri: https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/webdrivers/4.5.0
+  source_code_uri: https://github.com/titusfortner/webdrivers/tree/v4.5.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -248,24 +253,50 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Easy download and use of browser drivers.
 test_files:
 - spec/spec_helper.rb
-- spec/webdrivers/chrome_finder_spec.rb
 - spec/webdrivers/chromedriver_spec.rb
-- spec/webdrivers/edge_finder_spec.rb
+- spec/webdrivers/chrome_finder_spec.rb
+- spec/webdrivers/coverage/assets/0.10.2/application.css
+- spec/webdrivers/coverage/assets/0.10.2/application.js
+- spec/webdrivers/coverage/assets/0.10.2/colorbox/border.png
+- spec/webdrivers/coverage/assets/0.10.2/colorbox/controls.png
+- spec/webdrivers/coverage/assets/0.10.2/colorbox/loading.gif
+- spec/webdrivers/coverage/assets/0.10.2/colorbox/loading_background.png
+- spec/webdrivers/coverage/assets/0.10.2/favicon_green.png
+- spec/webdrivers/coverage/assets/0.10.2/favicon_red.png
+- spec/webdrivers/coverage/assets/0.10.2/favicon_yellow.png
+- spec/webdrivers/coverage/assets/0.10.2/loading.gif
+- spec/webdrivers/coverage/assets/0.10.2/magnify.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-icons_222222_256x240.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-icons_2e83ff_256x240.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-icons_454545_256x240.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-icons_888888_256x240.png
+- spec/webdrivers/coverage/assets/0.10.2/smoothness/images/ui-icons_cd0a0a_256x240.png
+- spec/webdrivers/coverage/index.html
 - spec/webdrivers/edgedriver_spec.rb
+- spec/webdrivers/edge_finder_spec.rb
 - spec/webdrivers/geckodriver_spec.rb
 - spec/webdrivers/i_edriver_spec.rb
+- spec/webdrivers/system_spec.rb
 - spec/webdrivers/webdrivers_spec.rb
 - spec/webdrivers_proxy_support_spec.rb

data/.github/ISSUE_TEMPLATE.md

@@ -1,16 +0,0 @@
-#### Summary
-Short summary of the bug or feature request.
-
-#### Debug Info
-Please provide the following information for bug reports:
-
-* Webdrivers version:
-* Ruby version:
-* Operating system / CI Environment:
-* Browser and version:
-
-#### Expected Behavior
-What you expect to happen.
-
-#### Actual Behavior
-What is actually happening: Error message, stack trace, DEBUG log if applicable (set `Webdrivers.logger.level = :DEBUG` after you require webdrivers)

data/.gitignore

@@ -1,8 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
-chromedriver.log
-/.idea/
-coverage/
-gemfiles/Gemfile.*.lock

data/.rubocop.yml

@@ -1,47 +0,0 @@
-AllCops:
-  TargetRubyVersion: 2.4.6
-
-require:
-  - rubocop-rspec
-  - rubocop-performance
-
-Layout/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-
-Layout/EndOfLine:
-  EnforcedStyle: lf
-
-Metrics/LineLength:
-  Max: 120
-  IgnoredPatterns:
-    - '\s+# rubocop:disable'
-
-Metrics/MethodLength:
-  Max: 20
-
-Metrics/BlockLength:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/webdrivers/tasks/*.rake'
-
-Metrics/ClassLength:
-  Max: 116
-  Exclude:
-    - 'lib/webdrivers/system.rb'
-
-Metrics/CyclomaticComplexity:
-  Max: 8
-
-Metrics/AbcSize:
-  Max: 16
-  Exclude:
-    - 'lib/webdrivers/chromedriver.rb'
-
-Style/Documentation:
-  Enabled: false
-
-RSpec/ExampleLength:
-  Enabled: false
-
-RSpec/MultipleExpectations:
-  Enabled: false