pludoni_rspec 0.6.0.rc1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54f297b7f9ccf99f6a469fa815c32dc27891de1669295105e0a6f969b2ea4c3e
-  data.tar.gz: d63016f635b686b9b5082211c9536ba62237efc0cdac07d279d7d2299d0cebb5
+  metadata.gz: 59498ca200fbfc7e40d395c62847d7a54f778f26c09d5f27a50ac7ba3d6e8ac9
+  data.tar.gz: dde607bf239acbd3fb08ca91ab6e3fbd4cc15051876eb020888b1e76ef5f6467
 SHA512:
-  metadata.gz: 961718971875f0684a91cd09d3bc314f6a1c0016e81e19d9fc3ee6f0ab9c2a486e469a92406543ef950c64a6e9fd4b4ab9b5b119a788ead464e2e0a44de5ca68
-  data.tar.gz: be026fff600debf216077f224932754ff8ac4e917845412d83ef5fec6e0e94c624d1c1869a0b43506ca70c243a93e93ec1daad80b05b2cb77b3c651f3703d56f
+  metadata.gz: 998c37eecf23b0a57b21d84d0cf1b1f677163a85528c81b032a2982d1a6591de46085d817a8268d6b415f775fb3ba781ea15e988d5a3da7e5a5d03990010216f
+  data.tar.gz: 4a47c5df60ded585b8d859271a699b8cff9be2e7c49c96e40c0ee825c2b89ea8467085ac5750e07cc9c6955cc2886b3009919d0bae7105ae86ea566ac5d75d41

data/Gemfile.lock

@@ -1,74 +1,76 @@
 PATH
   remote: .
   specs:
-    pludoni_rspec (0.6.0)
+    pludoni_rspec (0.8.0)
       capybara (>= 3.13.2)
       fuubar (>= 2.3.1)
-      geckodriver-helper (>= 0.23.0)
       headless (>= 2.3.1)
       pry-rails
       puma
       selenium-webdriver (>= 3.141.0)
       simplecov (>= 0.16.1)
+      webdrivers (>= 4.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    archive-zip (0.11.0)
-      io-like (~> 0.3.0)
-    capybara (3.13.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    capybara (3.33.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.2)
+      regexp_parser (~> 1.5)
       xpath (~> 3.2)
-    childprocess (0.9.0)
-      ffi (~> 1.0, >= 1.0.11)
-    coderay (1.1.2)
-    docile (1.3.1)
-    ffi (1.10.0)
-    fuubar (2.3.2)
+    childprocess (3.0.0)
+    coderay (1.1.3)
+    docile (1.3.2)
+    fuubar (2.5.0)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    geckodriver-helper (0.23.0)
-      archive-zip (~> 0.7)
     headless (2.3.1)
-    io-like (0.3.0)
-    json (2.1.0)
-    method_source (0.9.2)
-    mini_mime (1.0.1)
+    method_source (1.0.0)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    nokogiri (1.10.1)
+    nio4r (2.5.4)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (3.0.3)
-    puma (3.12.0)
-    rack (2.0.6)
+<<<<<<< HEAD
+    public_suffix (4.0.1)
+    puma (4.3.5)
+=======
+    public_suffix (4.0.6)
+    puma (5.0.2)
+>>>>>>> 41f9d46... V.0.8.0
+      nio4r (~> 2.0)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rake (10.5.0)
-    regexp_parser (1.3.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    ruby-progressbar (1.10.0)
-    rubyzip (1.2.2)
-    selenium-webdriver (3.141.0)
-      childprocess (~> 0.5)
-      rubyzip (~> 1.2, >= 1.2.2)
-    simplecov (0.16.1)
+    regexp_parser (1.8.2)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-support (3.9.3)
+    ruby-progressbar (1.10.1)
+    rubyzip (2.3.0)
+    selenium-webdriver (3.142.7)
+      childprocess (>= 0.5, < 4.0)
+      rubyzip (>= 1.2.2)
+    simplecov (0.19.0)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.3)
+    webdrivers (4.4.1)
+      nokogiri (~> 1.6)
+      rubyzip (>= 1.3.0)
+      selenium-webdriver (>= 3.0, < 4.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 
@@ -81,4 +83,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

data/lib/pludoni_rspec.rb

@@ -11,14 +11,16 @@ module PludoniRspec
       attr_accessor :capybara_timeout
       attr_accessor :capybara_driver
       attr_accessor :firefox_arguments
+      attr_accessor :apparition_arguments
     end
-    self.chrome_driver_version = "2.36"
-    self.destroy_headless = true
+    # self.chrome_driver_version = "2.36"
+    self.destroy_headless = false
     self.wrap_js_spec_in_headless = RbConfig::CONFIG['host_os']['linux']
-    self.chrome_arguments = ['headless', 'disable-gpu', "window-size=1600,1200", 'no-sandbox', 'disable-dev-shm-usage', 'lang=de']
+    # self.chrome_arguments = ['headless', 'disable-gpu', "window-size=1600,1200", 'no-sandbox', 'disable-dev-shm-usage', 'lang=de']
     self.capybara_timeout = ENV['CI'] == '1' ? 30 : 5
     self.firefox_arguments = ['--headless', '--window-size=1600,1200']
-    self.capybara_driver = :headless_chrome
+    self.apparition_arguments = { js_errors: false, screen_size: [1600, 1200], window_size: [1600, 1200], browser_logger: File.open(File::NULL, 'w') }
+    self.capybara_driver = :firefox
   end
   def self.run
     ENV["RAILS_ENV"] ||= 'test'
@@ -29,7 +31,12 @@ module PludoniRspec
     require 'rspec/rails'
 
     require 'pludoni_rspec/spec_helper'
-    require 'pludoni_rspec/capybara'
+    if PludoniRspec::Config.capybara_driver == :apparition
+      puts "Apparition is deprecated for us, use Firefox"
+      require 'pludoni_rspec/apparition'
+    else
+      require 'pludoni_rspec/capybara'
+    end
     require 'pludoni_rspec/freeze_time'
     require 'pludoni_rspec/shared_context'
     if defined?(VCR)
@@ -43,7 +50,17 @@ module PludoniRspec
   end
 
   def self.coverage!
+    if File.exists?('coverage/.resultset.json') && (
+        File.ctime('coverage/.resultset.json') < (Time.now - 900) ||
+        (JSON.parse(File.read('coverage/.resultset.json')).keys.length > 4)
+    )
+      File.unlink('coverage/.resultset.json')
+      if File.exists?('coverage/.resultset.json.lock')
+        File.unlink('coverage/.resultset.json.lock')
+      end
+    end
     require 'simplecov'
+    SimpleCov.command_name "spec:#{Time.now.to_i}"
     SimpleCov.start 'rails' do
       add_filter do |source_file|
         source_file.lines.count < 10

data/lib/pludoni_rspec/apparition.rb

@@ -0,0 +1,44 @@
+require "capybara"
+require "headless"
+require "puma"
+require 'pludoni_rspec/system_test_chrome_helper'
+
+require 'capybara/apparition'
+Capybara.register_driver :apparition_debug do |app|
+  Capybara::Apparition::Driver.new(app, js_errors: true, browser_options: { 'no-sandbox' => true })
+end
+Capybara.register_driver :apparition do |app|
+  if ENV['CI']
+    options[:browser_options] = { 'no-sandbox' => true }
+  end
+  Capybara::Apparition::Driver.new(app, PludoniRspec::Config.apparition_arguments)
+end
+Capybara.javascript_driver = :apparition
+
+RSpec.configure do |c|
+  c.include PludoniRspec::SystemTestChromeHelper, type: :feature
+  c.include PludoniRspec::SystemTestChromeHelper, type: :system
+  c.before(:all, js: true) do
+    # disable puma output
+    Capybara.server = :puma, { Silent: true }
+  end
+  c.before(:each, type: :system) do
+    if defined?(driven_by)
+      driven_by :apparition
+    end
+  end
+  c.around(:all, js: true) do |ex|
+    begin
+      if !@headless and PludoniRspec::Config.wrap_js_spec_in_headless
+        @headless = Headless.new(destroy_at_exit: true, reuse: true)
+        @headless.start
+      end
+      ex.run
+    ensure
+      if @headless and PludoniRspec::Config.destroy_headless
+        @headless.destroy
+      end
+    end
+  end
+end
+Capybara.default_max_wait_time = PludoniRspec::Config.capybara_timeout

data/lib/pludoni_rspec/capybara.rb

@@ -1,12 +1,15 @@
 require "capybara"
 require "selenium-webdriver"
 require "headless"
-require "selenium/webdriver"
 require "puma"
 require 'pludoni_rspec/system_test_chrome_helper'
-require 'geckodriver/helper'
+require 'webdrivers/geckodriver'
 
 RSpec.configure do |c|
+  c.before(:all, js: true) do
+    Webdrivers.cache_time = 86_400
+    Webdrivers::Geckodriver.update
+  end
   c.include PludoniRspec::SystemTestChromeHelper, type: :feature
   c.include PludoniRspec::SystemTestChromeHelper, type: :system
   c.before(:all, js: true) do

data/lib/pludoni_rspec/spec_helper.rb

@@ -3,6 +3,13 @@ RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
+  config.include RSpec::Rails::RequestExampleGroup, type: :request, file_path: /spec\/api/
+  config.before do
+    I18n.locale = I18n.default_locale
+    if defined?(Fabrication)
+      Fabrication::Sequencer.reset
+    end
+  end
 
   config.mock_with :rspec do |mocks|
     mocks.verify_partial_doubles = true
@@ -21,4 +28,11 @@ RSpec.configure do |config|
   config.filter_gems_from_backtrace("fabrication")
   config.filter_gems_from_backtrace("grape")
   config.filter_gems_from_backtrace("rack")
+
+  config.around(:each, :timeout) do |example|
+    time = 10 unless time.kind_of?(Numeric)
+    Timeout.timeout(time) do
+      example.run
+    end
+  end
 end

data/lib/pludoni_rspec/system_test_chrome_helper.rb

@@ -36,4 +36,26 @@ module PludoniRspec::SystemTestChromeHelper
     yield
     Capybara.session_name = old_session
   end
+
+  # wait_until { page.has_content?("Something") }
+  def wait_until(timeout = 10, &blk)
+    end_time       = Time.zone.now + timeout
+    last_exception = nil
+
+    until Time.zone.now >= end_time
+      begin
+        result = yield
+        return result if result
+      rescue RSpec::Expectations::ExpectationNotMetError => ex
+        last_exception = ex
+      end
+
+      sleep 0.01
+    end
+
+    msg = "timed out after #{timeout} seconds"
+    msg << ":\n#{last_exception.message}" if last_exception
+
+    raise msg
+  end
 end

data/lib/pludoni_rspec/vcr.rb

@@ -2,4 +2,9 @@ VCR.configure do |config|
   config.cassette_library_dir = "spec/fixtures/vcr_cassettes"
   config.hook_into :webmock # or :fakeweb
   config.ignore_localhost = true
+  config.ignore_request do |request|
+    uri = URI.parse(request.uri)
+    uri.port == 9200 || # Elasticsearch requests
+      uri.host[/^172\.17|localhost|^10\./] || request.uri.to_s['geckodriver']
+  end
 end

data/lib/pludoni_rspec/version.rb

@@ -1,3 +1,3 @@
 module PludoniRspec
-  VERSION = "0.6.0.rc1"
+  VERSION = "0.8.0".freeze
 end

data/pludoni_rspec.gemspec

@@ -21,13 +21,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # spec.add_dependency "vcr", ">= 3.0.0"
-  spec.add_dependency "geckodriver-helper", ">= 0.23.0"
+  # spec.add_dependency "geckodriver-helper", ">= 0.23.0"
   spec.add_dependency 'capybara', ">= 3.13.2"
   spec.add_dependency 'fuubar', '>= 2.3.1'
   spec.add_dependency 'headless', ">= 2.3.1"
   spec.add_dependency 'pry-rails'
   spec.add_dependency 'puma'
+  # We don't need selenium, but rails system specs checks for availability
   spec.add_dependency 'selenium-webdriver', ">= 3.141.0"
+  spec.add_dependency "webdrivers", ">= 4.0.0"
+  # spec.add_dependency 'apparition'
   spec.add_dependency 'simplecov', ">= 0.16.1"
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pludoni_rspec
 version: !ruby/object:Gem::Version
-  version: 0.6.0.rc1
+  version: 0.8.0
 platform: ruby
 authors:
 - Stefan Wienert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-07 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: geckodriver-helper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.23.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.141.0
+- !ruby/object:Gem::Dependency
+  name: webdrivers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,7 @@ files:
 - exe/nf
 - exe/of
 - lib/pludoni_rspec.rb
+- lib/pludoni_rspec/apparition.rb
 - lib/pludoni_rspec/capybara.rb
 - lib/pludoni_rspec/devise.rb
 - lib/pludoni_rspec/freeze_time.rb
@@ -195,9 +196,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6