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

Update Prepop branch with changes from main #1153

Merged
merged 25 commits into from
Jul 5, 2023

Conversation

MebinAbraham
Copy link
Contributor

What is the context of this PR?

Updates feature-prepop with changes from main.

How to review

Ensure the changes looks correct + all tests pass

Checklist

  • New static content marked up for translation
  • Newly defined schema content included in eq-translations repo

petechd and others added 22 commits May 18, 2023 10:52
* update chromedriver

* temporarily comment out line, to be fixed separately
* initial ideas

* Implementation closer to calculated summaries

* better test schemas and routing evaluation

* get routing working

* dont need section id

* make routing better, start adding tests

* start fixing test schemas

* Two further schema fixes

* Fix remaining schema issue

* Add integration test

* Add functional test

* Functional tests for routing and answers not on the path

* Changing an answer updates GCS progress

* Add schema for overlapping answers

* Functionally test skip-question in grand calculated summary

* Add tests for GCS routing

* Fix errors caused by merge

* type hints, comments, remove some duplication

* fix formatting

* Update translation templates

* remove accidental update

* Fix some type hints

* Use validator branch and update test description

* refactor GCS answer format

* Fix lint and test errors

* Address PR comments

* improve context and coverage of test schemas

* Fix invalid schema and add invalid routing test

* Fix line length in test

* test schema linting

* Fix routing bug

* Make schema easier to follow

* Linting

* partial fix to routing

* Add addtional routing test case

* Remove arg from new test case

* Routing to next incomplete block for summaries

* linting error

* remove arg from router tests

* PR comments

* PR Comment

* Amend comment and improve dependencies function

* Handle merge errors

* fix gcs routing within same section

* Add test for GCS with progress value source

* Remove backtick

* update chromedriver

* Revert "update chromedriver"

This reverts commit a2e3698.

* Fix schema labels

* Revert validator branch to latest
Copy link
Contributor

@katie-gardner katie-gardner left a comment

Choose a reason for hiding this comment

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

I think merge conflict resolution might have resulted in Petes changes being omitted - can't see his fix to jinja_filters.py anymore which I think is why the test is failing

@MebinAbraham
Copy link
Contributor Author

MebinAbraham commented Jul 4, 2023

I think merge conflict resolution might have resulted in Petes changes being omitted - can't see his fix to jinja_filters.py anymore which I think is why the test is failing

Yup bad merge, will sort, unit test picked it up 👍

EDIT: Fixed.

@MebinAbraham MebinAbraham changed the title Update Prepop branch with changes from main (#1117) Update Prepop branch with changes from main Jul 4, 2023
@MebinAbraham MebinAbraham force-pushed the merge-main-into-feature-prepop branch from cbe7b35 to 3a3031d Compare July 4, 2023 16:19
Copy link
Contributor

@kylelawsonAND kylelawsonAND left a comment

Choose a reason for hiding this comment

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

LGTM - tests passing as normal, changes look like they've come through okay after merge

@MebinAbraham MebinAbraham merged commit bfaf732 into feature-prepop Jul 5, 2023
@MebinAbraham MebinAbraham deleted the merge-main-into-feature-prepop branch July 5, 2023 11:31
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.

6 participants