Skip to content

Update test.spec.js #39

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

Closed
wants to merge 4 commits into from
Closed

Update test.spec.js #39

wants to merge 4 commits into from

Conversation

mrmarcsmith
Copy link
Contributor

added tests for additional methods of passing S3 Overrides.

added tests for additional methods of passing S3 Overrides.
@mrmarcsmith
Copy link
Contributor Author

Hi All,
I have fixed this conflict but it needs approval from someone with write access

@flovilmart
Copy link
Contributor

@mrmarcsmith thanks for extending the coverage! Let's wait for the CI to finish before merging those.

@mrmarcsmith
Copy link
Contributor Author

Hi @flovilmart ,
On my end it says "This Branch has a conflict that must be resolved". I updated my commit to correct the conflict but the merge needs approval before the CI can kick in. here is the link to review: https://github.com/parse-server-modules/parse-server-s3-adapter/pull/39/conflicts

@flovilmart
Copy link
Contributor

Seems that your commit didn't fix the conflicts but now it's ok

@mrmarcsmith
Copy link
Contributor Author

@flovilmart this test checks pull request #37 which hasn't been approved yet. I was asked by @acinader to write this test before he would approve it.

@acinader
Copy link
Contributor

ah, I see. so, in your local box you should rebase (or merge) patch-2 onto patch-1 and then push it to git hub. that way the two commits will show up in the same pr and we can see the test passing.

k? If you're not sure how to do, I could do for you....

@mrmarcsmith
Copy link
Contributor Author

this issue was moved to PR #40

@flovilmart
Copy link
Contributor

Closing as moved to #40

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants