From 8e9bf400c9d37199635e60b83187dfb760a7885d Mon Sep 17 00:00:00 2001
From: Simon Williams <simon@systemparadox.co.uk>
Date: Thu, 24 Dec 2015 14:16:02 +0000
Subject: [PATCH 1/2] sort-comp: say "should" instead of "must"

---
 lib/rules/sort-comp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rules/sort-comp.js b/lib/rules/sort-comp.js
index 9ffbbd6f8a..93d6cff51b 100644
--- a/lib/rules/sort-comp.js
+++ b/lib/rules/sort-comp.js
@@ -42,7 +42,7 @@ module.exports = Components.detect(function(context, components) {
 
   var errors = {};
 
-  var MISPOSITION_MESSAGE = '{{propA}} must be placed {{position}} {{propB}}';
+  var MISPOSITION_MESSAGE = '{{propA}} should be placed {{position}} {{propB}}';
 
   var methodsOrder = getMethodsOrder({
     order: [

From e2e1f3d3275d859f8928d6f4075106155b03f185 Mon Sep 17 00:00:00 2001
From: Simon Williams <simon@systemparadox.co.uk>
Date: Sun, 3 Jan 2016 22:43:24 +0000
Subject: [PATCH 2/2] Fix tests

---
 tests/lib/rules/sort-comp.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/lib/rules/sort-comp.js b/tests/lib/rules/sort-comp.js
index a8398100c9..f47e413bbe 100644
--- a/tests/lib/rules/sort-comp.js
+++ b/tests/lib/rules/sort-comp.js
@@ -205,7 +205,7 @@ ruleTester.run('sort-comp', rule, {
       '});'
     ].join('\n'),
     parserOptions: parserOptions,
-    errors: [{message: 'render must be placed after displayName'}]
+    errors: [{message: 'render should be placed after displayName'}]
   }, {
     // Must run rule when render uses createElement instead of JSX
     code: [
@@ -217,7 +217,7 @@ ruleTester.run('sort-comp', rule, {
       '});'
     ].join('\n'),
     parserOptions: parserOptions,
-    errors: [{message: 'render must be placed after displayName'}]
+    errors: [{message: 'render should be placed after displayName'}]
   }, {
     // Must force a custom method to be placed before render
     code: [
@@ -229,7 +229,7 @@ ruleTester.run('sort-comp', rule, {
       '});'
     ].join('\n'),
     parserOptions: parserOptions,
-    errors: [{message: 'render must be placed after onClick'}]
+    errors: [{message: 'render should be placed after onClick'}]
   }, {
     // Must force a custom method to be placed after render if no 'everything-else' group is specified
     code: [
@@ -248,7 +248,7 @@ ruleTester.run('sort-comp', rule, {
       ]
     }],
     parserOptions: parserOptions,
-    errors: [{message: 'onClick must be placed after render'}]
+    errors: [{message: 'onClick should be placed after render'}]
   }, {
     // Must validate static properties
     code: [
@@ -261,6 +261,6 @@ ruleTester.run('sort-comp', rule, {
     ].join('\n'),
     parser: 'babel-eslint',
     parserOptions: parserOptions,
-    errors: [{message: 'render must be placed after displayName'}]
+    errors: [{message: 'render should be placed after displayName'}]
   }]
 });