fix: cleanup test flake (#21989)

* fix: test flake in e2e tests * fix flake in GitDataSource.spec.ts

Author: tgriesser

packages/data-context/test/unit/sources/GitDataSource.spec.ts

@@ -47,6 +47,12 @@ describe('GitDataSource', () => {
  const onGitInfoChange = sinon.stub()
  const onError = sinon.stub()
 
+ // create a file and modify a file to express all
+ // git states we are interested in (created, unmodified, modified)
+ const fooSpec = path.join(e2eFolder, 'foo.cy.js')
+ const aRecordSpec = path.join(e2eFolder, 'a_record.cy.js')
+ const xhrSpec = path.join(e2eFolder, 'xhr.cy.js')
+
  gitInfo = new GitDataSource({
  isRunMode: false,
  projectRoot: projectPath,
@@ -55,28 +61,24 @@ describe('GitDataSource', () => {
  onError,
  })
 
- // create a file and modify a file to express all
- // git states we are interested in (created, unmodified, modified)
- const fooSpec = path.join(e2eFolder, 'foo.cy.js')
- const aRecordSpec = path.join(e2eFolder, 'a_record.cy.js')
- const xhrSpec = path.join(e2eFolder, 'xhr.cy.js')
-
  fs.createFileSync(fooSpec)
  fs.writeFileSync(xhrSpec, 'it(\'modifies the file\', () => {})')
 
- const dfd = pDefer()
+ gitInfo.setSpecs([fooSpec, aRecordSpec, xhrSpec])
 
- onGitInfoChange.onSecondCall().callsFake(dfd.resolve)
+ let result: any[] = []
 
- gitInfo.setSpecs([fooSpec, aRecordSpec, xhrSpec])
+ do {
+ result = await Promise.all([
+ gitInfo.gitInfoFor(fooSpec),
+ gitInfo.gitInfoFor(aRecordSpec),
+ gitInfo.gitInfoFor(xhrSpec),
+ ])
 
- await dfd.promise
+ await new Promise((resolve) => setTimeout(resolve, 100))
+ } while (result.some((r) => r == null))
 
- const [created, unmodified, modified] = await Promise.all([
- gitInfo.gitInfoFor(fooSpec),
- gitInfo.gitInfoFor(aRecordSpec),
- gitInfo.gitInfoFor(xhrSpec),
- ])
+ const [created, unmodified, modified] = result
 
  expect(created.lastModifiedHumanReadable).to.match(/(a few|[0-9]) seconds? ago/)
  expect(created.statusType).to.eql('created')

system-tests/projects/missing-webpack-config/cypress.config.js

@@ -1,6 +1,6 @@
-import { defineConfig } from 'cypress'
+const { defineConfig } = require('cypress')
 
-export default defineConfig({
+module.exports = defineConfig({
  component: {
  supportFile: false,
  devServer: {

system-tests/projects/missing-webpack-config/package.json

@@ -6,4 +6,4 @@
  "webpack": "^5.0.0",
  "webpack-dev-server": "4.9.0"
  }
-}
+}