Merge pull request #231 from lucasmazza/lm-outdated-tests

Update the test suite to account for named pipelines and the manifest name change.

Author: josh

.travis.yml

@@ -5,8 +5,8 @@ sudo: false
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1
-  - 2.2
+  - 2.1.5
+  - 2.2.1
 
 gemfile:
   - Gemfile
@@ -22,13 +22,13 @@ matrix:
     - gemfile: Gemfile
       rvm: 2.0.0
     - gemfile: Gemfile
-      rvm: 2.1
+      rvm: 2.1.5
     - gemfile: test/gemfiles/Gemfile.rails-5.0.x
       rvm: 1.9.3
     - gemfile: test/gemfiles/Gemfile.rails-5.0.x
       rvm: 2.0.0
     - gemfile: test/gemfiles/Gemfile.rails-5.0.x
-      rvm: 2.1
+      rvm: 2.1.5
 
 notifications:
   email: false

test/test_helper.rb

@@ -41,12 +41,24 @@ def setup
     @bar_css_digest = @assets['bar.css'].digest
     @logo_digest    = @assets['logo.png'].digest
 
+    @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_js_digest  = @assets['dependency.js'].digest
     @dependency_css_digest = @assets['dependency.css'].digest
     @file1_js_digest       = @assets['file1.js'].digest
     @file1_css_digest      = @assets['file1.css'].digest
     @file2_js_digest       = @assets['file2.js'].digest
     @file2_css_digest      = @assets['file2.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
   end
 
   def test_truth
@@ -428,35 +440,35 @@ 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.self.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.self.js?body=1"></script>\n<script src="/assets/bar.self.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.self.js?body=1"></script>\n<script src="/assets/file1.self.js?body=1"></script>\n<script src="/assets/file2.self.js?body=1"></script>),
       @view.javascript_include_tag(:file1, :file2)
 
-    assert_servable_asset_url "/assets/foo.js?body=1"
-    assert_servable_asset_url "/assets/bar.js?body=1"
-    assert_servable_asset_url "/assets/dependency.js?body=1"
-    assert_servable_asset_url "/assets/file1.js?body=1"
-    assert_servable_asset_url "/assets/file2.js?body=1"
+    assert_servable_asset_url "/assets/foo.self.js?body=1"
+    assert_servable_asset_url "/assets/bar.self.js?body=1"
+    assert_servable_asset_url "/assets/dependency.self.js?body=1"
+    assert_servable_asset_url "/assets/file1.self.js?body=1"
+    assert_servable_asset_url "/assets/file2.self.js?body=1"
   end
 
   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.self.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.self.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/bar.self.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.self.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file1.self.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file2.self.css?body=1" media="screen" rel="stylesheet" />),
       @view.stylesheet_link_tag(:file1, :file2)
 
-    assert_servable_asset_url "/assets/foo.css?body=1"
-    assert_servable_asset_url "/assets/bar.css?body=1"
-    assert_servable_asset_url "/assets/dependency.css?body=1"
-    assert_servable_asset_url "/assets/file1.css?body=1"
-    assert_servable_asset_url "/assets/file2.css?body=1"
+    assert_servable_asset_url "/assets/foo.self.css?body=1"
+    assert_servable_asset_url "/assets/bar.self.css?body=1"
+    assert_servable_asset_url "/assets/dependency.self.css?body=1"
+    assert_servable_asset_url "/assets/file1.self.css?body=1"
+    assert_servable_asset_url "/assets/file2.self.css?body=1"
   end
 
   def test_javascript_path
@@ -485,35 +497,35 @@ 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.self-#{@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.self-#{@foo_self_js_digest}.js?body=1"></script>\n<script src="/assets/bar.self-#{@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.self-#{@dependency_self_js_digest}.js?body=1"></script>\n<script src="/assets/file1.self-#{@file1_self_js_digest}.js?body=1"></script>\n<script src="/assets/file2.self-#{@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"
-    assert_servable_asset_url "/assets/bar-#{@bar_js_digest}.js?body=1"
-    assert_servable_asset_url "/assets/dependency-#{@dependency_js_digest}.js?body=1"
-    assert_servable_asset_url "/assets/file1-#{@file1_js_digest}.js?body=1"
-    assert_servable_asset_url "/assets/file2-#{@file2_js_digest}.js?body=1"
+    assert_servable_asset_url "/assets/foo.self-#{@foo_self_js_digest}.js?body=1"
+    assert_servable_asset_url "/assets/bar.self-#{@bar_self_js_digest}.js?body=1"
+    assert_servable_asset_url "/assets/dependency.self-#{@dependency_self_js_digest}.js?body=1"
+    assert_servable_asset_url "/assets/file1.self-#{@file1_self_js_digest}.js?body=1"
+    assert_servable_asset_url "/assets/file2.self-#{@file2_self_js_digest}.js?body=1"
   end
 
   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.self-#{@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.self-#{@foo_self_css_digest}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/bar.self-#{@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.self-#{@dependency_self_css_digest}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file1.self-#{@file1_self_css_digest}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file2.self-#{@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"
-    assert_servable_asset_url "/assets/bar-#{@bar_css_digest}.css?body=1"
-    assert_servable_asset_url "/assets/dependency-#{@dependency_css_digest}.css?body=1"
-    assert_servable_asset_url "/assets/file1-#{@file1_css_digest}.css?body=1"
-    assert_servable_asset_url "/assets/file2-#{@file2_css_digest}.css?body=1"
+    assert_servable_asset_url "/assets/foo.self-#{@foo_self_css_digest}.css?body=1"
+    assert_servable_asset_url "/assets/bar.self-#{@bar_self_css_digest}.css?body=1"
+    assert_servable_asset_url "/assets/dependency.self-#{@dependency_self_css_digest}.css?body=1"
+    assert_servable_asset_url "/assets/file1.self-#{@file1_self_css_digest}.css?body=1"
+    assert_servable_asset_url "/assets/file2.self-#{@file2_self_css_digest}.css?body=1"
   end
 
   def test_javascript_path

test/test_railtie.rb

@@ -243,7 +243,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/\.sprockets-manifest-.*\.json$}, manifest.path
     assert_match %r{test_public/assets$}, manifest.dir
   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
     assert File.exist?("#{@dir}/#{digest_path}")
   end