mirror of
https://github.com/morten-olsen/parcel.git
synced 2026-02-08 01:36:24 +01:00
chore: dependency updates (#448)
This commit is contained in:
@@ -2,7 +2,7 @@ import puppeteer, { Browser, Page } from 'puppeteer';
|
||||
import path from 'path';
|
||||
import fs from 'fs-extra';
|
||||
import { nanoid } from 'nanoid';
|
||||
import openpgp, { key, message } from 'openpgp';
|
||||
import * as openpgp from 'openpgp';
|
||||
|
||||
const sleep = (time: number) => new Promise((resolve) => setTimeout(resolve, time));
|
||||
|
||||
@@ -10,7 +10,7 @@ describe('encryption', () => {
|
||||
let browser: Browser;
|
||||
let page: Page;
|
||||
let tmpDir: string;
|
||||
let keys: key.KeyResult;
|
||||
let keys: openpgp.PrivateKey;
|
||||
|
||||
const getText = async (elm: any) => {
|
||||
const text = await page.evaluate(el => el.textContent, elm);
|
||||
@@ -24,7 +24,7 @@ describe('encryption', () => {
|
||||
path.join(__dirname, '..', 'test-assets', 'key'),
|
||||
'utf-8',
|
||||
);
|
||||
keys = await key.readArmored(data);
|
||||
keys = await openpgp.readPrivateKey({ armoredKey: data });
|
||||
});
|
||||
|
||||
beforeEach(async () => {
|
||||
@@ -68,8 +68,8 @@ describe('encryption', () => {
|
||||
const data = await fs.readFile(downloadPath, 'utf-8');
|
||||
|
||||
const decrypted = await openpgp.decrypt({
|
||||
message: await message.readArmored(data),
|
||||
privateKeys: keys.keys[0],
|
||||
message: await openpgp.readMessage({ armoredMessage: data }),
|
||||
decryptionKeys: keys,
|
||||
});
|
||||
expect(decrypted.data).toBe('Bar');
|
||||
});
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
import NodeEnvironment from 'jest-environment-node';
|
||||
import { Server, createServer } from 'http';
|
||||
import getPort from 'get-port';
|
||||
import webpack from 'webpack';
|
||||
import path from 'path';
|
||||
import express from 'express';
|
||||
import createConfig from '../webpack.config';
|
||||
const NodeEnvironment = require('jest-environment-node');
|
||||
const { Server, createServer } = require('http');
|
||||
const getPort = require('get-port');
|
||||
const webpack = require('webpack');
|
||||
const path = require('path');
|
||||
const express = require('express');
|
||||
const { default: createConfig } = require('../webpack.config');
|
||||
|
||||
const build = () => new Promise<Server>(async (resolve, reject) => {
|
||||
const build = () => new Promise(async (resolve, reject) => {
|
||||
const config = await createConfig({
|
||||
test: true,
|
||||
});
|
||||
const port = await getPort();
|
||||
const bundler = webpack(config);
|
||||
bundler.run((err, stats) => {
|
||||
if (err) {
|
||||
if (err || !stats) {
|
||||
return reject(err);
|
||||
} else if (stats.hasErrors()) {
|
||||
return reject(new Error('Webpack errors'));
|
||||
@@ -28,22 +28,23 @@ const build = () => new Promise<Server>(async (resolve, reject) => {
|
||||
});
|
||||
|
||||
class CustomEnvironment extends NodeEnvironment {
|
||||
private _server?: Server;
|
||||
|
||||
constructor(config: any) {
|
||||
constructor(config) {
|
||||
super(config);
|
||||
}
|
||||
|
||||
async setup() {
|
||||
await super.setup();
|
||||
this._server = await build();
|
||||
const address: any = this._server?.address();
|
||||
const address = this._server.address();
|
||||
this.global.testUrl = `http://${address.address}:${address.port}`
|
||||
}
|
||||
|
||||
async teardown() {
|
||||
await super.teardown();
|
||||
this._server?.close();
|
||||
if (!this._server) {
|
||||
return;
|
||||
}
|
||||
this._server.close();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user