Skip to content

Commit edd687d

Browse files
committed
Merge pull request #318 from rails/sprockets-rails-tests
Test on sprockets-rails 2.2 and 3.x
2 parents 74500de + 4f2de94 commit edd687d

File tree

4 files changed

+33
-17
lines changed

4 files changed

+33
-17
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ gemfile:
1515
- gemfiles/Gemfile-sprockets-2-12
1616
- gemfiles/Gemfile-sprockets-2-8
1717
- gemfiles/Gemfile-sprockets-3-0
18+
- gemfiles/Gemfile-sprockets-rails-2-2
19+
- gemfiles/Gemfile-sprockets-rails-master
1820
- gemfiles/Gemfile-sass-3-1
1921
- gemfiles/Gemfile-sass-3-2
2022
- gemfiles/Gemfile-sass-3-3

gemfiles/Gemfile-sprockets-rails-2-2

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source "https://rubygems.org"
2+
3+
# Specify your gem"s dependencies in sass-rails.gemspec
4+
gemspec path: ".."
5+
6+
gem "rails"
7+
gem "sprockets-rails", "~> 2.2.0"
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source "https://rubygems.org"
2+
3+
# Specify your gem"s dependencies in sass-rails.gemspec
4+
gemspec path: ".."
5+
6+
gem "rails"
7+
gem "sprockets-rails", github: "rails/sprockets-rails"

test/sass_rails_test.rb

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class SassRailsTest < Sass::Rails::TestCase
105105
end
106106

107107
test 'sass imports work correctly' do
108-
css_output = sprockets_render('scss_project', 'application.scss')
108+
css_output = sprockets_render('scss_project', 'application.css')
109109
assert_match /main/, css_output
110110
assert_match /top-level/, css_output
111111
assert_match /partial-sass/, css_output
@@ -167,22 +167,22 @@ class SassRailsTest < Sass::Rails::TestCase
167167
end
168168

169169
test 'sass asset paths work' do
170-
css_output = sprockets_render('scss_project', 'application.scss')
171-
assert_match %r{asset-path:\s*"/assets/rails.png"}, css_output, 'asset-path:\s*"/assets/rails.png"'
172-
assert_match %r{asset-url:\s*url\(/assets/rails.png\)}, css_output, 'asset-url:\s*url\(/assets/rails.png\)'
173-
assert_match %r{image-path:\s*"/assets/rails.png"}, css_output, 'image-path:\s*"/assets/rails.png"'
174-
assert_match %r{image-url:\s*url\(/assets/rails.png\)}, css_output, 'image-url:\s*url\(/assets/rails.png\)'
175-
assert_match %r{video-path:\s*"/videos/rails.mp4"}, css_output, 'video-path:\s*"/videos/rails.mp4"'
176-
assert_match %r{video-url:\s*url\(/videos/rails.mp4\)}, css_output, 'video-url:\s*url\(/videos/rails.mp4\)'
177-
assert_match %r{audio-path:\s*"/audios/rails.mp3"}, css_output, 'audio-path:\s*"/audios/rails.mp3"'
178-
assert_match %r{audio-url:\s*url\(/audios/rails.mp3\)}, css_output, 'audio-url:\s*url\(/audios/rails.mp3\)'
179-
assert_match %r{font-path:\s*"/fonts/rails.ttf"}, css_output, 'font-path:\s*"/fonts/rails.ttf"'
180-
assert_match %r{font-url:\s*url\(/fonts/rails.ttf\)}, css_output, 'font-url:\s*url\(/fonts/rails.ttf\)'
181-
assert_match %r{font-url-with-query-hash:\s*url\(/fonts/rails.ttf\?#iefix\)}, css_output, 'font-url:\s*url\(/fonts/rails.ttf?#iefix\)'
182-
assert_match %r{javascript-path:\s*"/javascripts/rails.js"}, css_output, 'javascript-path:\s*"/javascripts/rails.js"'
183-
assert_match %r{javascript-url:\s*url\(/javascripts/rails.js\)}, css_output, 'javascript-url:\s*url\(/javascripts/rails.js\)'
184-
assert_match %r{stylesheet-path:\s*"/stylesheets/rails.css"}, css_output, 'stylesheet-path:\s*"/stylesheets/rails.css"'
185-
assert_match %r{stylesheet-url:\s*url\(/stylesheets/rails.css\)}, css_output, 'stylesheet-url:\s*url\(/stylesheets/rails.css\)'
170+
css_output = sprockets_render('scss_project', 'application.css')
171+
assert_match %r{asset-path:\s*"/assets/rails(-[0-9a-f]+)?.png"}, css_output, 'asset-path:\s*"/assets/rails.png"'
172+
assert_match %r{asset-url:\s*url\(/assets/rails(-[0-9a-f]+)?.png\)}, css_output, 'asset-url:\s*url\(/assets/rails.png\)'
173+
assert_match %r{image-path:\s*"/assets/rails(-[0-9a-f]+)?.png"}, css_output, 'image-path:\s*"/assets/rails.png"'
174+
assert_match %r{image-url:\s*url\(/assets/rails(-[0-9a-f]+)?.png\)}, css_output, 'image-url:\s*url\(/assets/rails.png\)'
175+
assert_match %r{video-path:\s*"/videos/rails(-[0-9a-f]+)?.mp4"}, css_output, 'video-path:\s*"/videos/rails.mp4"'
176+
assert_match %r{video-url:\s*url\(/videos/rails(-[0-9a-f]+)?.mp4\)}, css_output, 'video-url:\s*url\(/videos/rails.mp4\)'
177+
assert_match %r{audio-path:\s*"/audios/rails(-[0-9a-f]+)?.mp3"}, css_output, 'audio-path:\s*"/audios/rails.mp3"'
178+
assert_match %r{audio-url:\s*url\(/audios/rails(-[0-9a-f]+)?.mp3\)}, css_output, 'audio-url:\s*url\(/audios/rails.mp3\)'
179+
assert_match %r{font-path:\s*"/fonts/rails(-[0-9a-f]+)?.ttf"}, css_output, 'font-path:\s*"/fonts/rails.ttf"'
180+
assert_match %r{font-url:\s*url\(/fonts/rails(-[0-9a-f]+)?.ttf\)}, css_output, 'font-url:\s*url\(/fonts/rails.ttf\)'
181+
assert_match %r{font-url-with-query-hash:\s*url\(/fonts/rails(-[0-9a-f]+)?.ttf\?#iefix\)}, css_output, 'font-url:\s*url\(/fonts/rails.ttf?#iefix\)'
182+
assert_match %r{javascript-path:\s*"/javascripts/rails(-[0-9a-f]+)?.js"}, css_output, 'javascript-path:\s*"/javascripts/rails.js"'
183+
assert_match %r{javascript-url:\s*url\(/javascripts/rails(-[0-9a-f]+)?.js\)}, css_output, 'javascript-url:\s*url\(/javascripts/rails.js\)'
184+
assert_match %r{stylesheet-path:\s*"/stylesheets/rails(-[0-9a-f]+)?.css"}, css_output, 'stylesheet-path:\s*"/stylesheets/rails.css"'
185+
assert_match %r{stylesheet-url:\s*url\(/stylesheets/rails(-[0-9a-f]+)?.css\)}, css_output, 'stylesheet-url:\s*url\(/stylesheets/rails.css\)'
186186

187187
asset_data_url_regexp = %r{asset-data-url:\s*url\((.*?)\)}
188188
assert_match asset_data_url_regexp, css_output, 'asset-data-url:\s*url\((.*?)\)'

0 commit comments

Comments
 (0)