Skip to content

Commit a445d08

Browse files
Propshaft support
1 parent 1383f97 commit a445d08

File tree

8 files changed

+1519
-6
lines changed

8 files changed

+1519
-6
lines changed

.github/workflows/test.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,15 @@ jobs:
3030
- uses: browser-actions/setup-geckodriver@latest
3131
with:
3232
geckodriver-version: "0.35.0"
33-
- name: Run tests
33+
- name: Run tests with Sprockets
3434
uses: coactions/setup-xvfb@v1
35+
env:
36+
ASSET_PIPELINE: sprockets
37+
with:
38+
run: bundle exec rake spec
39+
- name: Run tests with Propshaft
40+
uses: coactions/setup-xvfb@v1
41+
env:
42+
ASSET_PIPELINE: propshaft
3543
with:
3644
run: bundle exec rake spec

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
### 0.6.1 (Next)
1+
### 0.7.0 (Next)
22

33
* Your contribution here.
4+
* [#130](https://github.com/ruby-grape/grape-swagger-rails/pull/130): Propshaft support - [@olivier-thatch](https://github.com/olivier-thatch).
45

56
### 0.6.0 (2024/11/21)
67

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ group :development, :test do
2525
gem 'jquery-rails'
2626
gem 'mime-types'
2727
gem 'nokogiri'
28+
gem 'propshaft', require: false
2829
gem 'rack', '< 3.0'
2930
gem 'rack-cors'
3031
gem 'rake'
@@ -35,7 +36,7 @@ group :development, :test do
3536
gem 'rubocop-rspec'
3637
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3738
gem 'selenium-webdriver'
38-
gem 'sprockets-rails', require: 'sprockets/railtie'
39+
gem 'sprockets-rails', require: false
3940
gem 'uglifier'
4041
gem 'webrick'
4142
end
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
22
*= require ./reset
3-
*= require ./screen
3+
*= require ./screen-sprockets
44
*= require_self
55
*/

0 commit comments

Comments
 (0)