Skip to content

File box #1915

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
Merged
merged 18 commits into from
Feb 20, 2020
Merged

File box #1915

merged 18 commits into from
Feb 20, 2020

Conversation

su-chang
Copy link
Member

I'm submitting a...

[ ] Bug Fix
[ ] Feature
[ ] Other (Refactoring, Added tests, Documentation, ...)

Checklist

  • Commit Messages follow the Conventional Commits pattern
    • A feature commit message is prefixed "feat:"
    • A bugfix commit message is prefixed "fix:"
  • Tests for the changes have been added

Description

please describe the changes that you are making

for features, please describe how to use the new feature

please include a reference to an existing issue, if applicable

Does this PR introduce a breaking change?

[ ] Yes
[ ] No

su-chang and others added 16 commits October 31, 2019 14:05
@su-chang
0.29.3
22df662
@su-chang
modify: resolve conflict
888bfe5
@su-chang
Merge branch 'Chatie-master'
4a717c7
@su-chang
Merge pull request #5 from Chatie/master
58fc1e1 
feat: change say() method response type from void to Message (wechaty#1866)
@su-chang
Merge pull request #6 from wechaty/master
0935615 
Merge wechaty/wechaty
@su-chang
Merge pull request #7 from wechaty/master
92a67a2 
Merge wechaty/wechaty
@su-chang
Merge pull request #8 from wechaty/master
b8bfb93 
Merge wechaty master
@su-chang
Merge pull request #9 from wechaty/master
05a5b74 
Add reason for logout event (wechaty#1900)
@su-chang
Merge pull request #10 from wechaty/master
afe90a3 
Merge label and new friend search related methods
@su-chang
Merge pull request #11 from wechaty/master
4677b3e 
Merge master
@su-chang
Merge pull request #12 from wechaty/master
9aac563 
Merge master
@su-chang
Merge pull request #13 from wechaty/master
881e824 
Merge master
@su-chang
Merge pull request #14 from wechaty/master
a4b4a13 
Merge master
@su-chang
Merge pull request #15 from wechaty/master
0f9aac7 
Merge mater
@su-chang
fix: import file-box from wechaty-puppet
dff199f
@su-chang
Merge pull request #16 from wechaty/master
69fe6ed 
Merge master
@su-chang su-chang requested a review from lijiarui as a code owner February 20, 2020 05:00
@su-chang
Copy link
Member Author

Related issue: #1914

huan
huan requested changes Feb 20, 2020
View reviewed changes
Copy link
Member

@huan huan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for sending this improvement!

I believe it will be good after you revert all modifications in the unit tests because we need to mock the puppet to confirm the system works.

@su-chang
Copy link
Member Author

In wechaty-puppet-mock will use FileBox from 'file-box', so we should import FileBox from wechaty-puppet?

@huan
Copy link
Member

huan commented Feb 20, 2020

Yes. As discussed with @windmemory, we should import FileBox from wechaty-puppet in everywhere, including the wechaty-puppet-mock.

@su-chang
Copy link
Member Author

So this PR will be test green after wechaty-puppet-mock PR merged? Right?

@huan
Copy link
Member

huan commented Feb 20, 2020

No, it cannot.

Because the unit test needs to instantiate a puppet for testing purposes.

@su-chang
Copy link
Member Author

But now it can not pass the CI test, could you give me some advices for this case?

@huan
Copy link
Member

huan commented Feb 20, 2020

Cloud you please make sure you can pass the unit tests in your local environment by running npm test?

After that, I believe you can pass the CI.

@su-chang
Copy link
Member Author

It can't, but the log of failed test show that:

Error: Cannot find module 'file-box'
    at Function.Module._resolveFilename (internal/modules/cjs/loader.js:636:15)
    at Function.Module._load (internal/modules/cjs/loader.js:562:25)
    at Module.require (internal/modules/cjs/loader.js:690:17)
    at require (internal/modules/cjs/helpers.js:25:18)
    at Object.<anonymous> (/Users/suchang/Desktop/PROJECT/Test/testPadplus/wechaty/node_modules/wechaty-puppet-mock/src/puppet-mock.ts:21:1)
    at Module._compile (internal/modules/cjs/loader.js:776:30)
    at Object.Module._extensions..js (internal/modules/cjs/loader.js:787:10)
    at Module.load (internal/modules/cjs/loader.js:653:32)
    at tryModuleLoad (internal/modules/cjs/loader.js:593:12)
    at Function.Module._load (internal/modules/cjs/loader.js:585:3)
    at Module.require (internal/modules/cjs/loader.js:690:17)
    at require (internal/modules/cjs/helpers.js:25:18)
    at Object.<anonymous> (/Users/suchang/Desktop/PROJECT/Test/testPadplus/wechaty/node_modules/wechaty-puppet-mock/src/index.ts:1:1)

So I think this error maybe due to the FileBox in wechaty-puppet-mock is from file-box?

@huan
Copy link
Member

huan commented Feb 20, 2020

Yes. So I'd like to suggest that you can keep the dependencies of the file-box for now. I will remove it by later.

huan
huan approved these changes Feb 20, 2020
View reviewed changes
Copy link
Member

@huan huan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for make it passing the CI!

@huan huan merged commit b8a14b4 into wechaty:master Feb 20, 2020
@huan huan mentioned this pull request Apr 20, 2020
Closed
@su-chang su-chang deleted the file-box branch June 30, 2020 10:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@huan huan huan approved these changes

@lijiarui lijiarui Awaiting requested review from lijiarui

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@su-chang @huan