Merge branch 'develop' into cacie/feat/upload-activity-indicator

cypress-io · Nov 8, 2023 · 753a7bb · 753a7bb
2 parents 8668d8b + 7392f61
commit 753a7bb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml
@@ -85,6 +85,7 @@ windowsWorkflowFilters: &windows-workflow-filters
     - equal: [ 'chore/update_webpack_deps_to_latest_webpack4_compat', << pipeline.git.branch >> ]
     - equal: [ 'lerna-optimize-tasks', << pipeline.git.branch >> ]
     - equal: [ 'em/shallow-checkout', << pipeline.git.branch >> ]
+    - equal: [ 'mschile/mochaEvents_win_sep', << pipeline.git.branch >> ]
     - matches:
         pattern: /^release\/\d+\.\d+\.\d+$/
         value: << pipeline.git.branch >>

diff --git a/packages/app/cypress/e2e/runner/support/mochaEventsUtils.ts b/packages/app/cypress/e2e/runner/support/mochaEventsUtils.ts
@@ -204,5 +204,8 @@ function sanitizeMochaEvents (args: CypressInCypressMochaEvent[]) {
 }
 
 function getCallerFilename () {
-  return (new Error()).stack!.split('\n')[1].split('/').slice(-1)[0].split(':')[0]
+  const line = (new Error()).stack!.split('\n')[1]
+  const pathSep = line.includes('\\') ? '\\' : '/'
+
+  return line.split(pathSep).slice(-1)[0].split(':')[0]
 }