Merge pull request #8 from JaySunSyn/refactor-query

Fiz nth
JaySunSyn · May 3, 2019 · bc16724 · bc16724
2 parents 78e3b58 + 7423983
commit bc16724
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/commands.js b/commands.js
@@ -42,9 +42,10 @@ Cypress.Commands.overwrite('get', (originalFn, selector, options) => {
 
   return cy.window({log: false}).then((w) => new Cypress.Promise((resolve, reject) => {
     const walker = new Daywalker(w);
+
     const result = options && options.all
             ? walker.querySelectorAll(selector)
-            : walker.querySelector(selector, (options && options.nth) || 0);
+            : walker.querySelector(selector, (options && options.nth) || 1);
     if (result != null) {
       resolve(result);
       return true;

diff --git a/daywalker-store-query.js b/daywalker-store-query.js
@@ -12,10 +12,10 @@ class DaywalkerStoreQuery {
     return result;
   }
 
-  querySelector(selector, nth = 0) {
+  querySelector(selector, nth = 1) {
     const result = this.queryStore(selector);
     if (Array.isArray(result)) {
-      return result.length > nth ? result[nth] : null;
+      return result.length >= nth ? result[nth - 1] : null;
     }
     return result;
   }