diff --git a/.github/workflows/head.yml b/.github/workflows/head.yml index a8fcc41..4194218 100644 --- a/.github/workflows/head.yml +++ b/.github/workflows/head.yml @@ -7,19 +7,18 @@ jobs: strategy: fail-fast: false matrix: - entry: - - { ruby: "3.2", rails: "edge", grape-swagger: "HEAD" } - - { ruby: "ruby-head", rails: "edge", grape-swagger: "HEAD" } - - { ruby: "jruby-head", rails: "edge", grape-swagger: "HEAD" } + ruby: ['3.2', 'ruby-head', 'jruby-head'] + rails: ['edge'] + grape-swagger: ['HEAD'] env: - GRAPE_SWAGGER_VERSION: ${{ matrix.entry.grape-swagger }} - RAILS_VERSION: ${{ matrix.entry.rails }} + GRAPE_SWAGGER_VERSION: ${{ matrix.grape-swagger }} + RAILS_VERSION: ${{ matrix.rails }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v5 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: ${{ matrix.entry.ruby }} + ruby-version: ${{ matrix.ruby }} bundler-cache: true - name: Print Bundler Versions run: bundle show @@ -30,6 +29,7 @@ jobs: - uses: browser-actions/setup-geckodriver@latest with: geckodriver-version: "0.35.0" - - uses: coactions/setup-xvfb@v1 + - name: Run tests + uses: coactions/setup-xvfb@v1 with: run: bundle exec rake spec diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d6be27d..63e921b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,32 +6,20 @@ jobs: strategy: fail-fast: false matrix: - entry: - - { ruby: "2.7", rails: "6.1.7", grape-swagger: "1.6.1" } - - { ruby: "3.0", rails: "6.1.7", grape-swagger: "1.6.1" } - - { ruby: "3.1", rails: "6.1.7", grape-swagger: "1.6.1" } - - { ruby: "3.1", rails: "7.2.1", grape-swagger: "1.6.1" } - - { ruby: "3.2", rails: "6.1.7", grape-swagger: "1.6.1" } - - { ruby: "3.2", rails: "6.1.7", grape-swagger: "2.1.1" } - - { ruby: "3.2", rails: "7.2.1", grape-swagger: "1.6.1" } - - { ruby: "3.2", rails: "7.2.1", grape-swagger: "2.1.1" } - - { ruby: "3.3", rails: "6.1.7", grape-swagger: "1.6.1" } - - { ruby: "3.3", rails: "6.1.7", grape-swagger: "2.1.1" } - - { ruby: "3.3", rails: "7.2.1", grape-swagger: "1.6.1" } - - { ruby: "3.3", rails: "7.2.1", grape-swagger: "2.1.1" } - - { ruby: "jruby-9.4", rails: "6.1.7", grape-swagger: "1.6.1" } - - { ruby: "jruby-9.4", rails: "6.1.7", grape-swagger: "2.1.1" } - - { ruby: "jruby-9.4", rails: "7.2.1", grape-swagger: "1.6.1" } - - { ruby: "jruby-9.4", rails: "7.2.1", grape-swagger: "2.1.1" } + ruby: ['3.1', '3.2', '3.3', '3.4', 'jruby'] + rails: ['7.2.2.2', '8.0.2.1'] + grape-swagger: ['1.6.1', '2.1.2'] + exclude: + - { ruby: '3.1', rails: '8.0.2.1' } # Rails 8 requires Ruby >= 3.2 env: - GRAPE_SWAGGER_VERSION: ${{ matrix.entry.grape-swagger }} - RAILS_VERSION: ${{ matrix.entry.rails }} + GRAPE_SWAGGER_VERSION: ${{ matrix.grape-swagger }} + RAILS_VERSION: ${{ matrix.rails }} steps: - uses: actions/checkout@v5 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: ${{ matrix.entry.ruby }} + ruby-version: ${{ matrix.ruby }} bundler-cache: true - name: Print Bundler Versions run: bundle show diff --git a/Gemfile b/Gemfile index 8486617..ad879fd 100644 --- a/Gemfile +++ b/Gemfile @@ -19,8 +19,6 @@ else gem 'railties', rails_version end -gem 'logger' - group :development, :test do gem 'capybara' gem 'grape-swagger-ui' diff --git a/Rakefile b/Rakefile index ea424ba..930d9e5 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,5 @@ # frozen_string_literal: true -require 'logger' require 'bundler/setup' require 'bundler/gem_tasks' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c193f0d..62f80f0 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,8 +2,6 @@ ENV['RAILS_ENV'] ||= 'test' -require 'logger' - require File.expand_path('dummy/config/environment.rb', __dir__) require 'rspec/rails'