Merge pull request #1466 from sass/merge-master

Merge master into feature.use

Author: nex3

.travis.yml

@@ -1,5 +1,3 @@
-sudo: false
-
 language: ruby
 
 # Only building master means that we don't run two builds for each pull request.
@@ -9,42 +7,33 @@ branches:
     # Feature branches beginning with "feature."
     - "/^feature\\..*/"
 
-env:
-  global:
-    - SASS_LIBSASS_PATH=$TRAVIS_BUILD_DIR/../libsass
-    - SASS_SASSC_PATH=$TRAVIS_BUILD_DIR/../sassc
-    - SASS_SPEC_PATH=~$TRAVIS_BUILD_DIR/sass-spec
-
 matrix:
   fast_finish: true
   include:
-    - env: IMPL=libsass COMMAND="../sassc/bin/sassc"
-    - env: IMPL=dart-sass
+    - name: "LibSass"
+      env:
+        - IMPL=libsass
+        - COMMAND="../sassc/bin/sassc"
+        - SASS_LIBSASS_PATH=$TRAVIS_BUILD_DIR/../libsass
+        - SASS_SASSC_PATH=$TRAVIS_BUILD_DIR/../sassc
+        - SASS_SPEC_PATH=~$TRAVIS_BUILD_DIR/sass-spec
+      before_script:
+        - git clone https://github.com/sass/libsass.git $SASS_LIBSASS_PATH
+        - (cd $SASS_LIBSASS_PATH; git checkout $GITISH)
+        - git clone https://github.com/sass/sassc.git $SASS_SASSC_PATH
+        - (cd $SASS_SASSC_PATH; git checkout $GITISH)
+        - make -C $SASS_SASSC_PATH
+      script: bundle exec sass-spec.rb --impl $IMPL -c $COMMAND;
+    - name: "Dart Sass"
+      env: IMPL=dart-sass
+      before_script:
+        - curl -o dart.zip "https://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-x64-release.zip"
+        - unzip dart.zip
+        - export PATH="$PATH:`pwd`/dart-sdk/bin"
+        - git clone https://github.com/sass/dart-sass.git ../dart-sass --depth 1 --branch feature.use
+        - (cd ../dart-sass; pub get)
+      script: bundle exec sass-spec.rb --dart ../dart-sass
 
 before_install:
   - if ./tools/skipped-for-impl.sh; then exit 0; fi
   - rm Gemfile.lock
-
-  - if [ $IMPL == "libsass" ]; then
-      git clone https://github.com/sass/libsass.git $SASS_LIBSASS_PATH;
-      (cd $SASS_LIBSASS_PATH; git checkout $GITISH);
-      git clone https://github.com/sass/sassc.git $SASS_SASSC_PATH;
-      (cd $SASS_SASSC_PATH; git checkout $GITISH);
-      make -C $SASS_SASSC_PATH;
-    fi
-
-  - if [ $IMPL == "dart-sass" ]; then
-      curl -o dart.zip "https://storage.googleapis.com/dart-archive/channels/dev/release/latest/sdk/dartsdk-linux-x64-release.zip";
-      unzip dart.zip;
-      export PATH="$PATH:`pwd`/dart-sdk/bin";
-
-      git clone https://github.com/sass/dart-sass.git ../dart-sass --depth 1 --branch feature.use;
-      (cd ../dart-sass; pub get);
-    fi
-
-script:
-  - if [ $IMPL == "dart-sass" ]; then
-      bundle exec sass-spec.rb --dart ../dart-sass;
-    else
-      bundle exec sass-spec.rb --impl $IMPL -c $COMMAND;
-    fi

Gemfile

@@ -5,3 +5,5 @@ gem "command_line_reporter", '~> 3.0'
 gem "ruby-terminfo", '~> 0.1.1'
 gem "diffy", '~> 3.1'
 gem "hrx", '~> 1.0'
+
+gem 'rspec'

Gemfile.lock

@@ -4,11 +4,25 @@ GEM
     colored (1.2)
     command_line_reporter (3.3.6)
       colored (>= 1.2)
+    diff-lcs (1.3)
     diffy (3.3.0)
     hrx (1.0.0)
       linked-list (~> 0.0.13)
     linked-list (0.0.13)
     minitest (5.11.3)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
     ruby-terminfo (0.1.1)
 
 PLATFORMS
@@ -19,7 +33,8 @@ DEPENDENCIES
   diffy (~> 3.1)
   hrx (~> 1.0)
   minitest (~> 5.8)
+  rspec
   ruby-terminfo (~> 0.1.1)
 
 BUNDLED WITH
-   1.16.2
+   2.0.2

README.md

@@ -283,3 +283,11 @@ X. Exit testing.
 Any option can also be applied to all future occurences of that type of failure
 by adding `!` after it. For example, if you want to mark *all* failing specs as
 `:todo` for the current implementation you'd type `I!`.
+
+## Tests
+The unit tests for the spec runner are located in the `tests/` directory. To
+run these unit tests, run:
+
+```sh
+bundle exec rspec tests/
+```

STYLE_GUIDE.md

@@ -43,6 +43,7 @@ an exception. Thorough testing trumps style.
   * [DO use type selectors as placeholders](#do-use-type-selectors-as-placeholders)
   * [DO use descriptive names for multiple placeholders](#do-use-descriptive-names-for-multiple-placeholders)
   * [DO use single-letter names for irrelevant placeholders](#do-use-single-letter-names-for-irrelevant-placeholders)
+  * [DO use `pfx` for vendor prefixes](#do-use-pfx-for-vendor-prefixes)
   * [DO use style rules for expression-level tests](#do-use-style-rules-for-expression-level-tests)
   * [PREFER making imported files partials](#prefer-making-imported-files-partials)
   * [DO name single imported or used files "other"](#do-name-single-imported-or-used-files-other)
@@ -617,6 +618,45 @@ property name.
 [its path]: #do-use-descriptive-paths
 [one thing]: #do-test-only-one-thing-per-spec
 
+###  DO use `pfx` for vendor prefixes
+
+<details>
+<summary>Example</summary>
+
+#### Good
+
+```hrx
+<===> input.scss
+a {b: is-superselector(":-pfx-matches(c d)", "c d")}
+
+<===> output.css
+a {
+  b: true;
+}
+```
+
+#### Bad
+
+```hrx
+<===> input.scss
+a {b: is-superselector(":-webkit-matches(c d)", "c d")}
+
+<===> output.css
+a {
+  b: true;
+}
+```
+
+</details>
+
+There are a few situation in which Sass specifically parses vendor prefixes. In
+these cases, *all* vendor prefixes should be treated equivalently, whether
+they're from a real browser or not. To test this, use the non-existent vendor
+prefix `pfx`.
+
+If multiple different vendor prefixes are needed, index them by letter, as
+`-pfxa-`, `-pfxb`, and so on.
+
 ### DO use style rules for expression-level tests
 
 <details>

spec/core_functions/color/invert.hrx

@@ -158,11 +158,6 @@ Error: wrong number of arguments (3 for 2) for `invert'
 
 <===>
 ================================================================================
-<===> error/number_with_weight/options.yml
----
-:todo:
-- sass/libsass#2899
-
 <===> error/number_with_weight/input.scss
 a {b: invert(1, 50%)}
 

spec/core_functions/meta/function_exists.hrx

@@ -35,6 +35,30 @@ a {
   b: true;
 }
 
+<===>
+================================================================================
+<===> same_module/dash_insensitive/dash_to_underscore/input.scss
+@function a_b() {@return null}
+
+c {d: function-exists(a-b)}
+
+<===> same_module/dash_insensitive/dash_to_underscore/output.css
+c {
+  d: true;
+}
+
+<===>
+================================================================================
+<===> same_module/dash_insensitive/underscore_to_dash/input.scss
+@function a-b() {@return null}
+
+c {d: function-exists(a_b)}
+
+<===> same_module/dash_insensitive/underscore_to_dash/output.css
+c {
+  d: true;
+}
+
 <===>
 ================================================================================
 <===> same_module/non_existent/input.scss

spec/core_functions/meta/get_function/same_module.hrx

@@ -69,3 +69,27 @@ a {
   sass-fn: #ff9999;
   css-fn: lighten(red, 30%);
 }
+
+<===>
+================================================================================
+<===> dash_insensitive/dash_to_underscore/input.scss
+@function add_two($v) {@return $v + 2}
+
+a {b: call(get-function(add-two), 10)}
+
+<===> dash_insensitive/dash_to_underscore/output.css
+a {
+  b: 12;
+}
+
+<===>
+================================================================================
+<===> dash_insensitive/underscore_to_dash/input.scss
+@function add-two($v) {@return $v + 2}
+
+a {b: call(get-function(add_two), 10)}
+
+<===> dash_insensitive/underscore_to_dash/output.css
+a {
+  b: 12;
+}

spec/core_functions/meta/global_variable_exists.hrx

@@ -35,6 +35,30 @@ a {
   b: true;
 }
 
+<===>
+================================================================================
+<===> dash_insensitive/dash_to_underscore/input.scss
+$a_b: null;
+
+c {d: global-variable-exists(a-b)}
+
+<===> dash_insensitive/dash_to_underscore/output.css
+c {
+  d: true;
+}
+
+<===>
+================================================================================
+<===> dash_insensitive/underscore_to_dash/input.scss
+$a-b: null;
+
+c {d: global-variable-exists(a_b)}
+
+<===> dash_insensitive/underscore_to_dash/output.css
+c {
+  d: true;
+}
+
 <===>
 ================================================================================
 <===> same_module/non_existent/input.scss

spec/core_functions/meta/variable_exists.hrx

@@ -21,6 +21,30 @@ a {
   b: true;
 }
 
+<===>
+================================================================================
+<===> dash_insensitive/dash_to_underscore/input.scss
+$a_b: null;
+
+c {d: variable-exists(a-b)}
+
+<===> dash_insensitive/dash_to_underscore/output.css
+c {
+  d: true;
+}
+
+<===>
+================================================================================
+<===> dash_insensitive/underscore_to_dash/input.scss
+$a-b: null;
+
+c {d: variable-exists(a_b)}
+
+<===> dash_insensitive/underscore_to_dash/output.css
+c {
+  d: true;
+}
+
 <===>
 ================================================================================
 <===> through_import/input.scss