Clean up test folder structure

diff --git a/.travis.yml b/.travis.yml
index 8b201c695c8d9b99bd4fde14f493bb13967e3816..f246e6d78010d6ade8067f3c338f2058f09f6392 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,18 @@ matrix:
       before_install:
         - gem install sass
       script:
-        - test/ruby-sass.sh
+        - test/ruby-sass/ruby-sass.sh
     - language: node_js
       node_js:
         - node
       before_script:
         - npm install sass
       script:
-        - node test/dart-sass.js
+        - node test/dart-sass/dart-sass.js
+    - language: node_js
+      node_js:
+        - node
+      before_script:
+        - npm install node-sass
+      script:
+        - node test/node-sass/node-sass.js

diff --git a/test/.gitignore b/test/.gitignore
index e525c6e6e6cd07bcb36f659d34c46f019d0f2818..a89c9e99a7c0e447136b5ee77d193bab94479f7f 100644 (file)
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,2 +1,2 @@
-/build
+**/build
 /css

diff --git a/test/dart-sass.js b/test/dart-sass/dart-sass.js
similarity index 90%
rename from test/dart-sass.js
rename to test/dart-sass/dart-sass.js
index 7e987c773de8ef9c531b5c4d95f047c7b7c9d02b..b904c5f527e010d4cf456e83e56da0ac025076a7 100644 (file)
--- a/test/dart-sass.js
+++ b/test/dart-sass/dart-sass.js
@@ -1,9 +1,9 @@
 const fs = require('fs');
 const path = require('path');
 const sass = require('sass');
-const utils = require('./utils');
+const utils = require('../utils');
 
-const DART_BASE_PATH = 'test/build/dart-sass/';
+const DART_BASE_PATH = 'test/dart-sass/build/';
 
 fs.mkdir(DART_BASE_PATH, { recursive: true }, (err) => {
   if (err) throw err;

diff --git a/test/node-sass.js b/test/node-sass/node-sass.js
similarity index 90%
rename from test/node-sass.js
rename to test/node-sass/node-sass.js
index cf1c062ef7d17dd56ca867375b7c6b820413438d..7f53839ebf9a2b20f3a0a786376f2cce1a8de20f 100644 (file)
--- a/test/node-sass.js
+++ b/test/node-sass/node-sass.js
@@ -1,9 +1,9 @@
 const fs = require('fs');
 const path = require('path');
 const sass = require('node-sass');
-const utils = require('./utils');
+const utils = require('../utils');
 
-const NODE_SASS_BASE_PATH = 'test/build/node-sass/';
+const NODE_SASS_BASE_PATH = 'test/node-sass/build/';
 
 fs.mkdir(NODE_SASS_BASE_PATH, { recursive: true }, (err) => {
   if (err) throw err;

diff --git a/test/keywords.txt b/test/ruby-sass/keywords.txt
similarity index 100%
rename from test/keywords.txt
rename to test/ruby-sass/keywords.txt

diff --git a/test/keywords/bulma.css.txt b/test/ruby-sass/keywords/bulma.css.txt
similarity index 100%
rename from test/keywords/bulma.css.txt
rename to test/ruby-sass/keywords/bulma.css.txt

diff --git a/test/keywords/css-variable.css.txt b/test/ruby-sass/keywords/css-variable.css.txt
similarity index 100%
rename from test/keywords/css-variable.css.txt
rename to test/ruby-sass/keywords/css-variable.css.txt

diff --git a/test/keywords/customize.css.txt b/test/ruby-sass/keywords/customize.css.txt
similarity index 100%
rename from test/keywords/customize.css.txt
rename to test/ruby-sass/keywords/customize.css.txt

diff --git a/test/keywords/only-base.css.txt b/test/ruby-sass/keywords/only-base.css.txt
similarity index 100%
rename from test/keywords/only-base.css.txt
rename to test/ruby-sass/keywords/only-base.css.txt

diff --git a/test/keywords/override.css.txt b/test/ruby-sass/keywords/override.css.txt
similarity index 100%
rename from test/keywords/override.css.txt
rename to test/ruby-sass/keywords/override.css.txt

diff --git a/test/ruby-sass.sh b/test/ruby-sass/ruby-sass.sh
similarity index 92%
rename from test/ruby-sass.sh
rename to test/ruby-sass/ruby-sass.sh
index a2e783b9a599bf5bb4f0d1db594ee675a51dc44d..f50e2d1d445730d08fc27f49f2156d1aecee3675 100755 (executable)
--- a/test/ruby-sass.sh
+++ b/test/ruby-sass/ruby-sass.sh
@@ -4,8 +4,8 @@
 
 TEST_DIR=$(dirname $BASH_SOURCE)
 FILES=$TEST_DIR/sass/*
-CSS_DIR=$TEST_DIR/build/ruby-sass
-CSS_FILES=$TEST_DIR/build/ruby-sass/*.css
+CSS_DIR=$TEST_DIR/build
+CSS_FILES=$TEST_DIR/build/*.css
 SASS_OPTIONS=--sourcemap=none
 
 # FUNCTIONS

diff --git a/test/ruby-sass/sass/bulma.sass b/test/ruby-sass/sass/bulma.sass
new file mode 100644 (file)
index 0000000..37efd26
--- /dev/null
+++ b/test/ruby-sass/sass/bulma.sass
@@ -0,0 +1,2 @@
+@charset "utf-8"
+@import "../../../bulma"

diff --git a/test/sass/css-variable.sass b/test/ruby-sass/sass/css-variable.sass
similarity index 65%
rename from test/sass/css-variable.sass
rename to test/ruby-sass/sass/css-variable.sass
index 43f9504498277c5fda46579a09d03cbd7c91b97c..faf6304dc0cc59c76dd385530497ae7fe99be281 100644 (file)
--- a/test/sass/css-variable.sass
+++ b/test/ruby-sass/sass/css-variable.sass
@@ -1,4 +1,4 @@
 @charset "utf-8"
 $red: #f60
 $blue: var(--blue)
-@import "../../bulma"
+@import "../../../bulma"

diff --git a/test/sass/customize.scss b/test/ruby-sass/sass/customize.scss
similarity index 62%
rename from test/sass/customize.scss
rename to test/ruby-sass/sass/customize.scss
index 716079af26afe1bcaad5c6cfb6349faf5ddcf53d..bb4047d670ad4f416d5721b8700892a748d22038 100644 (file)
--- a/test/sass/customize.scss
+++ b/test/ruby-sass/sass/customize.scss
@@ -26,12 +26,12 @@ $input-border-color: transparent;
 $input-shadow: none;
 
 // Import only what you need from Bulma
-@import "../../sass/utilities/_all.sass";
-@import "../../sass/base/_all.sass";
-@import "../../sass/elements/button.sass";
-@import "../../sass/elements/container.sass";
-@import "../../sass/elements/title.sass";
-@import "../../sass/form/_all.sass";
-@import "../../sass/components/navbar.sass";
-@import "../../sass/layout/hero.sass";
-@import "../../sass/layout/section.sass";
+@import "../../../sass/utilities/_all.sass";
+@import "../../../sass/base/_all.sass";
+@import "../../../sass/elements/button.sass";
+@import "../../../sass/elements/container.sass";
+@import "../../../sass/elements/title.sass";
+@import "../../../sass/form/_all.sass";
+@import "../../../sass/components/navbar.sass";
+@import "../../../sass/layout/hero.sass";
+@import "../../../sass/layout/section.sass";

diff --git a/test/ruby-sass/sass/only-base.sass b/test/ruby-sass/sass/only-base.sass
new file mode 100644 (file)
index 0000000..5330752
--- /dev/null
+++ b/test/ruby-sass/sass/only-base.sass
@@ -0,0 +1,5 @@
+@charset "utf-8"
+@import "../../../sass/utilities/_all"
+@import "../../../sass/base/_all"
+
+

diff --git a/test/sass/override.scss b/test/ruby-sass/sass/override.scss
similarity index 90%
rename from test/sass/override.scss
rename to test/ruby-sass/sass/override.scss
index 8ff7dfc190a6bb6fd38fc76d7af1c350b1b22da3..637c5800d2097a996ff9e4632830c5e39da5be12 100644 (file)
--- a/test/sass/override.scss
+++ b/test/ruby-sass/sass/override.scss
@@ -1,7 +1,7 @@
 @charset "utf-8";
 
 // Import the variables
-@import "../../sass/utilities/initial-variables.sass";
+@import "../../../sass/utilities/initial-variables.sass";
 
 $blue: #00f;
 
@@ -38,4 +38,4 @@ $spacing-vertical: null;
 $spacing-values: ("small": 10px, "medium": 30px, "large": 60px);
 
 // Import the rest of Bulma
-@import "../../bulma";
+@import "../../../bulma";

diff --git a/test/sass/bulma.sass b/test/sass/bulma.sass
deleted file mode 100644 (file)
index d74423b..0000000
--- a/test/sass/bulma.sass
+++ /dev/null
@@ -1,2 +0,0 @@
-@charset "utf-8"
-@import "../../bulma"

diff --git a/test/sass/only-base.sass b/test/sass/only-base.sass
deleted file mode 100644 (file)
index e75403c..0000000
--- a/test/sass/only-base.sass
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "utf-8"
-@import "../../sass/utilities/_all"
-@import "../../sass/base/_all"
-
-