diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 3652b1c..d4147e2 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -4,7 +4,7 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v5 with: fetch-depth: 0 - name: Set up Ruby diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index 999a94e..b684b17 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -4,7 +4,7 @@ jobs: rubocop: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v5 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2555158..d6be27d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,15 +19,15 @@ jobs: - { 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.6", rails: "6.1.7", grape-swagger: "1.6.1" } - - { ruby: "jruby-9.4.6", rails: "6.1.7", grape-swagger: "2.1.1" } - - { ruby: "jruby-9.4.6", rails: "7.2.1", grape-swagger: "1.6.1" } - - { ruby: "jruby-9.4.6", 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" } env: GRAPE_SWAGGER_VERSION: ${{ matrix.entry.grape-swagger }} RAILS_VERSION: ${{ matrix.entry.rails }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v5 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: @@ -42,6 +42,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/Gemfile b/Gemfile index ad879fd..8486617 100644 --- a/Gemfile +++ b/Gemfile @@ -19,6 +19,8 @@ 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 930d9e5..ea424ba 100644 --- a/Rakefile +++ b/Rakefile @@ -1,5 +1,6 @@ # frozen_string_literal: true +require 'logger' require 'bundler/setup' require 'bundler/gem_tasks' diff --git a/lib/tasks/swagger_ui.rake b/lib/tasks/swagger_ui.rake index a3da18b..a7538c8 100644 --- a/lib/tasks/swagger_ui.rake +++ b/lib/tasks/swagger_ui.rake @@ -40,9 +40,9 @@ namespace :swagger_ui do 'swagger-oauth.js', 'base64.js' ].freeze - javascript_files = Dir["#{root}/app/assets/javascripts/grape_swagger_rails/*.js"].map { |f| + javascript_files = Dir["#{root}/app/assets/javascripts/grape_swagger_rails/*.js"].map do |f| f.split('/').last - } - ['application.js'] + end - ['application.js'] (javascript_files - JAVASCRIPT_FILES).each do |filename| puts "WARNING: add #{filename} to swagger_ui.rake" end @@ -65,9 +65,9 @@ namespace :swagger_ui do 'reset.css', 'screen.css' ].freeze - css_files = Dir["#{root}/app/assets/stylesheets/grape_swagger_rails/*.css"].map { |f| + css_files = Dir["#{root}/app/assets/stylesheets/grape_swagger_rails/*.css"].map do |f| f.split('/').last - } - ['application.css'] + end - ['application.css'] (css_files - CSS_FILES).each do |filename| puts "WARNING: add #{filename} to swagger_ui.rake" end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 62f80f0..c193f0d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,6 +2,8 @@ ENV['RAILS_ENV'] ||= 'test' +require 'logger' + require File.expand_path('dummy/config/environment.rb', __dir__) require 'rspec/rails'