From 21a8b1dd0695e89f34e1f612c4ebfed4ac1bd893 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 25 Jun 2017 12:57:27 -0400 Subject: [PATCH] fix tests --- test/css/samples/basic/expected.css | 2 +- .../cascade-false-global-keyframes/_config.js | 3 +++ .../expected.css | 4 ++-- .../cascade-false-keyframes/_config.js | 3 +++ .../cascade-false-keyframes/expected.css | 8 +++---- .../cascade-false-pseudo-element/expected.css | 6 +++--- test/css/samples/cascade-false/expected.css | 6 +++--- test/css/samples/keyframes/expected.css | 6 +++--- test/css/samples/media-query/expected.css | 2 +- .../expected-bundle.js | 8 +++---- .../expected.js | 8 +++---- .../samples/styles-nested/_actual.css | 6 +++--- .../samples/styles-nested/_actual.html | 10 ++++----- .../samples/styles-nested/_expected.css | 21 +++++++++++-------- .../samples/styles-nested/_expected.html | 10 ++++----- .../samples/styles/_actual.css | 2 +- .../samples/styles/_actual.html | 2 +- .../samples/styles/_expected.css | 7 ++++--- .../samples/styles/_expected.html | 2 +- 19 files changed, 63 insertions(+), 53 deletions(-) create mode 100644 test/css/samples/cascade-false-global-keyframes/_config.js create mode 100644 test/css/samples/cascade-false-keyframes/_config.js diff --git a/test/css/samples/basic/expected.css b/test/css/samples/basic/expected.css index ee9575d9a8..0d52d6d95f 100644 --- a/test/css/samples/basic/expected.css +++ b/test/css/samples/basic/expected.css @@ -1,4 +1,4 @@ - div[svelte-281576708], [svelte-281576708] div { + div[svelte-2278551596], [svelte-2278551596] div { color: red; } diff --git a/test/css/samples/cascade-false-global-keyframes/_config.js b/test/css/samples/cascade-false-global-keyframes/_config.js new file mode 100644 index 0000000000..b37866f9b6 --- /dev/null +++ b/test/css/samples/cascade-false-global-keyframes/_config.js @@ -0,0 +1,3 @@ +export default { + cascade: false +}; \ No newline at end of file diff --git a/test/css/samples/cascade-false-global-keyframes/expected.css b/test/css/samples/cascade-false-global-keyframes/expected.css index b13c5736be..042db53426 100644 --- a/test/css/samples/cascade-false-global-keyframes/expected.css +++ b/test/css/samples/cascade-false-global-keyframes/expected.css @@ -4,10 +4,10 @@ 100% { color: blue; } } - [svelte-2486527405].animated, [svelte-2486527405] .animated { + .animated[svelte-90785995] { animation: why 2s; } - [svelte-2486527405].also-animated, [svelte-2486527405] .also-animated { + .also-animated[svelte-90785995] { animation: not-defined-here 2s; } diff --git a/test/css/samples/cascade-false-keyframes/_config.js b/test/css/samples/cascade-false-keyframes/_config.js new file mode 100644 index 0000000000..b37866f9b6 --- /dev/null +++ b/test/css/samples/cascade-false-keyframes/_config.js @@ -0,0 +1,3 @@ +export default { + cascade: false +}; \ No newline at end of file diff --git a/test/css/samples/cascade-false-keyframes/expected.css b/test/css/samples/cascade-false-keyframes/expected.css index cf1d171417..5377c86da7 100644 --- a/test/css/samples/cascade-false-keyframes/expected.css +++ b/test/css/samples/cascade-false-keyframes/expected.css @@ -1,13 +1,13 @@ - @keyframes svelte-776829126-why { + @keyframes svelte-1647166666-why { 0% { color: red; } 100% { color: blue; } } - [svelte-776829126].animated, [svelte-776829126] .animated { - animation: svelte-776829126-why 2s; + .animated[svelte-1647166666] { + animation: svelte-1647166666-why 2s; } - [svelte-776829126].also-animated, [svelte-776829126] .also-animated { + .also-animated[svelte-1647166666] { animation: not-defined-here 2s; } diff --git a/test/css/samples/cascade-false-pseudo-element/expected.css b/test/css/samples/cascade-false-pseudo-element/expected.css index e2a4397f38..3488839c46 100644 --- a/test/css/samples/cascade-false-pseudo-element/expected.css +++ b/test/css/samples/cascade-false-pseudo-element/expected.css @@ -1,12 +1,12 @@ - span[svelte-583610229]::after { + span[svelte-2146001331]::after { content: 'i am a pseudo-element'; } - span[svelte-583610229]:first-child { + span[svelte-2146001331]:first-child { color: red; } - span[svelte-583610229]:last-child::after { + span[svelte-2146001331]:last-child::after { color: blue; } diff --git a/test/css/samples/cascade-false/expected.css b/test/css/samples/cascade-false/expected.css index 0a9cb4502e..373c5aefed 100644 --- a/test/css/samples/cascade-false/expected.css +++ b/test/css/samples/cascade-false/expected.css @@ -1,12 +1,12 @@ - div[svelte-4161687011] { + div[svelte-781920915] { color: red; } - div.foo[svelte-4161687011] { + div.foo[svelte-781920915] { color: blue; } - .foo[svelte-4161687011] { + .foo[svelte-781920915] { font-weight: bold; } diff --git a/test/css/samples/keyframes/expected.css b/test/css/samples/keyframes/expected.css index defe2a4d62..c7d8540bdd 100644 --- a/test/css/samples/keyframes/expected.css +++ b/test/css/samples/keyframes/expected.css @@ -1,9 +1,9 @@ - @keyframes svelte-4112859982-why { + @keyframes svelte-2931302006-why { 0% { color: red; } 100% { color: blue; } } - [svelte-4112859982].animated, [svelte-4112859982] .animated { - animation: svelte-4112859982-why 2s; + [svelte-2931302006].animated, [svelte-2931302006] .animated { + animation: svelte-2931302006-why 2s; } diff --git a/test/css/samples/media-query/expected.css b/test/css/samples/media-query/expected.css index 2dd35dbb7c..cecc50d860 100644 --- a/test/css/samples/media-query/expected.css +++ b/test/css/samples/media-query/expected.css @@ -1,6 +1,6 @@ @media (min-width: 400px) { - [svelte-2352010302].large-screen, [svelte-2352010302] .large-screen { + [svelte-411199634].large-screen, [svelte-411199634] .large-screen { display: block; } } diff --git a/test/js/samples/collapses-text-around-comments/expected-bundle.js b/test/js/samples/collapses-text-around-comments/expected-bundle.js index 35aa419e8b..6426aa9a7d 100644 --- a/test/js/samples/collapses-text-around-comments/expected-bundle.js +++ b/test/js/samples/collapses-text-around-comments/expected-bundle.js @@ -145,8 +145,8 @@ var template = (function () { function add_css () { var style = createElement( 'style' ); - style.id = "svelte-3842350206-style"; - style.textContent = "\n\tp[svelte-3842350206], [svelte-3842350206] p {\n\t\tcolor: red;\n\t}\n"; + style.id = "svelte-3590263702-style"; + style.textContent = "\n\tp[svelte-3590263702], [svelte-3590263702] p {\n\t\tcolor: red;\n\t}\n"; appendNode( style, document.head ); } @@ -161,7 +161,7 @@ function create_main_fragment ( state, component ) { }, hydrate: function ( nodes ) { - setAttribute( p, 'svelte-3842350206', '' ); + setAttribute( p, 'svelte-3590263702', '' ); }, mount: function ( target, anchor ) { @@ -198,7 +198,7 @@ function SvelteComponent ( options ) { this._yield = options._yield; this._torndown = false; - if ( !document.getElementById( "svelte-3842350206-style" ) ) add_css(); + if ( !document.getElementById( "svelte-3590263702-style" ) ) add_css(); this._fragment = create_main_fragment( this._state, this ); diff --git a/test/js/samples/collapses-text-around-comments/expected.js b/test/js/samples/collapses-text-around-comments/expected.js index d3a818a9d0..23eaefed81 100644 --- a/test/js/samples/collapses-text-around-comments/expected.js +++ b/test/js/samples/collapses-text-around-comments/expected.js @@ -10,8 +10,8 @@ var template = (function () { function add_css () { var style = createElement( 'style' ); - style.id = "svelte-3842350206-style"; - style.textContent = "\n\tp[svelte-3842350206], [svelte-3842350206] p {\n\t\tcolor: red;\n\t}\n"; + style.id = "svelte-3590263702-style"; + style.textContent = "\n\tp[svelte-3590263702], [svelte-3590263702] p {\n\t\tcolor: red;\n\t}\n"; appendNode( style, document.head ); } @@ -26,7 +26,7 @@ function create_main_fragment ( state, component ) { }, hydrate: function ( nodes ) { - setAttribute( p, 'svelte-3842350206', '' ); + setAttribute( p, 'svelte-3590263702', '' ); }, mount: function ( target, anchor ) { @@ -63,7 +63,7 @@ function SvelteComponent ( options ) { this._yield = options._yield; this._torndown = false; - if ( !document.getElementById( "svelte-3842350206-style" ) ) add_css(); + if ( !document.getElementById( "svelte-3590263702-style" ) ) add_css(); this._fragment = create_main_fragment( this._state, this ); diff --git a/test/server-side-rendering/samples/styles-nested/_actual.css b/test/server-side-rendering/samples/styles-nested/_actual.css index b8796d3a0e..37d529499e 100644 --- a/test/server-side-rendering/samples/styles-nested/_actual.css +++ b/test/server-side-rendering/samples/styles-nested/_actual.css @@ -1,14 +1,14 @@ - div[svelte-4188175681], [svelte-4188175681] div { + div[svelte-1408461649], [svelte-1408461649] div { color: red; } - div[svelte-146600313], [svelte-146600313] div { + div[svelte-54999591], [svelte-54999591] div { color: green; } - div[svelte-1506185237], [svelte-1506185237] div { + div[svelte-2385185803], [svelte-2385185803] div { color: blue; } diff --git a/test/server-side-rendering/samples/styles-nested/_actual.html b/test/server-side-rendering/samples/styles-nested/_actual.html index 4b5e1430c8..5164539855 100644 --- a/test/server-side-rendering/samples/styles-nested/_actual.html +++ b/test/server-side-rendering/samples/styles-nested/_actual.html @@ -1,5 +1,5 @@ -
red
-
green: foo
-
blue: foo
-
green: bar
-
blue: bar
\ No newline at end of file +
red
+
green: foo
+
blue: foo
+
green: bar
+
blue: bar
\ No newline at end of file diff --git a/test/server-side-rendering/samples/styles-nested/_expected.css b/test/server-side-rendering/samples/styles-nested/_expected.css index d837c4e221..37d529499e 100644 --- a/test/server-side-rendering/samples/styles-nested/_expected.css +++ b/test/server-side-rendering/samples/styles-nested/_expected.css @@ -1,11 +1,14 @@ -div[svelte-4188175681], [svelte-4188175681] div { - color: red; -} -div[svelte-146600313], [svelte-146600313] div { - color: green; -} + div[svelte-1408461649], [svelte-1408461649] div { + color: red; + } -div[svelte-1506185237], [svelte-1506185237] div { - color: blue; -} + + div[svelte-54999591], [svelte-54999591] div { + color: green; + } + + + div[svelte-2385185803], [svelte-2385185803] div { + color: blue; + } diff --git a/test/server-side-rendering/samples/styles-nested/_expected.html b/test/server-side-rendering/samples/styles-nested/_expected.html index a8d6d4f5d8..5164539855 100644 --- a/test/server-side-rendering/samples/styles-nested/_expected.html +++ b/test/server-side-rendering/samples/styles-nested/_expected.html @@ -1,5 +1,5 @@ -
red
-
green: foo
-
blue: foo
-
green: bar
-
blue: bar
+
red
+
green: foo
+
blue: foo
+
green: bar
+
blue: bar
\ No newline at end of file diff --git a/test/server-side-rendering/samples/styles/_actual.css b/test/server-side-rendering/samples/styles/_actual.css index ee9575d9a8..0d52d6d95f 100644 --- a/test/server-side-rendering/samples/styles/_actual.css +++ b/test/server-side-rendering/samples/styles/_actual.css @@ -1,4 +1,4 @@ - div[svelte-281576708], [svelte-281576708] div { + div[svelte-2278551596], [svelte-2278551596] div { color: red; } diff --git a/test/server-side-rendering/samples/styles/_actual.html b/test/server-side-rendering/samples/styles/_actual.html index 9752d45d81..e0ab016f48 100644 --- a/test/server-side-rendering/samples/styles/_actual.html +++ b/test/server-side-rendering/samples/styles/_actual.html @@ -1 +1 @@ -
red
\ No newline at end of file +
red
\ No newline at end of file diff --git a/test/server-side-rendering/samples/styles/_expected.css b/test/server-side-rendering/samples/styles/_expected.css index e26c4b8a4e..0d52d6d95f 100644 --- a/test/server-side-rendering/samples/styles/_expected.css +++ b/test/server-side-rendering/samples/styles/_expected.css @@ -1,3 +1,4 @@ -div[svelte-281576708], [svelte-281576708] div { - color: red; -} + + div[svelte-2278551596], [svelte-2278551596] div { + color: red; + } diff --git a/test/server-side-rendering/samples/styles/_expected.html b/test/server-side-rendering/samples/styles/_expected.html index afb992c94a..e0ab016f48 100644 --- a/test/server-side-rendering/samples/styles/_expected.html +++ b/test/server-side-rendering/samples/styles/_expected.html @@ -1 +1 @@ -
red
+
red
\ No newline at end of file