Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,15 @@ jobs:
- uses: browser-actions/setup-geckodriver@latest
with:
geckodriver-version: "0.35.0"
- name: Run tests
- name: Run tests with Sprockets
uses: coactions/setup-xvfb@v1
env:
ASSET_PIPELINE: sprockets
with:
run: bundle exec rake spec
- name: Run tests with Propshaft
uses: coactions/setup-xvfb@v1
env:
ASSET_PIPELINE: propshaft
with:
run: bundle exec rake spec
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

* Your contribution here.
* [#132](https://github.com/ruby-grape/grape-swagger-rails/pull/132): Automatically register assets with Sprockets - [@olivier-thatch](https://github.com/olivier-thatch).
* [#130](https://github.com/ruby-grape/grape-swagger-rails/pull/130): Propshaft support - [@olivier-thatch](https://github.com/olivier-thatch).

### 0.6.0 (2024/11/21)

Expand Down
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ group :development, :test do
gem 'jquery-rails'
gem 'mime-types'
gem 'nokogiri'
gem 'propshaft', require: false
gem 'rack', '< 3.0'
gem 'rack-cors'
gem 'rake'
Expand All @@ -35,8 +36,8 @@ group :development, :test do
gem 'rubocop-rspec'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
gem 'selenium-webdriver'
gem 'sprockets', ENV.fetch('SPROCKETS_VERSION', '>= 4.0.0')
gem 'sprockets-rails', require: 'sprockets/railtie'
gem 'sprockets', ENV.fetch('SPROCKETS_VERSION', '>= 4.0.0'), require: false
gem 'sprockets-rails', require: false
gem 'uglifier'
gem 'webrick'
end
2 changes: 1 addition & 1 deletion app/assets/stylesheets/grape_swagger_rails/application.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
*= require ./reset
*= require ./screen
*= require ./screen-sprockets
*= require_self
*/
Loading
Loading