Fixes and refinements

Author: lukeapage

lib/rules/assertion-before-screenshot.js

@@ -5,6 +5,17 @@
 
 'use strict'
 
+const assertionCommands = [
+  // assertions
+  'should',
+  'and',
+  'contains',
+
+  // not an assertion, but unlikely to require waiting for render
+  'scrollIntoView',
+  'scrollTo',
+];
+
 module.exports = {
   meta: {
     docs: {
@@ -30,11 +41,11 @@ module.exports = {
 
 function isRootCypress(node) {
   while(node.type === 'CallExpression') {
-    if (node.callee.type === 'MemberExpression' &&
-        node.callee.object.type === 'Identifier' &&
+    if (node.callee.type !== 'MemberExpression') return false
+    if (node.callee.object.type === 'Identifier' &&
         node.callee.object.name === 'cy') {
-        return true
-      }
+      return true
+    }
     node = node.callee.object
   }
   return false
@@ -92,6 +103,5 @@ function getPreviousCypressCommand(node) {
 
 function isPreviousAnAssertion (node) {
   const previousCypressCommand = getPreviousCypressCommand(node)
-  return previousCypressCommand === 'get' ||
-         previousCypressCommand === 'should'
+  return assertionCommands.indexOf(previousCypressCommand) >= 0
 }