Changed queued fixture command to cy.now + removed unnecessary isRout…

…e check (#7983)
cypress-io · Jul 27, 2020 · a3ca026 · a3ca026
1 parent b2fd528
commit a3ca026
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/driver/src/cy/commands/waiting.js b/packages/driver/src/cy/commands/waiting.js
@@ -137,9 +137,7 @@ module.exports = (Commands, Cypress, cy, state) => {
         log.set('referencesAlias', aliases)
       }
 
-      const isRouteCommand = () => command.get('name') === 'route' || command.get('subject').xhrUrl
-
-      if (!isRouteCommand()) {
+      if (command.get('name') !== 'route') {
         $errUtils.throwErrByPath('wait.invalid_alias', {
           onFail: options._log,
           args: { alias },

diff --git a/packages/driver/src/cy/commands/xhr.js b/packages/driver/src/cy/commands/xhr.js
@@ -475,7 +475,9 @@ module.exports = (Commands, Cypress, cy, state, config) => {
         const fixturesRe = /^(fx:|fixture:)/
 
         if (hasResponse && fixturesRe.test(options.response)) {
-          return cy.fixture(options.response.replace(fixturesRe, '')).then(() => route())
+          const fixtureName = options.response.replace(fixturesRe, '')
+
+          return cy.now('fixture', fixtureName).then(() => route())
         }
 
         return route()