"shadowEq" command refactoring

abramenal · Jul 16, 2019 · 6609119 · 6609119
1 parent 8c19d5d
commit 6609119
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/example/cypress/integration/todolist.spec.js b/example/cypress/integration/todolist.spec.js
@@ -19,9 +19,7 @@ describe('Todo List', () => {
     /* Or, same thing via */
     cy.shadowGet('todo-list')
       .shadowFind('todo-list-item')
-
-      // TODO: test negative values
-      .shadowEq(-2)
+      .shadowEq(0)
       .shadowContains('Read some books');
   });
 
@@ -34,7 +32,7 @@ describe('Todo List', () => {
     /* Or, same thing via */
     cy.shadowGet('todo-list')
       .shadowFind('todo-list-item')
-      .shadowEq()
+      .shadowEq(-1)
       .shadowContains('Buy some serials');
   });
 

diff --git a/src/commands/shadowEq/command.js b/src/commands/shadowEq/command.js
@@ -3,9 +3,9 @@ import { validateElement, validateSubject } from '../../validators';
 
 export default function shadowEq(subject, index) {
   validateSubject(subject);
-  validateIndex(index);
+  validateIndex(index, subject.length);
 
-  const element = subject[index < 0 ? subject.length - index : index];
+  const element = subject[index < 0 ? subject.length + index : index];
   validateElement(element);
 
   Cypress.log({

diff --git a/src/commands/shadowEq/validators.js b/src/commands/shadowEq/validators.js
@@ -1,7 +1,7 @@
 import { ERR_TYPES, InternalError } from '../../error';
 
-export const validateIndex = index => {
-  if (typeof index !== 'number') {
+export const validateIndex = (index, collectionLength) => {
+  if (typeof index !== 'number' || Math.abs(index) >= collectionLength) {
     throw new InternalError(ERR_TYPES.INVALID_INDEX);
   }
 };
diff --git a/src/error.js b/src/error.js
@@ -25,7 +25,7 @@ export const ERR_TYPES = {
   },
   INVALID_INDEX: {
     message: 'Index is not valid',
-    tip: 'A number indicates the index to find the element at within an array of elements',
+    tip: 'It should be a positive or negative number within a range of the items collection',
   },
   INVALID_TEXT: {
     message: 'Text is not valid',