Skip to content

Commit

Permalink
Merge branch 'master' into timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
KazuCocoa authored Aug 29, 2024
2 parents 3a0d48d + 6cfc5c3 commit a5d153e
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 7 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## [7.5.5](https://github.com/appium/node-simctl/compare/v7.5.4...v7.5.5) (2024-08-29)

### Bug Fixes

* Update tests for node.js 22.7 ([#255](https://github.com/appium/node-simctl/issues/255)) ([723568b](https://github.com/appium/node-simctl/commit/723568b320364051289e94dda384fd25b50f19d9))

## [7.5.4](https://github.com/appium/node-simctl/compare/v7.5.3...v7.5.4) (2024-07-29)

### Miscellaneous Chores
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"ios",
"simctl"
],
"version": "7.5.4",
"version": "7.5.5",
"author": "Appium Contributors",
"license": "Apache-2.0",
"repository": {
Expand Down Expand Up @@ -52,7 +52,7 @@
"lint": "eslint .",
"lint:fix": "npm run lint -- --fix",
"prepare": "npm run build",
"test": "mocha --exit --timeout 1m \"./test/unit/**/*-specs.js\"",
"test": "mocha --exit --timeout 1m \"./test/unit/**/*-specs.*js\"",
"e2e-test": "mocha --exit --timeout 5m \"./test/e2e/**/*-specs.js\""
},
"prettier": {
Expand Down
11 changes: 7 additions & 4 deletions test/unit/simctl-specs.js → test/unit/simctl-specs.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,25 @@ import pq from 'proxyquire';
import sinon from 'sinon';
import * as TeenProcess from 'teen_process';
import _ from 'lodash';
import fs from 'node:fs';

const proxyquire = pq.noCallThru();

const devicePayloads = [
[
{
stdout: JSON.stringify(require(`${__dirname}/fixtures/devices.json`)),
stdout: fs.readFileSync(`${__dirname}/fixtures/devices.json`, 'utf-8'),
},
{
stdout: JSON.stringify(require(`${__dirname}/fixtures/devices-with-unavailable.json`)),
stdout: fs.readFileSync(`${__dirname}/fixtures/devices-with-unavailable.json`, 'utf-8'),
},
],
[
{
stdout: JSON.stringify(require(`${__dirname}/fixtures/devices-simple.json`)),
stdout: fs.readFileSync(`${__dirname}/fixtures/devices-simple.json`, 'utf-8'),
},
{
stdout: JSON.stringify(require(`${__dirname}/fixtures/devices-with-unavailable-simple.json`)),
stdout: fs.readFileSync(`${__dirname}/fixtures/devices-with-unavailable-simple.json`, 'utf-8'),
},
],
];
Expand All @@ -45,6 +47,7 @@ describe('simctl', function () {
chai.use(chaiAsPromised.default);
});


describe('getDevices', function () {
let simctl;

Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"$schema": "https://json.schemastore.org/tsconfig",
"extends": "@appium/tsconfig/tsconfig.json",
"compilerOptions": {
"strict": false, // TODO: make this flag true
"strict": false,
"esModuleInterop": true,
"outDir": "build",
"types": ["node"],
"checkJs": true
Expand Down

0 comments on commit a5d153e

Please sign in to comment.