Skip to content

Commit 2dc3529

Browse files
Propshaft support
1 parent c4c7fd1 commit 2dc3529

File tree

11 files changed

+1544
-12
lines changed

11 files changed

+1544
-12
lines changed

.github/workflows/test.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,15 @@ jobs:
4242
- uses: browser-actions/setup-geckodriver@latest
4343
with:
4444
geckodriver-version: "0.35.0"
45-
- uses: coactions/setup-xvfb@v1
45+
- name: Run tests with Sprockets
46+
uses: coactions/setup-xvfb@v1
47+
env:
48+
ASSET_PIPELINE: sprockets
49+
with:
50+
run: bundle exec rake spec
51+
- name: Run tests with Propshaft
52+
uses: coactions/setup-xvfb@v1
53+
env:
54+
ASSET_PIPELINE: propshaft
4655
with:
4756
run: bundle exec rake spec

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)