diff options
| author | Artur Signell <artur@vaadin.com> | 2013-10-15 21:49:25 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-10-16 09:30:21 +0000 |
| commit | 7c12694e047c42bf5f2ab189512e3346541e9c51 (patch) | |
| tree | 03e0cfb6f2dbfc1572abc4fc755522406758cc80 /theme-compiler/tests/resources/automatic | |
| parent | e70ba25c2d1a43dccd43e6ece8f7c126355332c0 (diff) | |
| download | vaadin-framework-7c12694e047c42bf5f2ab189512e3346541e9c51.tar.gz vaadin-framework-7c12694e047c42bf5f2ab189512e3346541e9c51.zip | |
Add sub directory support to sass test scanner (#12790)
Exclude partial scss files (starting with _)
Add new lines to normalized css for easier comparison
Change-Id: I2bfb796b293cb0b578c3c5c56aacffe7c1514b02
Diffstat (limited to 'theme-compiler/tests/resources/automatic')
| -rw-r--r-- | theme-compiler/tests/resources/automatic/scss/foo/_bar.scss (renamed from theme-compiler/tests/resources/automatic/scss/foo/bar.scss) | 0 | ||||
| -rw-r--r-- | theme-compiler/tests/resources/automatic/scss/import-file-which-contains-comment-in-last-line.scss | 2 | ||||
| -rw-r--r-- | theme-compiler/tests/resources/automatic/scss/nested-import.scss | 2 | ||||
| -rw-r--r-- | theme-compiler/tests/resources/automatic/scss/to-be-imported/_imported-file-contains-comments-in-last-line.scss (renamed from theme-compiler/tests/resources/automatic/scss/to-be-imported/imported-file-contains-comments-in-last-line.scss) | 0 | ||||
| -rw-r--r-- | theme-compiler/tests/resources/automatic/scss/url-path.scss | 2 | ||||
| -rw-r--r-- | theme-compiler/tests/resources/automatic/scss/utf8-imported/_to-be-imported-scss-file-contains-utf8.scss (renamed from theme-compiler/tests/resources/automatic/scss/utf8-imported/to-be-imported-scss-file-contains-utf8.scss) | 0 | ||||
| -rw-r--r-- | theme-compiler/tests/resources/automatic/scss/utf8.scss | 2 |
7 files changed, 4 insertions, 4 deletions
diff --git a/theme-compiler/tests/resources/automatic/scss/foo/bar.scss b/theme-compiler/tests/resources/automatic/scss/foo/_bar.scss index 326d34232d..326d34232d 100644 --- a/theme-compiler/tests/resources/automatic/scss/foo/bar.scss +++ b/theme-compiler/tests/resources/automatic/scss/foo/_bar.scss diff --git a/theme-compiler/tests/resources/automatic/scss/import-file-which-contains-comment-in-last-line.scss b/theme-compiler/tests/resources/automatic/scss/import-file-which-contains-comment-in-last-line.scss index 41adc908ed..8292d4efe3 100644 --- a/theme-compiler/tests/resources/automatic/scss/import-file-which-contains-comment-in-last-line.scss +++ b/theme-compiler/tests/resources/automatic/scss/import-file-which-contains-comment-in-last-line.scss @@ -1,4 +1,4 @@ -@import "to-be-imported/imported-file-contains-comments-in-last-line.scss"; +@import "to-be-imported/_imported-file-contains-comments-in-last-line.scss"; .foo{ foo: $foo; }
\ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/scss/nested-import.scss b/theme-compiler/tests/resources/automatic/scss/nested-import.scss index 605d64a13a..df720a5584 100644 --- a/theme-compiler/tests/resources/automatic/scss/nested-import.scss +++ b/theme-compiler/tests/resources/automatic/scss/nested-import.scss @@ -1,3 +1,3 @@ .foo { - @import "foo/bar.scss"; + @import "foo/_bar.scss"; }
\ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/scss/to-be-imported/imported-file-contains-comments-in-last-line.scss b/theme-compiler/tests/resources/automatic/scss/to-be-imported/_imported-file-contains-comments-in-last-line.scss index 16244f2bfd..16244f2bfd 100644 --- a/theme-compiler/tests/resources/automatic/scss/to-be-imported/imported-file-contains-comments-in-last-line.scss +++ b/theme-compiler/tests/resources/automatic/scss/to-be-imported/_imported-file-contains-comments-in-last-line.scss diff --git a/theme-compiler/tests/resources/automatic/scss/url-path.scss b/theme-compiler/tests/resources/automatic/scss/url-path.scss index 0cc954bfb4..6903d389b5 100644 --- a/theme-compiler/tests/resources/automatic/scss/url-path.scss +++ b/theme-compiler/tests/resources/automatic/scss/url-path.scss @@ -1 +1 @@ -@import "foo/bar.scss";
\ No newline at end of file +@import "foo/_bar.scss";
\ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/scss/utf8-imported/to-be-imported-scss-file-contains-utf8.scss b/theme-compiler/tests/resources/automatic/scss/utf8-imported/_to-be-imported-scss-file-contains-utf8.scss index f8a08a4a96..f8a08a4a96 100644 --- a/theme-compiler/tests/resources/automatic/scss/utf8-imported/to-be-imported-scss-file-contains-utf8.scss +++ b/theme-compiler/tests/resources/automatic/scss/utf8-imported/_to-be-imported-scss-file-contains-utf8.scss diff --git a/theme-compiler/tests/resources/automatic/scss/utf8.scss b/theme-compiler/tests/resources/automatic/scss/utf8.scss index b568674073..251d6e6513 100644 --- a/theme-compiler/tests/resources/automatic/scss/utf8.scss +++ b/theme-compiler/tests/resources/automatic/scss/utf8.scss @@ -1,4 +1,4 @@ @charset "UTF-8"; -@import "utf8-imported/to-be-imported-scss-file-contains-utf8"; +@import "utf8-imported/_to-be-imported-scss-file-contains-utf8"; .bar {content: "\1f4c5";} .raw_utf {content: "📈";}
\ No newline at end of file |