setup jest-puppeteer for UI tests#9
Conversation
followup readme fixes revert prompt.js changes for separate branch fixing mistakenly included file additional change
readme fixes
Fixed code example type in readme.markdown
…a#42) bump bureaucracy version
followup fix for non-image uploads
|
will rebase now |
|
Hi @jywarren, i have not been able to rebase this PR. The dist/ files are among the conflicting files, is there any other way around this? I even tried resolving all the conflicts in the dist files manually and saving (i don't know if this is okay), but have not had any luck. |
|
Hmm. I wonder if the files you added to the original PR were discrete and
separate enough from the rest of the codebase that you could consider
grabbing them and manually copying them into a fresh copy of the `plots2`
branch? If they're all the testing folder plus some config files, maybe
that's easier than rebasing, what do you think?
ug, sorry this is so much trouble!
…On Fri, Jul 10, 2020 at 1:18 PM Shulammite-Aso ***@***.***> wrote:
Hi @jywarren <https://github.com/jywarren>, i have not been able to
rebase this PR. The dist/ files are among the conflicting files, is there
any other way around this? I even tried resolving all the conflicts in the
dist files manually and saving (i don't know if this is okay), but have not
had any luck.
Added the files without resolving conflicts following the suggestion here
<https://clubmate.fi/git-rebasing-workflow-and-resolving-merge-conflicts/#Dealing_with_merge_conflicts_in_dist_files>.
but was met with the merge conflict again
[image: Screenshot from 2020-07-10 17-12-19]
<https://user-images.githubusercontent.com/48386390/87181051-30bf0580-c2d1-11ea-96f4-b86c6cdaa5c6.png>
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#9 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAAF6J7GPNMP2R4HCRXVZG3R25ENPANCNFSM4OV4UNZQ>
.
|
|
I think we have so much files and changes here because i made the PR from my fork of No troubles actually, just learning😅 |
|
You've got it, I'm sure! And just ping me if you run into any issues! 🎉 |
|
@Shulammite-Aso actually you don't have to commit the changes in dust folder. It's all fine the dust builds every time you run |
|
Hi @NitinBhasneria is this also possible to resolve perhaps by merging the latest woofmark commits from bevacqua's branch? See #6 for ref. |
Just to be clear. @jywarren do we want to merge all the latest commit of |
|
That's what I'm wondering. What do you think?
…On Sun, Jul 12, 2020, 11:32 AM Nitin Bhasneria ***@***.***> wrote:
Hi @NitinBhasneria <https://github.com/NitinBhasneria> is this also
possible to resolve perhaps by merging the latest woofmark commits from
bevacqua's branch? See #6 <#6>
for ref.
Just to be clear. @jywarren <https://github.com/jywarren> do we want to
merge all the latest commit of bevacqua/woofmark to our plots2 branch and
then follow this up
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#9 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAAF6JZIZUYAIWYUV52T4PTR3HJRRANCNFSM4OV4UNZQ>
.
|
|
Maybe also set up gitpod here for easier manual testing/reviewing?
On Sun, Jul 12, 2020, 11:41 AM Jeffrey Yoo Warren <jeff@unterbahn.com>
wrote:
… That's what I'm wondering. What do you think?
On Sun, Jul 12, 2020, 11:32 AM Nitin Bhasneria ***@***.***>
wrote:
> Hi @NitinBhasneria <https://github.com/NitinBhasneria> is this also
> possible to resolve perhaps by merging the latest woofmark commits from
> bevacqua's branch? See #6 <#6>
> for ref.
>
> Just to be clear. @jywarren <https://github.com/jywarren> do we want to
> merge all the latest commit of bevacqua/woofmark to our plots2 branch
> and then follow this up
>
> —
> You are receiving this because you were mentioned.
> Reply to this email directly, view it on GitHub
> <#9 (comment)>, or
> unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AAAF6JZIZUYAIWYUV52T4PTR3HJRRANCNFSM4OV4UNZQ>
> .
>
|
Well, if we are merging the latest commit of |
This will be really perfect and helpful thanks. |
|
Can you open a PR with the latest bevacqua woofmark so we can see? Have any
of you had a chance to test it in the editor repo? It's supposed to be a
patch level version change right? Thanks!
…On Sun, Jul 12, 2020, 12:04 PM Nitin Bhasneria ***@***.***> wrote:
Maybe also set up gitpod here for easier manual testing/reviewing? On Sun,
Jul 12, 2020, 11:41 AM Jeffrey Yoo Warren \
This will be really perfect and helpful thanks.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#9 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAAF6J3G2TBQDSWJDFQV7XTR3HMXBANCNFSM4OV4UNZQ>
.
|
Ok I will make a PR and check the things. |
|
I'm closing this again to open another with only the test and config files. |
6 participants
Has also created this at
bevacqua/woofmarkhere bevacqua#73