From fabc447f72c5dbda68bf38da709d8c4c0a123f93 Mon Sep 17 00:00:00 2001 From: jamaljsr <1356600+jamaljsr@users.noreply.github.com> Date: Tue, 24 Mar 2020 12:16:07 -0400 Subject: [PATCH] chore(deps): update dependency prettier to v2 --- e2e/App.e2e.ts | 5 +---- e2e/Home.e2e.ts | 12 +++-------- e2e/Import.e2e.ts | 27 ------------------------- e2e/pages/Home.ts | 2 ++ e2e/pages/NewNetwork.ts | 2 +- electron/appMenu.ts | 2 +- package.json | 2 +- src/components/designer/custom/Link.tsx | 5 +++-- yarn.lock | 8 ++++---- 9 files changed, 16 insertions(+), 49 deletions(-) diff --git a/e2e/App.e2e.ts b/e2e/App.e2e.ts index a047a14..d36a172 100644 --- a/e2e/App.e2e.ts +++ b/e2e/App.e2e.ts @@ -1,9 +1,6 @@ import { assertNoConsoleErrors, cleanup, getPageTitle, pageUrl } from './helpers'; -fixture`App` - .page(pageUrl) - .afterEach(assertNoConsoleErrors) - .afterEach(cleanup); +fixture`App`.page(pageUrl).afterEach(assertNoConsoleErrors).afterEach(cleanup); test('should have correct title', async t => { await t.expect(getPageTitle()).eql('Polar'); diff --git a/e2e/Home.e2e.ts b/e2e/Home.e2e.ts index 04e095a..6696d7a 100644 --- a/e2e/Home.e2e.ts +++ b/e2e/Home.e2e.ts @@ -1,20 +1,14 @@ import { assertNoConsoleErrors, cleanup, getPageUrl, pageUrl } from './helpers'; import { App, Home, NewNetwork } from './pages'; -fixture`Home` - .page(pageUrl) - .afterEach(assertNoConsoleErrors) - .afterEach(cleanup); +fixture`Home`.page(pageUrl).afterEach(assertNoConsoleErrors).afterEach(cleanup); test('should be on the home screen route', async t => { await t.expect(getPageUrl()).match(/.*#\/$/); }); -test('should navgiate to New Network screen when create button clicked', async t => { - await t - .click(Home.createButton) - .expect(getPageUrl()) - .contains('/network'); +test('should navigate to New Network screen when create button clicked', async t => { + await t.click(Home.createButton).expect(getPageUrl()).contains('/network'); }); test('should navigate to network view when a card is clicked', async t => { diff --git a/e2e/Import.e2e.ts b/e2e/Import.e2e.ts index 23d36c6..cb66d93 100644 --- a/e2e/Import.e2e.ts +++ b/e2e/Import.e2e.ts @@ -1,4 +1,3 @@ -import { setElectronDialogHandler } from 'testcafe-browser-provider-electron'; import { assertNoConsoleErrors, cleanup, getPageUrl, pageUrl } from './helpers'; import { Home } from './pages'; @@ -11,29 +10,3 @@ fixture`Import` test('should be on the import network route', async t => { await t.expect(getPageUrl()).match(/network_import/); }); - -test('when the user aborts the file dialog, nothing should happen', async t => { - let dialogOpened = false; - await setElectronDialogHandler( - type => { - if (type === 'save-dialog' || type === 'open-dialog') { - dialogOpened = true; - return undefined; - } - return; - }, - { dialogOpened }, - ); - - // to make our input clickable in Testcafe we have to make it visible - await t.eval(() => { - const input = window.document.querySelector('input'); - input.style.display = ''; - return; - }); - - return t - .click('input') - .expect(dialogOpened) - .ok(); -}); diff --git a/e2e/pages/Home.ts b/e2e/pages/Home.ts index b564264..c1a5011 100644 --- a/e2e/pages/Home.ts +++ b/e2e/pages/Home.ts @@ -3,10 +3,12 @@ import { Selector } from 'testcafe'; class Home { getStarted = Selector('.ant-card-head-title'); createButton = Selector('button').withExactText('Create a Lightning Network'); + importButton = Selector('li').withExactText('Import Network'); cardTitles = Selector('.ant-card-head-title'); getStartedText = () => this.getStarted.innerText; clickCreateButton = async (t: TestController) => t.click(this.createButton); + clickImportButton = async (t: TestController) => t.click(this.importButton); getCardTitleWithText = (text: string) => this.cardTitles.withExactText(text); } diff --git a/e2e/pages/NewNetwork.ts b/e2e/pages/NewNetwork.ts index 51819b4..bcc734b 100644 --- a/e2e/pages/NewNetwork.ts +++ b/e2e/pages/NewNetwork.ts @@ -3,7 +3,7 @@ import { Selector } from 'testcafe'; class NewNetwork { nameInput = Selector('input[id=name]'); lndNodesInput = Selector('input[id=lndNodes]'); - submitBtn = Selector('button[type=submit]').withExactText('Create'); + submitBtn = Selector('button[type=submit]').withExactText('Create Network'); } export default new NewNetwork(); diff --git a/electron/appMenu.ts b/electron/appMenu.ts index 670eccd..25c5981 100644 --- a/electron/appMenu.ts +++ b/electron/appMenu.ts @@ -62,7 +62,7 @@ export const appMenuTemplate = () => { submenu: [ { label: 'Github Repo', - click: function() { + click: function () { shell.openExternal('https://github.com/jamaljsr/polar'); }, }, diff --git a/package.json b/package.json index d0c55d9..80aac00 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "lint-staged": "10.0.9", "lndconnect": "0.2.10", "nodemon": "2.0.2", - "prettier": "1.19.1", + "prettier": "2.0.2", "react": "16.13.1", "react-async-hook": "3.6.1", "react-copy-to-clipboard": "5.0.2", diff --git a/src/components/designer/custom/Link.tsx b/src/components/designer/custom/Link.tsx index 338babb..560d8eb 100644 --- a/src/components/designer/custom/Link.tsx +++ b/src/components/designer/custom/Link.tsx @@ -27,8 +27,9 @@ export const generateCurvePath = (startPos: IPosition, endPos: IPosition): strin // add 0.001 to the last point's coords to workaround gradients disappearing // when rendered as a straight line. See https://stackoverflow.com/a/34687362 - return `M${start.x},${start.y} C ${start.x + curveX},${start.y + curveY} ${end.x - - curveX},${end.y - curveY} ${end.x + 0.001},${end.y + 0.001}`; + return `M${start.x},${start.y} C ${start.x + curveX},${start.y + curveY} ${ + end.x - curveX + },${end.y - curveY} ${end.x + 0.001},${end.y + 0.001}`; }; const CustomLink: React.FC = ({ diff --git a/yarn.lock b/yarn.lock index 807e574..2113e9d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13825,10 +13825,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@1.19.1: - version "1.19.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" - integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== +prettier@2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.2.tgz#1ba8f3eb92231e769b7fcd7cb73ae1b6b74ade08" + integrity sha512-5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg== pretty-bytes@^5.1.0: version "5.3.0"