Skip to content
This repository has been archived by the owner on Dec 15, 2022. It is now read-only.

Dependabot/npm i przędza/https agent proxy 2.2.4 #554

Open
wants to merge 10 commits into
base: dependabot/npm_and_yarn/https-proxy-agent-2.2.4
Choose a base branch
from
Open

Dependabot/npm i przędza/https agent proxy 2.2.4 #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8cbf562
removed conditional assertions
darangi May 7, 2020
84244ce
commented unused var
darangi May 7, 2020
560764b
added conditional assertions
darangi May 7, 2020
745a6c6
added atom beta to conditional assertion
darangi May 7, 2020
e807e86
rm ;
darangi May 7, 2020
233cb02
Merge pull request #534 from atom/failing-test-beta
lkashef May 8, 2020
9893c16
fixed assertions
darangi May 27, 2020
4e61bc9
Merge pull request #541 from atom/fix-stable-ci-failure
darangi May 27, 2020
a5cf8a1
Merge branch 'master' into dependabot/npm_and_yarn/https-proxy-agent-…
Dawidbaranowski1998 Jul 11, 2020
c55ea8b
Revert "Bump https-proxy-agent from 2.2.1 to 2.2.4"
Dawidbaranowski1998 Jul 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 16 additions & 16 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 10 additions & 50 deletions test/editor-binding.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,6 @@ const {FollowState} = require('@atom/teletype-client')
const FakeBufferProxy = require('./helpers/fake-buffer-proxy')
const BufferBinding = require('../lib/buffer-binding')

/*
We are currently checking if teletype is trying to build against the dev version of atom which uses electron 5.
This is because there is a slight change in electron 5s API and some of the assertions in this tests need to be
changed. The stable and beta version of atom still uses electron 4 inorder to support both electron
versions, the assertions need to be made accordingly. In the future when stable and beta start compiling against
electron 5, these assertions will be simplified.
*/
const isDevBuild = atom.getAppName().toLowerCase().indexOf('atom dev') > -1

suite('EditorBinding', function () {
if (process.env.CI) this.timeout(process.env.TEST_TIMEOUT_IN_MS)

Expand Down Expand Up @@ -107,31 +98,20 @@ suite('EditorBinding', function () {

const cursorDecoratedRanges = getCursorDecoratedRanges(editor)

if (isDevBuild) {
return assert.deepEqual(
cursorDecoratedRanges,
[
{tail: Point(10, 0), head: Point(11, 4)},
{tail: Point(20, 5), head: Point(20, 0)},
{tail: Point(3, 0), head: Point(4, 2)},
{tail: Point(6, 0), head: Point(5, 0)}
]
)
}

assert.deepEqual(
cursorDecoratedRanges,
[
{tail: {row: 3, column: 0}, head: {row: 4, column: 2}},
{tail: {row: 6, column: 0}, head: {row: 5, column: 0}},
{tail: {row: 10, column: 0}, head: {row: 11, column: 4}},
{tail: {row: 20, column: 5}, head: {row: 20, column: 0}}
{tail: Point(10, 0), head: Point(11, 4)},
{tail: Point(20, 5), head: Point(20, 0)},
{tail: Point(3, 0), head: Point(4, 2)},
{tail: Point(6, 0), head: Point(5, 0)}
]
)

editor.setSelectedBufferRanges([
[[0, 0], [0, 4]]
])

assert.deepEqual(
editorProxy.selections,
{
Expand Down Expand Up @@ -163,22 +143,12 @@ suite('EditorBinding', function () {

const cursorDecoratedRanges = getCursorDecoratedRanges(editor)

if (isDevBuild) {
return assert.deepEqual(
cursorDecoratedRanges,
[
{tail: Point(10, 0), head: Point(11, 4)},
{tail: Point(20, 0), head: Point(20, 5)},
{tail: Point(3, 0), head: Point(4, 2)}
]
)
}
assert.deepEqual(
cursorDecoratedRanges,
[
{tail: {row: 3, column: 0}, head: {row: 4, column: 2}},
{tail: {row: 10, column: 0}, head: {row: 11, column: 4}},
{tail: {row: 20, column: 0}, head: {row: 20, column: 5}}
{tail: Point(10, 0), head: Point(11, 4)},
{tail: Point(20, 0), head: Point(20, 5)},
{tail: Point(3, 0), head: Point(4, 2)}
]
)

Expand Down Expand Up @@ -266,21 +236,11 @@ suite('EditorBinding', function () {

const cursorDecoratedRanges = getCursorDecoratedRanges(editor)

if (isDevBuild) {
return assert.deepEqual(
cursorDecoratedRanges,
[
{tail: Point(0, 3), head: Point(0, 3)},
{tail: Point(0, 6), head: Point(0, 6)}
]
)
}

assert.deepEqual(
cursorDecoratedRanges,
[
{tail: {row: 0, column: 6}, head: {row: 0, column: 6}},
{tail: {row: 0, column: 3}, head: {row: 0, column: 3}}
{tail: Point(0, 3), head: Point(0, 3)},
{tail: Point(0, 6), head: Point(0, 6)}
]
)
})
Expand Down