Update for Rubocop and other library changes as of 2023-09

petergoldstein · Sep 11, 2023 · aa8c353 · aa8c353
1 parent eba292e
commit aa8c353
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
@@ -9,7 +9,7 @@ jobs:
     env:
       BUNDLE_GEMFILE: gemfiles/Gemfile.rails6.1
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,9 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'rails', '~> 7.0.0'
+  gem 'nokogiri'
+  gem 'rails', '>= 6.1.0'
+  gem 'rake'
   gem 'rubocop'
   gem 'rubocop-performance'
   gem 'rubocop-rake'
@@ -15,7 +17,6 @@ end
 
 group :test do
   gem 'capybara'
-  gem 'rake'
   gem 'rspec', '~> 3.0'
   gem 'rspec-rails', '~> 5.0'
   gem 'selenium-webdriver'

diff --git a/lib/stub_saml_idp/controller.rb b/lib/stub_saml_idp/controller.rb
@@ -93,7 +93,7 @@ def encode_SAMLResponse(name_id, opts = {})
 
       signature = %(<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">#{signed_info}<ds:SignatureValue>#{signature_value}</ds:SignatureValue><KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><ds:X509Data><ds:X509Certificate>#{x509_certificate}</ds:X509Certificate></ds:X509Data></KeyInfo></ds:Signature>)
 
-      assertion_and_signature = assertion.sub(/Issuer><saml:Subject/, "Issuer>#{signature}<saml:Subject")
+      assertion_and_signature = assertion.sub('Issuer><saml:Subject', "Issuer>#{signature}<saml:Subject")
 
       xml = %(<samlp:Response ID="_#{response_id}" Version="2.0" IssueInstant="#{now.iso8601}" Destination="#{@saml_acs_url}" Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified"#{@saml_request_id ? %( InResponseTo="#{@saml_request_id}") : ''} xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"><saml:Issuer xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">#{issuer_uri}</saml:Issuer><samlp:Status><samlp:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success" /></samlp:Status>#{assertion_and_signature}</samlp:Response>)
 

diff --git a/spec/acceptance/acceptance_helper.rb b/spec/acceptance/acceptance_helper.rb
@@ -6,17 +6,23 @@
 
 require 'selenium-webdriver'
 
+options = Selenium::WebDriver::Chrome::Options.new
+options.add_preference(:download, prompt_for_download: false,
+                                  default_directory: '/tmp/downloads')
+
+options.add_preference(:browser, set_download_behavior: { behavior: 'allow' })
+
 Capybara.register_driver :chrome do |app|
-  options = Selenium::WebDriver::Chrome::Options.new
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: options)
+end
+
+Capybara.register_driver :headless_chrome do |app|
   options.add_argument('--headless')
-  options.add_argument('--allow-insecure-localhost')
-  options.add_argument('--ignore-certificate-errors')
-
-  Capybara::Selenium::Driver.new(
-    app,
-    browser: :chrome,
-    capabilities: [options]
-  )
+  options.add_argument('--disable-gpu')
+  options.add_argument('--window-size=1280,800')
+
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: options)
 end
-Capybara.default_driver = :chrome
+
+Capybara.default_driver = :headless_chrome
 Capybara.server = :webrick
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require_relative './spec_helper'
+require_relative 'spec_helper'
diff --git a/stub_saml_idp.gemspec b/stub_saml_idp.gemspec
@@ -26,14 +26,4 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
   s.rdoc_options = ['--charset=UTF-8']
-  s.add_development_dependency('nokogiri')
-  s.add_development_dependency('rails', '>= 5.2')
-  s.add_development_dependency('rake')
-  s.add_development_dependency('rspec', '~> 3.0')
-  s.add_development_dependency('rubocop')
-  s.add_development_dependency('rubocop-performance')
-  s.add_development_dependency('rubocop-rake')
-  s.add_development_dependency('rubocop-rspec')
-  s.add_development_dependency('ruby-saml')
-  s.add_development_dependency('timecop', '~> 0.9.0')
 end