diff --git a/.circleci/config.yml b/.circleci/config.yml index c6a06fc405..ff04786035 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ defaults: &defaults BUNDLE_JOBS: 4 BUNDLE_RETRY: 3 BUNDLE_PATH: ~/spree/vendor/bundle - RAILS_VERSION: '~> 7.0' + RAILS_VERSION: '~> 7.0.0' working_directory: ~/spree docker: - image: &ruby_3_0_image circleci/ruby:3.0-node-browsers diff --git a/Gemfile b/Gemfile index 037770672b..7585757a72 100644 --- a/Gemfile +++ b/Gemfile @@ -23,8 +23,8 @@ end group :test do gem 'tinymce-rails' - gem 'capybara', '~> 3.39' - gem 'capybara-screenshot', '~> 1.0' + gem 'capybara' + gem 'capybara-screenshot' gem 'capybara-select-2' gem 'database_cleaner', '~> 2.0' gem 'email_spec' @@ -37,7 +37,7 @@ group :test do gem 'rswag-specs' gem 'jsonapi-rspec' gem 'simplecov', '0.22.0' - gem 'webmock', '~> 3.7' + gem 'webmock' gem 'timecop' gem 'rails-controller-testing' gem 'turbo-rails' @@ -50,10 +50,9 @@ group :test, :development do gem 'rubocop', require: false gem 'rubocop-rspec', require: false gem 'pry-byebug' - gem 'webdrivers', '~> 5.3' + gem 'webdrivers' gem 'selenium-webdriver' - # Puma 6.0 causes issues in specs due to conflict with capybara version - gem 'puma', '< 6.0' + gem 'puma' gem 'ffaker' end