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.

Sign up for GitHub

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

Jump to bottom

feat(intercept): add { log: false } to StaticResponse #25547

Merged
merged 16 commits into from
Mar 14, 2023
Merged

feat(intercept): add { log: false } to StaticResponse #25547

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6221c62
begin setting log with the backend
flotwig Jan 23, 2023
0a2409a
revert backend changes
flotwig Jan 23, 2023
6b04001
Merge remote-tracking branch 'origin/develop' into intercept-log-control
flotwig Feb 13, 2023
89f7993
update interface now that we are only doing static log
flotwig Feb 13, 2023
e834ce6
change existing logging logic to run in proxy layer instead
flotwig Feb 13, 2023
a72fc7d
add tests, fix small bugs
flotwig Feb 13, 2023
ac738c2
fix tests
flotwig Feb 13, 2023
14966e4
add changelog
flotwig Feb 13, 2023
6d8c193
run ci
flotwig Feb 13, 2023
ff24b09
Merge branch 'develop' into intercept-log-control
flotwig Feb 13, 2023
be294a6
run ci
flotwig Feb 13, 2023
47c787f
fix cl
flotwig Feb 13, 2023
2a67033
Merge branch 'develop' into intercept-log-control
flotwig Mar 7, 2023
dba68d7
Merge branch 'develop' into intercept-log-control
mjhenkes Mar 9, 2023
4254969
Update cli/CHANGELOG.md
flotwig Mar 10, 2023
a32c1df
Merge branch 'develop' into intercept-log-control
mjhenkes Mar 13, 2023
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
revert backend changes
  • Loading branch information
@flotwig
flotwig committed Jan 23, 2023
commit 0a2409af8efd569251eaa6cd3726734708c6b3b4
1 change: 0 additions & 1 deletion packages/net-stubbing/lib/internal-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export const SERIALIZABLE_REQ_PROPS = [
'followRedirect',
'resourceType',
'query',
'log',
]

export const SERIALIZABLE_RES_PROPS = _.concat(
Expand Down
7 changes: 2 additions & 5 deletions packages/net-stubbing/lib/server/intercepted-request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,11 @@ export class InterceptedRequest {
data,
}

// https://github.com/cypress-io/cypress/issues/17139
// Routes should be counted before they're sent.
if (eventName === 'before:request') {
const route = this.matchingRoutes.find(({ id }) => id === subscription.routeId) as BackendRoute

// To prevent users from accidentally setting `log: false` via fallthru, reset `req.log` on each interception.
this.req.log = !!(route.staticResponse?.log || this.req.log)

// https://github.com/cypress-io/cypress/issues/17139
// Routes should be counted before they're sent.
route.matches++

if (route.routeMatcher.times && route.matches >= route.routeMatcher.times) {
Expand Down
4 changes: 1 addition & 3 deletions packages/proxy/lib/http/request-middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,7 @@ const CorrelateBrowserPreRequest: RequestMiddleware = async function () {
}

const SendToDriver: RequestMiddleware = function () {
const { browserPreRequest, resourceType } = this.req

this.req.log = (resourceType === 'fetch' || resourceType === 'xhr')
const { browserPreRequest } = this.req

if (browserPreRequest) {
this.socket.toDriver('request:event', 'incoming:request', browserPreRequest)
Expand Down
4 changes: 0 additions & 4 deletions packages/proxy/lib/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ export type CypressIncomingRequest = Request & {
proxiedUrl: string
abort: () => void
requestId: string
/**
* Should this request be logged in the Command Log?
*/
log?: boolean
browserPreRequest?: BrowserPreRequest
body?: string
responseTimeout?: number
Expand Down