Merge pull request #189 from rails/test-3-0-beta

Testing 3.0 beta on 2.x

Author: josh

.travis.yml

@@ -14,6 +14,7 @@ gemfile:
   - test/gemfiles/Gemfile.sprockets-2.11.x
   - test/gemfiles/Gemfile.sprockets-2.12.x
   - test/gemfiles/Gemfile.sprockets-2.8.x
+  - test/gemfiles/Gemfile.sprockets-3.0.x
 
 env:
   - LEGACY=true
@@ -33,6 +34,8 @@ matrix:
       rvm: 1.8.7
     - gemfile: test/gemfiles/Gemfile.sprockets-2.8.x
       rvm: 1.8.7
+    - gemfile: test/gemfiles/Gemfile.sprockets-3.0.x
+      rvm: 1.8.7
     - gemfile: Gemfile
       env: LEGACY=true
     - gemfile: test/gemfiles/Gemfile.rails-4.0.x
@@ -45,6 +48,8 @@ matrix:
       env: LEGACY=true
     - gemfile: test/gemfiles/Gemfile.sprockets-2.8.x
       env: LEGACY=true
+    - gemfile: test/gemfiles/Gemfile.sprockets-3.0.x
+      env: LEGACY=true
     - gemfile: test/gemfiles/Gemfile.rails-3.0.x
       env: LEGACY=false
     - gemfile: test/gemfiles/Gemfile.rails-3.1.x

sprockets-rails.gemspec

@@ -11,8 +11,10 @@ Gem::Specification.new do |s|
   s.add_dependency "sprockets", [">= 2.8", "< 4.0"]
   s.add_dependency "actionpack", ">= 3.0"
   s.add_dependency "activesupport", ">= 3.0"
-  s.add_development_dependency "rake"
   s.add_development_dependency "railties", ">= 3.0"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "sass"
+  s.add_development_dependency "uglifier"
 
   s.author = "Joshua Peek"
   s.email  = "[email protected]"

test/gemfiles/Gemfile.sprockets-3.0.x

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+gemspec :path => "./../.."
+
+gem 'sprockets', '3.0.0.beta.4'
+
+gem 'actionpack'
+gem 'railties'
+
+gem 'minitest', '= 4.7.3'

test/test_helper.rb

@@ -525,11 +525,22 @@ def test_non_javascripts_and_stylesheets
 
 class AutomaticDependenciesFromHelpersTest < HelperTest
   def test_dependency_added
-    assert_equal ["logo.png", "url.css.erb"], @assets['url.css'].send(:dependency_paths).map {|d| File.basename(d.pathname) }.sort
+    asset = @assets['url.css']
+    if asset.respond_to?(:metadata)
+      paths = asset.metadata[:dependency_paths].map { |p| File.basename(p) }.sort
+    else
+      paths = asset.send(:dependency_paths).map {|d| File.basename(d.pathname) }.sort
+    end
+    assert_equal ["logo.png", "url.css.erb"], paths
   end
 
   def test_ignores_missing_dependencies
-    assert_equal ["missing.css.erb"], @assets['error/missing.css'].send(:dependency_paths).map {|d| File.basename(d.pathname) }.sort
+    asset = @assets['error/missing.css']
+    if asset.respond_to?(:metadata)
+      paths = asset.metadata[:dependency_paths].map { |p| File.basename(p) }.sort
+    else
+      paths = asset.send(:dependency_paths).map {|d| File.basename(d.pathname) }.sort
+    end    
+    assert_equal ["missing.css.erb"], paths
   end
-
 end