Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

chore(tests): resuse tmp file helpers from utils (#3119)

Browse source
This commit is contained in:
Yury Semikhatsky 2020-07-23 12:42:39 -07:00 committed by GitHub
parent 63689e36a6
commit e5afd92762
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/defaultbrowsercontext.jest.js
View file

@ -19,10 +19,8 @@ const fs = require('fs');
const path = require('path'); const path = require('path');
const utils = require('./utils'); const utils = require('./utils');
const os = require('os'); const os = require('os');
const {promisify} = require('util');
const mkdtempAsync = promisify(fs.mkdtemp); const {mkdtempAsync, makeUserDataDir, removeUserDataDir} = utils;
const {makeUserDataDir, removeUserDataDir} = utils;
const {FFOX, MAC, CHROMIUM, WEBKIT, WIN, USES_HOOKS} = testOptions; const {FFOX, MAC, CHROMIUM, WEBKIT, WIN, USES_HOOKS} = testOptions;
registerFixture('userDataDir', async ({}, test) => { registerFixture('userDataDir', async ({}, test) => {

4
test/download.jest.js
View file

@ -18,9 +18,7 @@ const fs = require('fs');
const path = require('path'); const path = require('path');
const util = require('util'); const util = require('util');
const os = require('os'); const os = require('os');
const removeFolder = require('rimraf'); const {mkdtempAsync, removeFolderAsync} = require('./utils');
const mkdtempAsync = util.promisify(fs.mkdtemp);
const removeFolderAsync = util.promisify(removeFolder);
const {FFOX, CHROMIUM, WEBKIT, HEADLESS} = testOptions; const {FFOX, CHROMIUM, WEBKIT, HEADLESS} = testOptions;

8
test/downloadsPath.jest.js
View file

@ -16,14 +16,8 @@
const path = require('path'); const path = require('path');
const fs = require('fs'); const fs = require('fs');
const util = require('util');
const utils = require('./utils');
const os = require('os'); const os = require('os');
const removeFolder = require('rimraf'); const {mkdtempAsync, removeFolderAsync} = require('./utils');
const mkdtempAsync = util.promisify(fs.mkdtemp);
const removeFolderAsync = util.promisify(removeFolder);
const {FFOX, CHROMIUM, WEBKIT, CHANNEL} = testOptions;
registerFixture('downloadsPath', async ({}, test) => { registerFixture('downloadsPath', async ({}, test) => {
const downloadsPath = await mkdtempAsync(path.join(os.tmpdir(), 'playwright-test-')); const downloadsPath = await mkdtempAsync(path.join(os.tmpdir(), 'playwright-test-'));

11
test/utils.js
View file

@ -24,12 +24,13 @@ const removeFolder = require('rimraf');
const {FlakinessDashboard} = require('../utils/flakiness-dashboard'); const {FlakinessDashboard} = require('../utils/flakiness-dashboard');
const PROJECT_ROOT = fs.existsSync(path.join(__dirname, '..', 'package.json')) ? path.join(__dirname, '..') : path.join(__dirname, '..', '..'); const PROJECT_ROOT = fs.existsSync(path.join(__dirname, '..', 'package.json')) ? path.join(__dirname, '..') : path.join(__dirname, '..', '..');
const mkdtempAsync = util.promisify(require('fs').mkdtemp);
const removeFolderAsync = util.promisify(removeFolder);
let platform = os.platform(); let platform = os.platform();
const utils = module.exports = { const utils = module.exports = {
mkdtempAsync: util.promisify(fs.mkdtemp),
removeFolderAsync: util.promisify(removeFolder),
/** /**
* @return {string} * @return {string}
*/ */
@ -180,11 +181,11 @@ const utils = module.exports = {
}, },
makeUserDataDir: async function() { makeUserDataDir: async function() {
return await mkdtempAsync(path.join(os.tmpdir(), 'playwright_dev_profile-')); return await utils.mkdtempAsync(path.join(os.tmpdir(), 'playwright_dev_profile-'));
}, },
removeUserDataDir: async function(dir) { removeUserDataDir: async function(dir) {
await removeFolderAsync(dir).catch(e => {}); await utils.removeFolderAsync(dir).catch(e => {});
}, },
testOptions(browserType) { testOptions(browserType) {