Skip to content

Revert https://github.com/nock/nock/pull/1270 #1336

Merged
paulmelnikow merged 8 commits intonock:betafrom
Chengxuan:issue1334-beta
Jan 3, 2019
Merged

Revert https://github.com/nock/nock/pull/1270 #1336
paulmelnikow merged 8 commits intonock:betafrom
Chengxuan:issue1334-beta

Conversation

@Chengxuan
Copy link
Copy Markdown
Contributor

@Chengxuan Chengxuan commented Jan 2, 2019

replicate of the fix for #1334 for beta branch

@Chengxuan Chengxuan changed the title adding test for fake timer Revert https://github.com/nock/nock/pull/1270 Jan 2, 2019
@Chengxuan
Copy link
Copy Markdown
Contributor Author

Chengxuan commented Jan 2, 2019

I want to see Travis fail on the above commit before I push the implementation. I did see the added test failing locally on my laptop, but not in the other PR. I suspect it's due to how travis has been configured for this project.

@paulmelnikow
Copy link
Copy Markdown
Member

This test has failed twice in a row on this branch:

./tests/test_intercept.js ......................... 529/531
  delay works with replyWithError
  not ok this is an error message
    stack: >
      end (lib/request_overrider.js:28:785)
    
      lib/request_overrider.js:13:2146
    
      OverriddenClientRequest.RequestOverrider.req.write
      (lib/request_overrider.js:13:1355)
    
      OverriddenClientRequest.RequestOverrider.req.end
      (lib/request_overrider.js:13:1924)
    
      Object.module.get (lib/common.js:41:287)
    
      Test.<anonymous> (tests/test_intercept.js:4008:20)
    at:
      line: 28
      column: 785
      file: lib/request_overrider.js
      function: end
    test: delay works with replyWithError
    source: |
      function setHeader(request, name, value) {

Any idea what could be causing that? I don't think it's related to this change. I don't believe the tests are running concurrently.

@paulmelnikow paulmelnikow mentioned this pull request Jan 3, 2019
@paulmelnikow
Copy link
Copy Markdown
Member

Passing now 🤔

@paulmelnikow paulmelnikow merged commit a213169 into nock:beta Jan 3, 2019
@nockbot
Copy link
Copy Markdown
Collaborator

nockbot commented Jan 3, 2019

🎉 This PR is included in version 11.0.0-beta.3 🎉

The release is available on:

Your semantic-release bot 📦🚀

@lock
Copy link
Copy Markdown

lock bot commented Jan 17, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue and add a reference to this one if it’s related. Thank you!

@lock lock bot locked as resolved and limited conversation to collaborators Jan 17, 2019
@nockbot
Copy link
Copy Markdown
Collaborator

nockbot commented Aug 13, 2019

🎉 This PR is included in version 11.0.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants