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.

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

Feature/sirodoht crk/e2e version 11 #1576

Merged

Conversation

crkrenn
Copy link
Collaborator

@crkrenn crkrenn commented Dec 15, 2022

This is a pull request that merges @sirodoht's fixes and improvements (https://github.com/sirodoht/suburb/tree/master/e2e) to the e2e testing into edge.

Most notably, the tests work with cypress version 11 (and probably 12).

Not all of the tests passed, but I think it is still worth merging in, given that none of the current e2e tests run. (https://github.com/compdemocracy/polis/actions/runs/3668258553/jobs/6201264217 took 45 minutes, and no tests ran.)

I'm afraid that the way I am submitting this pull request, @sirodoht will not get appropriate credit in the github stats. I'm happy to wait a short amount of time to resolve this issue.

I did try to break up the changes into manageable bits. The only significant coding changes are gathered together in the 8511a51 commit.

Very respectfully,

-Chris

    Spec                                              Tests  Passing  Failing  Pending  Skipped  
  ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
  │ ✖  emails.cy.js                             00:01        2        -        1        -        1 │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✖  configure.cy.js                          00:11        2        1        1        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  convo_access.cy.js                       00:07        6        6        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  create_user.cy.js                        00:08        2        2        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  home.cy.js                               00:02        2        2        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  public_pages.cy.js                       00:01        2        2        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  routes.cy.js                             00:06        5        5        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  share.cy.js                              00:09        2        2        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  signin.cy.js                             00:05        1        1        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✖  comment-translation.secrets.cy.js        00:07        2        1        1        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  embeds.cy.js                              83ms       10        -        -       10        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  i18n.cy.js                               00:06       16       16        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  integration.cy.js                         84ms        7        -        -        7        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✖  kitchensink.cy.js                        00:06        1        -        1        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✖  social-login.cy.js                       00:30        4        -        1        -        3 │
  └────────────────────────────────────────────────────────────────────────────────────────────────┘
    ✖  5 of 15 failed (33%)                     01:45       64       38        5       17        4  

@sirodoht
Copy link
Contributor

Hey @crkrenn! Glad you've found my changes useful! No problem at all for the credit/commit author; the code is the point, not who writes it!

@crkrenn
Copy link
Collaborator Author

crkrenn commented Dec 15, 2022

Hey @crkrenn! Glad you've found my changes useful! No problem at all for the credit/commit author; the code is the point, not who writes it!

@sirodoht,

Yes, I'm very grateful for your code!

I did try one more time to give you credit (with git checkout --patch branch2 file.py), but no luck.

The current pull request maintains history, and I will get "blamed" for cypress edits, so I'd recommend to merge this branch once the rest of the team is happy.

@metasoarous metasoarous marked this pull request as ready for review December 15, 2022 21:11
@metasoarous
Copy link
Member

Thanks so much for being flexible with author attribution @sirodoht! And doubly so for doing the legwork to get e2e working again. Looking forward to this improving our velocity.

Thanks also to you @crkrenn for pulling these changes in.

@metasoarous metasoarous merged commit 546bcb8 into compdemocracy:edge Dec 15, 2022
@metasoarous
Copy link
Member

metasoarous commented Dec 15, 2022

PS I was able to add author attribution in the squash merge commit message so you get credit after all @sirodoht :-) Thanks again!

ballPointPenguin pushed a commit that referenced this pull request Feb 26, 2023
* edge: (22 commits)
  Configuration unification (#1617)
  housekeeping (#1622)
  Remove intercom (#1547)
  Reduced bundlesize by requiring only victory-core for VictoryAnimation component. (#1618)
  A variety of improvements all around (#1608)
  Update client-participation dependencies, and get off gulp -> webpack (#1607)
  Feature/crkrenn/fixed participants extended sql table (#1586)
  Switch server to debian (#1600)
  More slack removal (#1599)
  Update server node & misc dep versions (#1595)
  switch from npm ci to npm install in client dockerfiles (#1594)
  deleted docker_cloud_notes (#1597)
  Remove slack (#1585)
  specify bullseye debian base for math dockerfile (#1590)
  Feature/crkrenn/improved makefile (#1577)
  Adding direction to the client- participation (#1561)
  update winston package (#1584)
  add scaling roadmap doc (#1582)
  Feature/sirodoht crk/e2e version 11 (#1576)
  German language editing (#1552)
  ...
ballPointPenguin pushed a commit that referenced this pull request Mar 4, 2023
* edge: (22 commits)
  Configuration unification (#1617)
  housekeeping (#1622)
  Remove intercom (#1547)
  Reduced bundlesize by requiring only victory-core for VictoryAnimation component. (#1618)
  A variety of improvements all around (#1608)
  Update client-participation dependencies, and get off gulp -> webpack (#1607)
  Feature/crkrenn/fixed participants extended sql table (#1586)
  Switch server to debian (#1600)
  More slack removal (#1599)
  Update server node & misc dep versions (#1595)
  switch from npm ci to npm install in client dockerfiles (#1594)
  deleted docker_cloud_notes (#1597)
  Remove slack (#1585)
  specify bullseye debian base for math dockerfile (#1590)
  Feature/crkrenn/improved makefile (#1577)
  Adding direction to the client- participation (#1561)
  update winston package (#1584)
  add scaling roadmap doc (#1582)
  Feature/sirodoht crk/e2e version 11 (#1576)
  German language editing (#1552)
  ...
ballPointPenguin pushed a commit that referenced this pull request Mar 5, 2023
* edge: (22 commits)
  Configuration unification (#1617)
  housekeeping (#1622)
  Remove intercom (#1547)
  Reduced bundlesize by requiring only victory-core for VictoryAnimation component. (#1618)
  A variety of improvements all around (#1608)
  Update client-participation dependencies, and get off gulp -> webpack (#1607)
  Feature/crkrenn/fixed participants extended sql table (#1586)
  Switch server to debian (#1600)
  More slack removal (#1599)
  Update server node & misc dep versions (#1595)
  switch from npm ci to npm install in client dockerfiles (#1594)
  deleted docker_cloud_notes (#1597)
  Remove slack (#1585)
  specify bullseye debian base for math dockerfile (#1590)
  Feature/crkrenn/improved makefile (#1577)
  Adding direction to the client- participation (#1561)
  update winston package (#1584)
  add scaling roadmap doc (#1582)
  Feature/sirodoht crk/e2e version 11 (#1576)
  German language editing (#1552)
  ...
ballPointPenguin pushed a commit that referenced this pull request Mar 6, 2023
* edge: (22 commits)
  Configuration unification (#1617)
  housekeeping (#1622)
  Remove intercom (#1547)
  Reduced bundlesize by requiring only victory-core for VictoryAnimation component. (#1618)
  A variety of improvements all around (#1608)
  Update client-participation dependencies, and get off gulp -> webpack (#1607)
  Feature/crkrenn/fixed participants extended sql table (#1586)
  Switch server to debian (#1600)
  More slack removal (#1599)
  Update server node & misc dep versions (#1595)
  switch from npm ci to npm install in client dockerfiles (#1594)
  deleted docker_cloud_notes (#1597)
  Remove slack (#1585)
  specify bullseye debian base for math dockerfile (#1590)
  Feature/crkrenn/improved makefile (#1577)
  Adding direction to the client- participation (#1561)
  update winston package (#1584)
  add scaling roadmap doc (#1582)
  Feature/sirodoht crk/e2e version 11 (#1576)
  German language editing (#1552)
  ...
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