test: repair tests after previous breaking changes

BREAKING CHANGE: jasmine is removed working towards conveyal#318
miles-grant-ibigroup · Jul 6, 2021 · e0e41e0 · e0e41e0
1 parent d6de291
commit e0e41e0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/__tests__/bin/mastarm.js b/__tests__/bin/mastarm.js
@@ -10,17 +10,17 @@ const util = require('../test-utils/util.js')
 
 const mastarm = path.resolve(__dirname, '../../bin/mastarm')
 
-const originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL
+const originalTimeout = jest.originalTimeout
 
 describe('mastarm cli', () => {
   beforeEach(() => {
-    jasmine.DEFAULT_TIMEOUT_INTERVAL = 20000
+    jest.setTimeout(20000)
   })
   afterEach(() => {
-    jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout
+    jest.setTimeout(originalTimeout)
   })
 
-  it('should display usage with no args', done => {
+  it('should display usage with no args', (done) => {
     exec(`node ${mastarm} --help`, (err, stdout, stderr) => {
       expect(err).toBeNull()
       expect(stdout).toContain('Usage: mastarm [options] [command]')
@@ -33,10 +33,10 @@ describe('mastarm cli', () => {
     const buildDir = util.buildDir
     const mockDir = util.mockDir
 
-    beforeEach(done => mkdirp(buildDir, done))
-    afterEach(done => rimraf(buildDir, done))
+    beforeEach(() => mkdirp(buildDir))
+    afterEach((done) => rimraf(buildDir, done))
 
-    it('should build a project', done => {
+    it('should build a project', (done) => {
       exec(
         `node ${mastarm}-build ${mockDir}/index.js:${buildDir}/index.js ${mockDir}/index.css:${buildDir}/index.css`,
         (err, stdout, stderr) => {
@@ -55,10 +55,10 @@ describe('mastarm cli', () => {
     const buildDir = util.buildDir
     const mockDir = util.mockDir
 
-    beforeEach(done => mkdirp(buildDir, done))
-    afterEach(done => rimraf(buildDir, done))
+    beforeEach(() => mkdirp(buildDir))
+    afterEach((done) => rimraf(buildDir, done))
 
-    it('should prepublish a project', done => {
+    it('should prepublish a project', (done) => {
       exec(
         `node ${mastarm}-prepublish ${mockDir}:${buildDir}`,
         (err, stdout, stderr) => {
@@ -72,7 +72,7 @@ describe('mastarm cli', () => {
     })
   })
 
-  it('should run lint on a project', done => {
+  it('should run lint on a project', (done) => {
     exec(`${mastarm}-lint lib --quiet`, (err, stdout, stderr) => {
       expect(err).toBeNull()
       expect(stdout).toBe('')

diff --git a/__tests__/lib/__snapshots__/load-config.js.snap b/__tests__/lib/__snapshots__/load-config.js.snap
@@ -7,6 +7,5 @@ Object {
   "messages": Object {},
   "settings": Object {},
   "store": Object {},
-  "stylePath": null,
 }
 `;
diff --git a/__tests__/lib/jest.js b/__tests__/lib/jest.js
@@ -16,7 +16,7 @@ describe('jest.js', () => {
       updateSnapshots: true
     })
     cfg[JEST_CONFIG_INDEX] = JSON.parse(cfg[JEST_CONFIG_INDEX])
-    expect(cfg[JEST_CONFIG_INDEX].transform['^.+\\.jsx?$']).toContain(
+    expect(cfg[JEST_CONFIG_INDEX].transform['^.+\\.(t|j)sx?$']).toContain(
       'lib/jest-preprocessor.js'
     )
     delete cfg[JEST_CONFIG_INDEX].transform