Skip to content

Commit

Permalink
Swtich tests to generated for #821
Browse files Browse the repository at this point in the history
  • Loading branch information
@bitwiseman
bitwiseman committed Dec 4, 2015
1 parent bc5b7b5 commit 6ea3291
Show file tree
Hide file tree
Showing 3 changed files with 249 additions and 164 deletions.
178 changes: 97 additions & 81 deletions js/test/beautify-html-tests.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,103 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
test_fragment('<html><head><meta></head><body><div><p>x</p></div></body></html>', '<html>\n<head>\n <meta>\n</head>\n<body>\n <div>\n\n <p>x\n\n </p>\n </div>\n</body>\n</html>');



// Tests for script and style types (issue 453, 821
bth(
'<script type="text/unknown"><div></div></script>',
'<script type="text/unknown">\n' +
' <div></div>\n' +
'</script>');
bth(
'<script type="text/javascript"><div></div></script>',
'<script type="text/javascript">\n' +
' < div > < /div>\n' +
'</script>');
bth(
'<script><div></div></script>',
'<script>\n' +
' < div > < /div>\n' +
'</script>');
bth(
'<script>var foo = "bar";</script>',
'<script>\n' +
' var foo = "bar";\n' +
'</script>');
bth(
'<script type="text/javascript">var foo = "bar";</script>',
'<script type="text/javascript">\n' +
' var foo = "bar";\n' +
'</script>');
bth(
'<script type="application/javascript">var foo = "bar";</script>',
'<script type="application/javascript">\n' +
' var foo = "bar";\n' +
'</script>');
bth(
'<script type="application/javascript;version=1.8">var foo = "bar";</script>',
'<script type="application/javascript;version=1.8">\n' +
' var foo = "bar";\n' +
'</script>');
bth(
'<script type="application/x-javascript">var foo = "bar";</script>',
'<script type="application/x-javascript">\n' +
' var foo = "bar";\n' +
'</script>');
bth(
'<script type="application/ecmascript">var foo = "bar";</script>',
'<script type="application/ecmascript">\n' +
' var foo = "bar";\n' +
'</script>');
bth(
'<script type="text/javascript1.5">var foo = "bar";</script>',
'<script type="text/javascript1.5">\n' +
' var foo = "bar";\n' +
'</script>');
bth(
'<script type="application/json">{"foo":"bar"}</script>',
'<script type="application/json">\n' +
' {\n' +
' "foo": "bar"\n' +
' }\n' +
'</script>');
bth(
'<script type="application/ld+json">{"foo":"bar"}</script>',
'<script type="application/ld+json">\n' +
' {\n' +
' "foo": "bar"\n' +
' }\n' +
'</script>');
bth(
'<style type="text/unknown"><tag></tag></style>',
'<style type="text/unknown">\n' +
' <tag></tag>\n' +
'</style>');
bth(
'<style type="text/css"><tag></tag></style>',
'<style type="text/css">\n' +
' <tag></tag>\n' +
'</style>');
bth(
'<style><tag></tag></style>',
'<style>\n' +
' <tag></tag>\n' +
'</style>');
bth(
'<style>.selector {font-size:12px;}</style>',
'<style>\n' +
' .selector {\n' +
' font-size: 12px;\n' +
' }\n' +
'</style>');
bth(
'<style type="text/css">.selector {font-size:12px;}</style>',
'<style type="text/css">\n' +
' .selector {\n' +
' font-size: 12px;\n' +
' }\n' +
'</style>');


// Attribute Wrap - (eof = "\n", indent_attr = " ", over80 = "\n")
opts.wrap_attributes = 'force';
test_fragment('<div attr0 attr1="123" data-attr2="hello t here">This is some text</div>', '<div attr0\n attr1="123"\n data-attr2="hello t here">This is some text</div>');
Expand Down Expand Up @@ -557,87 +654,6 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
'<div> content <img> content </div>');
bth('Text <a href="#">Link</a> Text');


// START tests for issue 453
bth('<script type="text/unknown"><div></div></script>',
'<script type="text/unknown">\n' +
' <div></div>\n' +
'</script>');
bth('<script type="text/javascript"><div></div></script>',
'<script type="text/javascript">\n' +
' < div > < /div>\n' +
'</script>');
bth('<script><div></div></script>',
'<script>\n' +
' < div > < /div>\n' +
'</script>');
bth('<script type="text/javascript">var foo = "bar";</script>',
'<script type="text/javascript">\n' +
' var foo = "bar";\n' +
'</script>');
bth('<script type="application/javascript">var foo = "bar";</script>',
'<script type="application/javascript">\n' +
' var foo = "bar";\n' +
'</script>');
bth('<script type="application/javascript;version=1.8">var foo = "bar";</script>',
'<script type="application/javascript;version=1.8">\n' +
' var foo = "bar";\n' +
'</script>');
bth('<script type="application/x-javascript">var foo = "bar";</script>',
'<script type="application/x-javascript">\n' +
' var foo = "bar";\n' +
'</script>');
bth('<script type="application/ecmascript">var foo = "bar";</script>',
'<script type="application/ecmascript">\n' +
' var foo = "bar";\n' +
'</script>');
bth('<script type="text/javascript1.5">var foo = "bar";</script>',
'<script type="text/javascript1.5">\n' +
' var foo = "bar";\n' +
'</script>');
bth('<script>var foo = "bar";</script>',
'<script>\n' +
' var foo = "bar";\n' +
'</script>');
bth('<script type="application/json">{"foo":"bar"}</script>',
'<script type="application/json">\n' +
' {\n' +
' "foo": "bar"\n' +
' }\n' +
'</script>');
bth('<script type="application/ld+json">{"foo":"bar"}</script>',
'<script type="application/ld+json">\n' +
' {\n' +
' "foo": "bar"\n' +
' }\n' +
'</script>');

bth('<style type="text/unknown"><tag></tag></style>',
'<style type="text/unknown">\n' +
' <tag></tag>\n' +
'</style>');
bth('<style type="text/css"><tag></tag></style>',
'<style type="text/css">\n' +
' <tag></tag>\n' +
'</style>');
bth('<style><tag></tag></style>',
'<style>\n' +
' <tag></tag>\n' +
'</style>');
bth('<style type="text/css">.selector {font-size:12px;}</style>',
'<style type="text/css">\n' +
' .selector {\n' +
' font-size: 12px;\n' +
' }\n'+
'</style>');
bth('<style>.selector {font-size:12px;}</style>',
'<style>\n' +
' .selector {\n' +
' font-size: 12px;\n' +
' }\n'+
'</style>');
// END tests for issue 453

var unformatted = opts.unformatted;
opts.unformatted = ['script', 'style'];
bth('<script id="javascriptTemplate" type="text/x-kendo-template">\n' +
Expand Down
154 changes: 152 additions & 2 deletions test/data/html.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,156 @@ exports.test_data = {
output: '<html>\n<head>\n <meta>\n</head>\n<body>\n <div>\n\n <p>x\n\n </p>\n </div>\n</body>\n</html>'
}
],
}, {
name: "Tests for script and style types (issue 453, 821",
description: "Only format recognized script types",
tests: [
{
input: '<script type="text/unknown"><div></div></script>',
output: [
'<script type="text/unknown">',
' <div></div>',
'</script>'
]
},
{
input: '<script type="text/javascript"><div></div></script>',
output: [
'<script type="text/javascript">',
' < div > < /div>',
'</script>'
]
},
{
input: '<script><div></div></script>',
output: [
'<script>',
' < div > < /div>',
'</script>'
]
},
{
input: '<script>var foo = "bar";</script>',
output: [
'<script>',
' var foo = "bar";',
'</script>'
]
},
{
input: '<script type="text/javascript">var foo = "bar";</script>',
output: [
'<script type="text/javascript">',
' var foo = "bar";',
'</script>'
]
},
{
input: '<script type="application/javascript">var foo = "bar";</script>',
output: [
'<script type="application/javascript">',
' var foo = "bar";',
'</script>'
]
},
{
input: '<script type="application/javascript;version=1.8">var foo = "bar";</script>',
output: [
'<script type="application/javascript;version=1.8">',
' var foo = "bar";',
'</script>'
]
},
{
input: '<script type="application/x-javascript">var foo = "bar";</script>',
output: [
'<script type="application/x-javascript">',
' var foo = "bar";',
'</script>'
]
},
{
input: '<script type="application/ecmascript">var foo = "bar";</script>',
output: [
'<script type="application/ecmascript">',
' var foo = "bar";',
'</script>'
]
},
{
input: '<script type="text/javascript1.5">var foo = "bar";</script>',
output: [
'<script type="text/javascript1.5">',
' var foo = "bar";',
'</script>'
]
},
{
input: '<script type="application/json">{"foo":"bar"}</script>',
output: [
'<script type="application/json">',
' {',
' "foo": "bar"',
' }',
'</script>'
]
},
{
input: '<script type="application/ld+json">{"foo":"bar"}</script>',
output: [
'<script type="application/ld+json">',
' {',
' "foo": "bar"',
' }',
'</script>'
]
},
{
input: '<style type="text/unknown"><tag></tag></style>',
output: [
'<style type="text/unknown">',
' <tag></tag>',
'</style>'
]
},
{
input: '<style type="text/css"><tag></tag></style>',
output: [
'<style type="text/css">',
' <tag></tag>',
'</style>'
]
},
{
input: '<style><tag></tag></style>',
output: [
'<style>',
' <tag></tag>',
'</style>'
]
},
{
input: '<style>.selector {font-size:12px;}</style>',
output: [
'<style>',
' .selector {',
' font-size: 12px;',
' }',
'</style>'
]
},
{
input: '<style type="text/css">.selector {font-size:12px;}</style>',
output: [
'<style type="text/css">',
' .selector {',
' font-size: 12px;',
' }',
'</style>'
]
},

],
}, {
name: "Attribute Wrap",
description: "Wraps attributes inside of html tags",
Expand Down Expand Up @@ -380,8 +530,8 @@ exports.test_data = {
name: "Handlebars Else tag indenting",
description: "Handlebar Else tags should be newlined after formatted tags",
template: "^^^ $$$",
options: [
{name: "indent_handlebars", value: "true"}
options: [
{name: "indent_handlebars", value: "true"}
],
tests: [
{ fragment: true,
Expand Down
Loading

0 comments on commit 6ea3291

Please sign in to comment.