Fix false negatives with noEmptyLineBetween in combination with the…

… `order: "flexible"` Closes #82
hudochenkov · Apr 9, 2019 · a1df43f · a1df43f
1 parent 433524b
commit a1df43f
Show file tree

Hide file tree

Showing 2 changed files with 94 additions and 0 deletions.
diff --git a/rules/properties-order/createExpectedOrder.js b/rules/properties-order/createExpectedOrder.js
@@ -40,6 +40,7 @@ module.exports = function createExpectedOrder(input) {
 
 		if (item.order && item.order === 'flexible') {
 			expectedPosition += 1;
+			groupPosition += 1;
 
 			item.properties.forEach(property => {
 				appendItem(property, true, item);

diff --git a/rules/properties-order/tests/no-empty-line-between.js b/rules/properties-order/tests/no-empty-line-between.js
@@ -215,3 +215,96 @@ testRule(rule, {
 		},
 	],
 });
+
+testRule(rule, {
+	ruleName,
+	config: [
+		[
+			{
+				emptyLineBefore: 'always',
+				noEmptyLineBetween: true,
+				order: 'flexible',
+				properties: ['height', 'width'],
+			},
+			{
+				emptyLineBefore: 'always',
+				noEmptyLineBetween: true,
+				order: 'flexible',
+				properties: ['font-size', 'font-weight'],
+			},
+		],
+	],
+	fix: true,
+
+	accept: [
+		{
+			code: `
+				a {
+					height: 1px;
+					width: 2px;
+
+					font-size: 2px;
+					font-weight: bold;
+				}
+			`,
+		},
+		{
+			code: `
+				a {
+					height: 1px;
+					width: 2px;
+
+					font-weight: bold;
+					font-size: 2px;
+				}
+			`,
+		},
+	],
+
+	reject: [
+		{
+			code: `
+				a {
+					height: 1px;
+					width: 2px;
+
+					font-weight: bold;
+
+					font-size: 2px;
+				}
+			`,
+			fixed: `
+				a {
+					height: 1px;
+					width: 2px;
+
+					font-weight: bold;
+					font-size: 2px;
+				}
+			`,
+			message: messages.rejectedEmptyLineBefore('font-size'),
+		},
+		{
+			code: `
+				a {
+					height: 1px;
+					width: 2px;
+
+					font-size: 2px;
+
+					font-weight: bold;
+				}
+			`,
+			fixed: `
+				a {
+					height: 1px;
+					width: 2px;
+
+					font-size: 2px;
+					font-weight: bold;
+				}
+			`,
+			message: messages.rejectedEmptyLineBefore('font-weight'),
+		},
+	],
+});