Merge branch 'main' into dependabot/npm_and_yarn/tape-5.6.3

bjankord · Mar 13, 2023 · dcf4b32 · dcf4b32
2 parents 430046c + a742dc1
commit dcf4b32
Show file tree

Hide file tree

Showing 24 changed files with 2,667 additions and 1,006 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [12, 14, 16]
+        node: [14, 16, 18]
         os: [ubuntu-latest]
 
     steps:

diff --git a/__tests__/unit/bang-format.spec.js b/__tests__/unit/bang-format.spec.js
diff --git a/__tests__/unit/final-newline.spec.js b/__tests__/unit/final-newline.spec.js
diff --git a/__tests__/unit/hex-notation.spec.js b/__tests__/unit/hex-notation.spec.js
diff --git a/__tests__/unit/indentation.spec.js b/__tests__/unit/indentation.spec.js
diff --git a/__tests__/unit/leading-zero.spec.js b/__tests__/unit/leading-zero.spec.js
diff --git a/__tests__/unit/qualifying-element.spec.js b/__tests__/unit/qualifying-element.spec.js
@@ -31,14 +31,14 @@ test("Qualifying element scss", t => {
     .then(checkResult)
     .catch(logError)
 
-  function checkResult(result) {
-    t.equal(result.warnings().length, 5, "flags 5 warning")
-    t.is(result.warnings()[0].text, "Expected \"div#thing\" to have no more than 0 ID selectors (selector-max-id)", "correct warning text")
-    t.is(result.warnings()[1].text, "Unexpected qualifying type selector (selector-no-qualifying-type)", "correct warning text")
-    t.is(result.warnings()[2].text, "Unexpected qualifying type selector (selector-no-qualifying-type)", "correct warning text")
-    t.is(result.warnings()[3].text, "Unexpected qualifying type selector (selector-no-qualifying-type)", "correct warning text")
-    t.is(result.warnings()[4].text, "Unexpected qualifying type selector (selector-no-qualifying-type)", "correct warning text")
-  }
+    function checkResult(result) {
+      t.equal(result.warnings().length, 5, "flags 5 warning")
+      t.is(result.warnings()[0].text, "Expected \"div#thing\" to have no more than 0 ID selectors (selector-max-id)", "correct warning text")
+      t.is(result.warnings()[1].text, "Unexpected qualifying type selector \"div#thing\" (selector-no-qualifying-type)", "correct warning text")
+      t.is(result.warnings()[2].text, "Unexpected qualifying type selector \"ul.list\" (selector-no-qualifying-type)", "correct warning text")
+      t.is(result.warnings()[3].text, "Unexpected qualifying type selector \"li.item\" (selector-no-qualifying-type)", "correct warning text")
+      t.is(result.warnings()[4].text, "Unexpected qualifying type selector \"a[href=\'place\']\" (selector-no-qualifying-type)", "correct warning text")
+    }
 })
 
 function logError(err) {

diff --git a/__tests__/unit/shorthand.spec.js b/__tests__/unit/shorthand.spec.js
@@ -21,7 +21,7 @@ test("Shorthand scss", t => {
 
   function checkResult(result) {
     t.equal(result.warnings().length, 1, "flags 1 warning")
-    t.is(result.warnings()[0].text, "Unexpected longhand value \'1px 1px 1px 1px\' instead of \'1px\' (shorthand-property-no-redundant-values)", "correct warning text")
+    t.is(result.warnings()[0].text, "Expected \"1px 1px 1px 1px\" to be \"1px\" (shorthand-property-no-redundant-values)", "correct warning text")
   }
 })
 

diff --git a/__tests__/unit/single-line-per-property.spec.js b/__tests__/unit/single-line-per-property.spec.js
diff --git a/__tests__/unit/single-line-per-selector.spec.js b/__tests__/unit/single-line-per-selector.spec.js
diff --git a/__tests__/unit/space-after-comma.spec.js b/__tests__/unit/space-after-comma.spec.js
diff --git a/__tests__/unit/space-after-property-colon.spec.js b/__tests__/unit/space-after-property-colon.spec.js
diff --git a/__tests__/unit/space-after-property-name.spec.js b/__tests__/unit/space-after-property-name.spec.js
diff --git a/__tests__/unit/space-after-variable-colon.spec.js b/__tests__/unit/space-after-variable-colon.spec.js