From 7c12694e047c42bf5f2ab189512e3346541e9c51 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Tue, 15 Oct 2013 21:49:25 +0300
Subject: 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
---
 theme-compiler/tests/resources/automatic/scss/foo/_bar.scss          | 5 +++++
 theme-compiler/tests/resources/automatic/scss/foo/bar.scss           | 5 -----
 .../scss/import-file-which-contains-comment-in-last-line.scss        | 2 +-
 theme-compiler/tests/resources/automatic/scss/nested-import.scss     | 2 +-
 .../_imported-file-contains-comments-in-last-line.scss               | 2 ++
 .../to-be-imported/imported-file-contains-comments-in-last-line.scss | 2 --
 theme-compiler/tests/resources/automatic/scss/url-path.scss          | 2 +-
 .../scss/utf8-imported/_to-be-imported-scss-file-contains-utf8.scss  | 3 +++
 .../scss/utf8-imported/to-be-imported-scss-file-contains-utf8.scss   | 3 ---
 theme-compiler/tests/resources/automatic/scss/utf8.scss              | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 theme-compiler/tests/resources/automatic/scss/foo/_bar.scss
 delete mode 100644 theme-compiler/tests/resources/automatic/scss/foo/bar.scss
 create mode 100644 theme-compiler/tests/resources/automatic/scss/to-be-imported/_imported-file-contains-comments-in-last-line.scss
 delete mode 100644 theme-compiler/tests/resources/automatic/scss/to-be-imported/imported-file-contains-comments-in-last-line.scss
 create mode 100644 theme-compiler/tests/resources/automatic/scss/utf8-imported/_to-be-imported-scss-file-contains-utf8.scss
 delete mode 100644 theme-compiler/tests/resources/automatic/scss/utf8-imported/to-be-imported-scss-file-contains-utf8.scss

(limited to 'theme-compiler/tests/resources/automatic')

diff --git a/theme-compiler/tests/resources/automatic/scss/foo/_bar.scss b/theme-compiler/tests/resources/automatic/scss/foo/_bar.scss
new file mode 100644
index 0000000000..326d34232d
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/scss/foo/_bar.scss
@@ -0,0 +1,5 @@
+.bar {
+   background: url("lorem.png");
+   background: url('lorem.png');
+   background: url(lorem.png);
+}
\ No newline at end of file
diff --git a/theme-compiler/tests/resources/automatic/scss/foo/bar.scss b/theme-compiler/tests/resources/automatic/scss/foo/bar.scss
deleted file mode 100644
index 326d34232d..0000000000
--- a/theme-compiler/tests/resources/automatic/scss/foo/bar.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.bar {
-   background: url("lorem.png");
-   background: url('lorem.png');
-   background: url(lorem.png);
-}
\ No newline at end of file
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
new file mode 100644
index 0000000000..16244f2bfd
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/scss/to-be-imported/_imported-file-contains-comments-in-last-line.scss
@@ -0,0 +1,2 @@
+$foo: bar;
+// This will cause an error
\ 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
deleted file mode 100644
index 16244f2bfd..0000000000
--- a/theme-compiler/tests/resources/automatic/scss/to-be-imported/imported-file-contains-comments-in-last-line.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-$foo: bar;
-// This will cause an error
\ No newline at end of file
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
new file mode 100644
index 0000000000..f8a08a4a96
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/scss/utf8-imported/_to-be-imported-scss-file-contains-utf8.scss
@@ -0,0 +1,3 @@
+@charset "abc";
+.imported{content: '\1f4c5';}
+.imported_raw_utf{content: "♥";}
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
deleted file mode 100644
index f8a08a4a96..0000000000
--- a/theme-compiler/tests/resources/automatic/scss/utf8-imported/to-be-imported-scss-file-contains-utf8.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@charset "abc";
-.imported{content: '\1f4c5';}
-.imported_raw_utf{content: "♥";}
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
-- 
cgit v1.2.3