Merge pull request #243 from rails/fix-2-x-build

Fix 2.x build

Author: rafaelfranca

.travis.yml

@@ -2,11 +2,13 @@ language: ruby
 cache: bundler
 sudo: false
 
+# TODO: Remove this when travis stop using bundler 1.7.6
+before_install: gem install bundler
+
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.6
 
 gemfile:
   - Gemfile

test/test_helper.rb

@@ -44,6 +44,33 @@ def setup
     @file2_js_digest       = @assets['file2.js'].digest
     @file2_css_digest      = @assets['file2.css'].digest
 
+    if Sprockets::VERSION > "3"
+      @selfext = ".self"
+      @foo_self_js_digest  = @assets['foo.self.js'].digest
+      @foo_self_css_digest = @assets['foo.self.css'].digest
+      @bar_self_js_digest  = @assets['bar.self.js'].digest
+      @bar_self_css_digest = @assets['bar.self.css'].digest
+
+      @dependency_self_js_digest  = @assets['dependency.self.js'].digest
+      @dependency_self_css_digest = @assets['dependency.self.css'].digest
+      @file1_self_js_digest       = @assets['file1.self.js'].digest
+      @file1_self_css_digest      = @assets['file1.self.css'].digest
+      @file2_self_js_digest       = @assets['file2.self.js'].digest
+      @file2_self_css_digest      = @assets['file2.self.css'].digest
+    else
+      @foo_self_js_digest  = @assets['foo.js'].digest
+      @foo_self_css_digest = @assets['foo.css'].digest
+      @bar_self_js_digest  = @assets['bar.js'].digest
+      @bar_self_css_digest = @assets['bar.css'].digest
+
+      @dependency_self_js_digest  = @assets['dependency.js'].digest
+      @dependency_self_css_digest = @assets['dependency.css'].digest
+      @file1_self_js_digest       = @assets['file1.js'].digest
+      @file1_self_css_digest      = @assets['file1.css'].digest
+      @file2_self_js_digest       = @assets['file2.js'].digest
+      @file2_self_css_digest      = @assets['file2.css'].digest
+    end
+
     Sprockets::Rails::Helper.raise_runtime_errors = false
   end
 
@@ -327,11 +354,11 @@ def setup
   def test_javascript_include_tag
     super
 
-    assert_dom_equal %(<script src="/assets/foo.js?body=1"></script>),
+    assert_dom_equal %(<script src="/assets/foo#{@selfext}.js?body=1"></script>),
       @view.javascript_include_tag(:foo)
-    assert_dom_equal %(<script src="/assets/foo.js?body=1"></script>\n<script src="/assets/bar.js?body=1"></script>),
+    assert_dom_equal %(<script src="/assets/foo#{@selfext}.js?body=1"></script>\n<script src="/assets/bar#{@selfext}.js?body=1"></script>),
       @view.javascript_include_tag(:bar)
-    assert_dom_equal %(<script src="/assets/dependency.js?body=1"></script>\n<script src="/assets/file1.js?body=1"></script>\n<script src="/assets/file2.js?body=1"></script>),
+    assert_dom_equal %(<script src="/assets/dependency#{@selfext}.js?body=1"></script>\n<script src="/assets/file1#{@selfext}.js?body=1"></script>\n<script src="/assets/file2#{@selfext}.js?body=1"></script>),
       @view.javascript_include_tag(:file1, :file2)
 
     assert_servable_asset_url "/assets/foo.js?body=1"
@@ -344,11 +371,11 @@ def test_javascript_include_tag
   def test_stylesheet_link_tag
     super
 
-    assert_dom_equal %(<link href="/assets/foo.css?body=1" media="screen" rel="stylesheet" />),
+    assert_dom_equal %(<link href="/assets/foo#{@selfext}.css?body=1" media="screen" rel="stylesheet" />),
       @view.stylesheet_link_tag(:foo)
-    assert_dom_equal %(<link href="/assets/foo.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/bar.css?body=1" media="screen" rel="stylesheet" />),
+    assert_dom_equal %(<link href="/assets/foo#{@selfext}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/bar#{@selfext}.css?body=1" media="screen" rel="stylesheet" />),
       @view.stylesheet_link_tag(:bar)
-    assert_dom_equal %(<link href="/assets/dependency.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file1.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file2.css?body=1" media="screen" rel="stylesheet" />),
+    assert_dom_equal %(<link href="/assets/dependency#{@selfext}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file1#{@selfext}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file2#{@selfext}.css?body=1" media="screen" rel="stylesheet" />),
       @view.stylesheet_link_tag(:file1, :file2)
 
     assert_servable_asset_url "/assets/foo.css?body=1"
@@ -384,11 +411,11 @@ def setup
   def test_javascript_include_tag
     super
 
-    assert_dom_equal %(<script src="/assets/foo-#{@foo_js_digest}.js?body=1"></script>),
+    assert_dom_equal %(<script src="/assets/foo#{@selfext}-#{@foo_self_js_digest}.js?body=1"></script>),
       @view.javascript_include_tag(:foo)
-    assert_dom_equal %(<script src="/assets/foo-#{@foo_js_digest}.js?body=1"></script>\n<script src="/assets/bar-#{@bar_js_digest}.js?body=1"></script>),
+    assert_dom_equal %(<script src="/assets/foo#{@selfext}-#{@foo_self_js_digest}.js?body=1"></script>\n<script src="/assets/bar#{@selfext}-#{@bar_self_js_digest}.js?body=1"></script>),
       @view.javascript_include_tag(:bar)
-    assert_dom_equal %(<script src="/assets/dependency-#{@dependency_js_digest}.js?body=1"></script>\n<script src="/assets/file1-#{@file1_js_digest}.js?body=1"></script>\n<script src="/assets/file2-#{@file1_js_digest}.js?body=1"></script>),
+    assert_dom_equal %(<script src="/assets/dependency#{@selfext}-#{@dependency_self_js_digest}.js?body=1"></script>\n<script src="/assets/file1#{@selfext}-#{@file1_self_js_digest}.js?body=1"></script>\n<script src="/assets/file2#{@selfext}-#{@file1_self_js_digest}.js?body=1"></script>),
       @view.javascript_include_tag(:file1, :file2)
 
     assert_servable_asset_url "/assets/foo-#{@foo_js_digest}.js?body=1"
@@ -401,11 +428,11 @@ def test_javascript_include_tag
   def test_stylesheet_link_tag
     super
 
-    assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css?body=1" media="screen" rel="stylesheet" />),
+    assert_dom_equal %(<link href="/assets/foo#{@selfext}-#{@foo_self_css_digest}.css?body=1" media="screen" rel="stylesheet" />),
       @view.stylesheet_link_tag(:foo)
-    assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/bar-#{@bar_css_digest}.css?body=1" media="screen" rel="stylesheet" />),
+    assert_dom_equal %(<link href="/assets/foo#{@selfext}-#{@foo_self_css_digest}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/bar#{@selfext}-#{@bar_self_css_digest}.css?body=1" media="screen" rel="stylesheet" />),
       @view.stylesheet_link_tag(:bar)
-    assert_dom_equal %(<link href="/assets/dependency-#{@dependency_css_digest}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file1-#{@file1_css_digest}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file2-#{@file2_css_digest}.css?body=1" media="screen" rel="stylesheet" />),
+    assert_dom_equal %(<link href="/assets/dependency#{@selfext}-#{@dependency_self_css_digest}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file1#{@selfext}-#{@file1_self_css_digest}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file2#{@selfext}-#{@file2_self_css_digest}.css?body=1" media="screen" rel="stylesheet" />),
       @view.stylesheet_link_tag(:file1, :file2)
 
     assert_servable_asset_url "/assets/foo-#{@foo_css_digest}.css?body=1"
@@ -655,20 +682,21 @@ class AutomaticDependenciesFromHelpersTest < HelperTest
   def test_dependency_added
     asset = @assets['url.css']
     if asset.respond_to?(:metadata)
-      paths = asset.metadata[:dependency_paths].map { |p| File.basename(p) }.sort
+      paths = asset.metadata[:dependencies].select { |uri| uri.start_with?("file-digest") }.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
+    assert_includes paths, "logo.png"
+    assert_includes paths, "url.css.erb"
   end
 
   def test_ignores_missing_dependencies
     asset = @assets['error/missing.css']
     if asset.respond_to?(:metadata)
-      paths = asset.metadata[:dependency_paths].map { |p| File.basename(p) }.sort
+      paths = asset.metadata[:dependencies].select { |uri| uri.start_with?("file-digest") }.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
+    assert_includes paths, "missing.css.erb"
   end
 end

test/test_railtie.rb

@@ -235,7 +235,7 @@ def test_manifest_path_respects_rails_public_path
       app.initialize!
 
       assert manifest = app.assets_manifest
-      assert_match %r{test_public/assets/manifest-.*\.json$}, manifest.path
+      assert_match %r{test_public/assets/.*manifest-.*\.json$}, manifest.path
       assert_match %r{test_public/assets$}, manifest.dir
     end
   end

test/test_task.rb

@@ -76,7 +76,7 @@ def test_precompile_without_manifest
     @rake['assets:precompile'].invoke
 
     assert @environment_ran
-    assert Dir["#{@dir}/manifest-*.json"].first
+    assert Dir["#{@dir}/.sprockets-manifest-*.json"].first || Dir["#{@dir}/manifest-*.json"].first
     assert File.exist?("#{@dir}/#{digest_path}")
   end