From c4236411026b4c8440bacc9a426a2eff4f5cf0d0 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Thu, 27 Oct 2022 11:22:20 +0100 Subject: [PATCH] Adds knapsack_pro to the stack; updates configs --- Gemfile | 4 ++++ Gemfile.lock | 3 +++ spec/base_spec_helper.rb | 8 +++++++- spec/spec_helper.rb | 6 ++++++ spec/support/vcr_setup.rb | 1 + 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 7ca4980c28..1c1beb19a3 100644 --- a/Gemfile +++ b/Gemfile @@ -153,6 +153,7 @@ group :test, :development do gem 'fuubar', '~> 2.5.1' gem 'json_spec', '~> 1.1.4' gem 'knapsack', require: false + gem 'knapsack_pro', require: false gem 'letter_opener', '>= 1.4.1' gem 'rspec-rails', ">= 3.5.2" gem 'rspec-retry', require: false @@ -168,6 +169,9 @@ group :test do gem 'simplecov', require: false gem 'test-prof', require: false gem 'vcr', require: false + gem 'test-prof' + gem 'vcr' +>>>>>>> 7f0d4cc24 (Adds knapsack_pro to the stack; updates configs) gem 'webmock', require: false # See spec/spec_helper.rb for instructions # gem 'perftools.rb' diff --git a/Gemfile.lock b/Gemfile.lock index f2b901ea93..3515da5d56 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -377,6 +377,8 @@ GEM jwt (2.5.0) knapsack (4.0.0) rake + knapsack_pro (3.4.1) + rake launchy (2.5.0) addressable (~> 2.7) letter_opener (1.8.1) @@ -819,6 +821,7 @@ DEPENDENCIES jsonapi-serializer jwt (~> 2.3) knapsack + knapsack_pro letter_opener (>= 1.4.1) listen mime-types diff --git a/spec/base_spec_helper.rb b/spec/base_spec_helper.rb index 008445dd72..4b2d1ebcaf 100644 --- a/spec/base_spec_helper.rb +++ b/spec/base_spec_helper.rb @@ -24,12 +24,18 @@ Shoulda::Matchers.configure do |config| end end +# Configures knapsack_pro if not set otherwise on .github/workflows/build.yml +unless ENV['DISABLE_KNAPSACK_PRO'] + require 'knapsack_pro' + KnapsackPro::Adapters::RSpecAdapter.bind +end + # Allow connections to selenium whilst raising errors when connecting to external sites require 'webmock/rspec' WebMock.enable! WebMock.disable_net_connect!( allow_localhost: true, - allow: 'chromedriver.storage.googleapis.com' + allow: ['chromedriver.storage.googleapis.com', 'api.knapsackpro.com'] ) # Requires supporting ruby files with custom matchers and macros, etc, diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c9bee1d80e..5a49444670 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -13,6 +13,12 @@ unless ENV['DISABLE_KNAPSACK'] Knapsack::Adapters::RSpecAdapter.bind end +# Configures knapsack_pro if not set otherwise on .github/workflows/build.yml +unless ENV['DISABLE_KNAPSACK_PRO'] + require 'knapsack_pro' + KnapsackPro::Adapters::RSpecAdapter.bind +end + Capybara.javascript_driver = :chrome Capybara.default_max_wait_time = 30 Capybara.disable_animation = true diff --git a/spec/support/vcr_setup.rb b/spec/support/vcr_setup.rb index c4af4c19b5..261563fff7 100644 --- a/spec/support/vcr_setup.rb +++ b/spec/support/vcr_setup.rb @@ -9,4 +9,5 @@ VCR.configure do |config| config.configure_rspec_metadata! config.filter_sensitive_data('') { ENV['STRIPE_SECRET_TEST_API_KEY'] } config.filter_sensitive_data('') { ENV['STRIPE_CUSTOMER'] } + config.ignore_hosts('localhost', '127.0.0.1', '0.0.0.0', 'api.knapsackpro.com') end