@putout/plugin-tape 21.5.0 → 21.7.0

package/README.md

@@ -19,6 +19,7 @@ npm i @putout/plugin-tape -D
 
 - ✅ [add-args](#add-args);
 - ✅ [add-t-end](#add-t-end);
+- ✅ [apply-assertions-order](#apply-assertions-order);
 - ✅ [apply-destructuring](#apply-destructuring);
 - ✅ [apply-stub](#apply-stub);
 - ✅ [apply-with-name](#apply-with-name);
@@ -49,6 +50,7 @@ npm i @putout/plugin-tape -D
 - ✅ [remove-useless-undefined](#remove-useless-undefined);
 - ✅ [switch-expected-with-result](#switch-expected-with-result);
 - ✅ [sync-with-name](#sync-with-name);
+- ✅ [move-out-result-from-assertion](#move-out-result-from-assertion);
 
 ## Config
 
@@ -57,6 +59,7 @@ npm i @putout/plugin-tape -D
     "rules": {
         "tape/jest": "on",
         "tape/apply-stub": "on",
+        "tape/apply-assertions-order": "on",
         "tape/apply-destructuring": "on",
         "tape/apply-with-name": "on",
         "tape/add-t-end": "on",
@@ -88,7 +91,8 @@ npm i @putout/plugin-tape -D
         }],
         "tape/remove-skip": ["on", {
             "allowed": ["test"]
-        }]
+        }],
+        "tape/move-out-result-from-assertion": "on"
     }
 }
 ```
@@ -397,6 +401,27 @@ test('copymitter', async (t) => {
 });
 ```
 
+## apply-assertions-order
+
+Check out in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/0c0adae586448bd0921129275fb08891/c2f031920a3f1eb119c71b5ac3ba3c27ce1710ea).
+
+### ❌ Example of incorrect code
+
+```js
+t.equal(result, expected);
+cleanup();
+t.end();
+```
+
+### ✅ Example of correct code
+
+```js
+cleanup();
+
+t.equal(result, expected);
+t.end();
+```
+
 ## apply-destructuring
 
 Check out in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/adf238850271c0a4ad917e71bab8757c/4ff416c3d9f3de0930339c7a4929eb4b62461d1a).
@@ -796,6 +821,37 @@ test('some test', (t) => {
 });
 ```
 
+## move-out-result-from-assertion
+
+### ❌ Example of incorrect code
+
+```js
+t.notOk(screen.getByRole('button').disabled);
+
+t.deepEqual(readState({
+    getItem,
+}), {
+    a: 1,
+});
+```
+
+### ✅ Example of correct code
+
+```js
+const {disabled} = screen.getByRole('button');
+t.notOk(disabled);
+
+const result = readState({
+    getItem,
+});
+
+const expected = {
+    a: 1,
+};
+
+t.deepEqual(result, expected);
+```
+
 ## License
 
 MIT

package/lib/apply-assertions-order/index.js

@@ -0,0 +1,46 @@
+import {operator, print} from 'putout';
+
+const {
+    compare,
+    insertBefore,
+    remove,
+} = operator;
+
+const printNode = (a) => print(a, {
+    printer: ['putout', {
+        format: {
+            newline: '',
+        },
+    }],
+});
+
+export const report = ({prev, prevPrev}) => {
+    return `Use '${printNode(prev)}' before '${printNode(prevPrev)}'`;
+};
+
+export const fix = ({prev, prevPrev}) => {
+    const prevNode = prev.node;
+    
+    remove(prev);
+    insertBefore(prevPrev, prevNode);
+};
+
+export const traverse = ({push}) => ({
+    't.end()': (path) => {
+        const prev = path.parentPath.getPrevSibling();
+        
+        if (!prev.node)
+            return;
+        
+        if (compare(prev, 't.__a(__args)'))
+            return;
+        
+        const prevPrev = prev.getPrevSibling();
+        
+        push({
+            path,
+            prev,
+            prevPrev,
+        });
+    },
+});

package/lib/index.js

@@ -1,3 +1,5 @@
+import * as movOutResultFromAssertion from './move-out-result-from-assertion/index.js';
+import * as applyAssertionsOrder from './apply-assertions-order/index.js';
 import * as removeUselessUndefined from './remove-useless-undefined/index.js';
 import * as extractArgsFromCalledWith from './extract-args-from-called-with/index.js';
 import * as applyStub from './apply-stub/index.js';
@@ -66,4 +68,6 @@ export const rules = {
     'remove-skip': removeSkip,
     'extract-args-from-called-with': extractArgsFromCalledWith,
     'remove-useless-undefined': removeUselessUndefined,
+    'apply-assertions-order': applyAssertionsOrder,
+    'move-out-result-from-assertion': movOutResultFromAssertion,
 };

package/lib/move-out-result-from-assertion/index.js

@@ -0,0 +1,17 @@
+export const report = () => `Move out result from asssertion`;
+
+export const replace = () => ({
+    't.__(__a.__b(__args).__c)': `{
+    	const {__c} = __a.__b(__args);
+        t.__(__c);
+    }`,
+    't.__(__a(__b), __c)': `{
+    	const result = __a(__b);
+    	const expected = __c;
+        t.__(result, expected);
+    }`,
+    't.__(__a(__b))': `{
+    	const result = __a(__b);
+        t.__(result);
+    }`,
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-tape",
-  "version": "21.5.0",
+  "version": "21.7.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin helps with tests",