Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[internal] Lint typescript, json, new eslint rules #4449

Merged
merged 26 commits into from
Jul 12, 2019
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
458aede
temp 07/01/19 [skip ci] main lint files
kuceb Jul 1, 2019
6cc6bfc
use lint-staged scripts
kuceb Jul 1, 2019
4cf9408
fix all auto-fixable eslint errors
kuceb Jul 1, 2019
a9c4104
manually fix lint issues in files
kuceb Jul 1, 2019
e0d7df7
temp 07/01/19 [skip ci]
kuceb Jul 1, 2019
250f97f
bump eslint plugin versions, update circle.yml
kuceb Jul 2, 2019
fed0625
[lint fix] remaining js files
kuceb Jul 2, 2019
47b6b39
update vscode/settings.json
kuceb Jul 2, 2019
0dd0e69
add back stop-only
kuceb Jul 2, 2019
810ff95
use stop-only for linting .onlys
kuceb Jul 2, 2019
ce4d05f
Merge remote-tracking branch 'origin/develop' into lint-typescript
kuceb Jul 2, 2019
2371e37
fix verify_spec, build_spec
kuceb Jul 2, 2019
5c8d7b4
update json plugin
kuceb Jul 2, 2019
ea65c9a
Merge remote-tracking branch 'origin/develop' into lint-typescript
kuceb Jul 3, 2019
b58f255
relint & apply corrections
kuceb Jul 3, 2019
d259886
fix appveyor.yml not cleansing env vars (very bad)
kuceb Jul 3, 2019
eaade53
dont echo commit message in appveyor script
kuceb Jul 3, 2019
692f3ce
retry build &
kuceb Jul 3, 2019
6ecc644
Merge remote-tracking branch 'origin/develop' into lint-typescript
kuceb Jul 9, 2019
45b1c2e
re-add & upgrade lint-staged
kuceb Jul 9, 2019
283b25c
update contributing docs
kuceb Jul 9, 2019
d532e99
only let stop-only catch staged changes
kuceb Jul 9, 2019
b2bafb5
Merge remote-tracking branch 'origin/develop' into lint-typescript
kuceb Jul 9, 2019
b17c881
Merge remote-tracking branch 'origin/develop' into lint-typescript
kuceb Jul 10, 2019
691e992
Merge remote-tracking branch 'origin/develop' into lint-typescript
kuceb Jul 12, 2019
220f5e8
Merge remote-tracking branch 'origin/develop' into lint-typescript
kuceb Jul 12, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/develop' into lint-typescript
  • Loading branch information
kuceb committed Jul 9, 2019

Verified

This commit was signed with the committer’s verified signature.
jennydaman Jennings Zhang
commit b2bafb54576d03673038789a046fee54a9bccf09
9 changes: 8 additions & 1 deletion cli/lib/tasks/download.js
Original file line number Diff line number Diff line change
@@ -111,7 +111,8 @@ const verifyDownloadedFile = (filename, expectedSize, expectedChecksum) => {
debug(text)

throw new Error(text)
})
}
)
}

if (expectedChecksum) {
@@ -211,6 +212,7 @@ const downloadFromUrl = ({ url, downloadDestination, progress }) => {
// see https://github.com/cypress-io/cypress/pull/4092
expectedSize = response.headers['x-amz-meta-size'] ||
response.headers['content-length']

expectedChecksum = response.headers['x-amz-meta-checksum']

if (expectedChecksum) {
@@ -269,6 +271,11 @@ const downloadFromUrl = ({ url, downloadDestination, progress }) => {
})
}

/**
* Download Cypress.zip from external url to local file.
* @param [string] version Could be "3.3.0" or full URL
* @param [string] downloadDestination Local filename to save as
*/
const start = (opts) => {
let { version, downloadDestination, progress } = opts

Original file line number Diff line number Diff line change
@@ -217,6 +217,7 @@ describe('src/cy/commands/actions/click', () => {
'Inherited From',
'Error',
])

expect(consoleProps['But it has CSS']).to.eq('pointer-events: none')

expect(consoleProps['Inherited From']).to.eq(this.ptrNone.get(0))
You are viewing a condensed version of this merge commit. You can view the full changes here.