🐎 Update test structure to match sasstools#166

donabrams · Sep 14, 2015 · 25b29da · 25b29da
1 parent 815c944
commit 25b29da
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/lib/rules/shorthand-values.js b/lib/rules/shorthand-values.js
@@ -55,7 +55,7 @@ module.exports = {
 
       declaration.traverse(function (item) {
 
-        if (item.type === 'property') {
+        if (item.is('property')) {
           item.traverse(function (child) {
             // check if the property is a possible shorthand property
             if (shortVals.indexOf(child.content) !== -1) {
@@ -70,7 +70,7 @@ module.exports = {
         if (isShorthandProperty) {
           var value = [];
 
-          if (item.type === 'value') {
+          if (item.is('value')) {
             var node = item.content,
                 fullVal = '';
 

diff --git a/tests/rules/shorthand-values.js b/tests/rules/shorthand-values.js
@@ -2,9 +2,9 @@
 
 var lint = require('./_lint');
 
-var file = lint.file('shorthand-values.scss');
-
 describe('shorthand values - scss', function () {
+  var file = lint.file('shorthand-values.scss');
+
   it('[default]', function (done) {
     lint.test(file, {
       'shorthand-values': 1
@@ -147,11 +147,15 @@ describe('shorthand values - scss', function () {
   });
 });
 
+/////////////////////////////
 // Sass
+/////////////////////////////
 
 describe('shorthand values - sass', function () {
+  var file = lint.file('shorthand-values.sass');
+
   it('[default]', function (done) {
-    lint.test(lint.file('shorthand-values.sass'), {
+    lint.test(file, {
       'shorthand-values': 1
     }, function (data) {
       lint.assert.equal(44, data.warningCount);
@@ -160,7 +164,7 @@ describe('shorthand values - sass', function () {
   });
 
   it('[allowed: 1]', function (done) {
-    lint.test(lint.file('shorthand-values.sass'), {
+    lint.test(file, {
       'shorthand-values': [
         1,
         {
@@ -176,7 +180,7 @@ describe('shorthand values - sass', function () {
   });
 
   it('[allowed: 2]', function (done) {
-    lint.test(lint.file('shorthand-values.sass'), {
+    lint.test(file, {
       'shorthand-values': [
         1,
         {
@@ -192,7 +196,7 @@ describe('shorthand values - sass', function () {
   });
 
   it('[allowed: 3]', function (done) {
-    lint.test(lint.file('shorthand-values.sass'), {
+    lint.test(file, {
       'shorthand-values': [
         1,
         {
@@ -208,7 +212,7 @@ describe('shorthand values - sass', function () {
   });
 
   it('[allowed: none]', function (done) {
-    lint.test(lint.file('shorthand-values.sass'), {
+    lint.test(file, {
       'shorthand-values': [
         1,
         {
@@ -223,7 +227,7 @@ describe('shorthand values - sass', function () {
   });
 
   it('[allowed: 1, 2]', function (done) {
-    lint.test(lint.file('shorthand-values.sass'), {
+    lint.test(file, {
       'shorthand-values': [
         1,
         {
@@ -240,7 +244,7 @@ describe('shorthand values - sass', function () {
   });
 
   it('[allowed: 1, 3]', function (done) {
-    lint.test(lint.file('shorthand-values.sass'), {
+    lint.test(file, {
       'shorthand-values': [
         1,
         {
@@ -257,7 +261,7 @@ describe('shorthand values - sass', function () {
   });
 
   it('[allowed: 2, 3]', function (done) {
-    lint.test(lint.file('shorthand-values.sass'), {
+    lint.test(file, {
       'shorthand-values': [
         1,
         {
@@ -274,7 +278,7 @@ describe('shorthand values - sass', function () {
   });
 
   it('[allowed: 1, 2, 3] - as default', function (done) {
-    lint.test(lint.file('shorthand-values.sass'), {
+    lint.test(file, {
       'shorthand-values': [
         1,
         {