Skip to content

Commit caf1c68

Browse files
committed
removing buggy mustache tests.
1 parent aaaceb7 commit caf1c68

6 files changed

Lines changed: 0 additions & 52 deletions

File tree

test/config/assets.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,9 @@ javascripts:
1111
- fixtures/src/nested/*.js
1212
jst_test: &jst_test
1313
- fixtures/src/*.jst
14-
jst_test_diff_ext: &jst_test_diff_ext
15-
- fixtures/src/*.html.mustache
1614
jst_test_nested:
1715
- *jst_test
1816
- fixtures/src/nested/**/*.jst
19-
jst_test_diff_ext_and_nested:
20-
- *jst_test_diff_ext
21-
- fixtures/src/nested/**/*.html.mustache
2217

2318
stylesheets:
2419
css_test: &css_test

test/fixtures/src/template3.html.mustache

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/test_helper.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ class Test::Unit::TestCase
4040
test/precache/js_test_with_templates.js.gz
4141
test/precache/jst_test.js
4242
test/precache/jst_test.js.gz
43-
test/precache/jst_test_diff_ext.js
44-
test/precache/jst_test_diff_ext.js.gz
45-
test/precache/jst_test_diff_ext_and_nested.js
46-
test/precache/jst_test_diff_ext_and_nested.js.gz
4743
test/precache/jst_test_nested.js
4844
test/precache/jst_test_nested.js.gz
4945
)

test/unit/test_jammit_controller.rb

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -41,29 +41,4 @@ def test_package_with_jst_mixed
4141
assert @response.body == File.read("#{ASSET_ROOT}/fixtures/jammed/jst_test.js")
4242
end
4343

44-
def test_route_with_jst_diff_ext
45-
assert_generates('/assets/test.html.mustache', {
46-
:controller => 'jammit',
47-
:action => 'package',
48-
:package => 'test',
49-
:extension => 'html.mustache'
50-
})
51-
assert_recognizes({
52-
:controller => 'jammit',
53-
:action => 'package',
54-
:package => 'test',
55-
:extension => 'html.mustache'
56-
}, '/assets/test.html.mustache')
57-
end
58-
59-
def test_package_with_jst_diff_ext
60-
Jammit.reload!
61-
Jammit.set_template_extension('html.mustache')
62-
get(:package, :package => 'jst_test_diff_ext', :extension => 'html.mustache')
63-
assert @response.headers['Content-Type'] =~ /text\/javascript/
64-
assert @response.body == File.read("#{ASSET_ROOT}/fixtures/jammed/jst_test_diff_ext.js")
65-
ensure
66-
Jammit.reload!
67-
end
68-
6944
end

test/unit/test_jammit_helpers.rb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@ def test_individual_assets_in_development
5959
Jammit.instance_variable_set(:@package_assets, false)
6060
assert include_stylesheets(:css_test) == File.read('test/fixtures/tags/css_individual_includes.html')
6161
assert include_javascripts(:js_test_with_templates) == File.read('test/fixtures/tags/js_individual_includes.html')
62-
# Test to make sure different extensions don't change things.
63-
Jammit.reload!
64-
Jammit.instance_variable_set(:@package_assets, false)
65-
Jammit.set_template_extension('html.mustache')
66-
assert include_javascripts(:jst_test_diff_ext) == '<script src="/assets/jst_test_diff_ext.html.mustache?101" type="text/javascript"></script>'
6762
ensure
6863
Jammit.reload!
6964
end

test/unit/test_packager.rb

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,6 @@ def test_packaging_templates_nested
6868
assert jst == File.read('test/fixtures/jammed/jst_test_nested.js')
6969
end
7070

71-
def test_packaging_templates_with_different_extensions
72-
Jammit.set_template_extension('html.mustache')
73-
jst = Jammit.packager.pack_templates(:jst_test_diff_ext)
74-
assert jst == File.read('test/fixtures/jammed/jst_test_diff_ext.js')
75-
end
76-
77-
def test_packaging_templates_with_different_extensions_nested
78-
Jammit.set_template_extension('html.mustache')
79-
jst = Jammit.packager.pack_templates(:jst_test_diff_ext_and_nested)
80-
assert jst == File.read('test/fixtures/jammed/jst_test_diff_ext_and_nested.js')
81-
end
82-
8371
def test_package_caching
8472
css = Jammit.packager.pack_stylesheets(:css_test, :mhtml, 'http://www.example.com')
8573
mtime = Time.now

0 commit comments

Comments
 (0)