diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 1ad0e266e..1fd8a72a8 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby-version: ['3.1'] + ruby-version: ['3.2'] services: postgres: diff --git a/.gitignore b/.gitignore index 6e7495265..c272a9757 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ test/dummy/db/*.sqlite3 test/dummy/log/*.log test/dummy/tmp/ test/dummy/.sass-cache +test/dummy/public/assets/ .DS_Store test/dummy/public/uploads/* test/dummy/app/assets/fonts/ @@ -23,3 +24,6 @@ test/dummy/storage/* .nova .ruby-version + +# Ignore auto-generated Spina Tailwind CSS configuration +/app/assets/config/spina/tailwind.config.js diff --git a/Gemfile b/Gemfile index 8b255967e..4962c55d9 100644 --- a/Gemfile +++ b/Gemfile @@ -18,8 +18,7 @@ group :test do # System tests gem "capybara" - gem "selenium-webdriver", "~> 4.9.0" - gem "webdrivers" + gem "selenium-webdriver", "~> 4.11.0" gem "pry-rails" gem "mocha" diff --git a/Gemfile.lock b/Gemfile.lock index f6406ad52..5f3ae95d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -246,7 +246,7 @@ GEM ffi (~> 1.12) ruby2_keywords (0.0.5) rubyzip (2.3.2) - selenium-webdriver (4.9.0) + selenium-webdriver (4.11.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -278,10 +278,6 @@ GEM activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) - webdrivers (5.3.1) - nokogiri (~> 1.6) - rubyzip (>= 1.3.0) - selenium-webdriver (~> 4.0, < 4.11) websocket (1.2.9) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) @@ -303,10 +299,9 @@ DEPENDENCIES pry-rails puma rails-controller-testing - selenium-webdriver (~> 4.9.0) + selenium-webdriver (~> 4.11.0) simplecov spina! - webdrivers BUNDLED WITH - 2.3.10 + 2.4.18 diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb index 6118f1e6f..56ec89811 100644 --- a/test/application_system_test_case.rb +++ b/test/application_system_test_case.rb @@ -1,7 +1,6 @@ require "test_helper" class ApplicationSystemTestCase < ActionDispatch::SystemTestCase - Webdrivers::Chromedriver.required_version = "114.0.5735.90" driven_by :selenium, using: :headless_chrome, screen_size: [1400, 1400] setup do diff --git a/test/test_helper.rb b/test/test_helper.rb index 8f6b48150..bd8df74d6 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -6,6 +6,7 @@ require File.expand_path("../dummy/config/environment.rb", __FILE__) require "rails/test_help" +require "minitest/unit" require "minitest/reporters" require "factory_bot" require "mocha/minitest"