So we are continuing on the journey of upgrading your Rails application in smallish steps. In this phase, we want to get all the tests we skip or marked as pending in Phase 3 passing now. Any big refactorings that are required are suggested to be done as separate tickets/stories.

Goal: Have all the tests passing. Once merged the test suite will always be green for both versions

Suggested Steps:

1. Create an “All tests passing on both versions” story and plan according to your process.
2. Once you start on the story: Create a branch for it
3. Attempt to Get the pending upgrade specs working
4. 1. Attempt to resolve any minor issues immediately
   2. Create new refactor stories as required
5. If you created new refactor stories
6. 1. Merge as much as you can into the main branch
   2. mark the main story as attempted/done/finish/etc
   3. plan the new refactor stories according to your process
   4. once new stories are done, start from Step 1 again
7. Run the specs on CI
8. Wait for a green build
9. remove pending_on_upgrade helper
10. Add the changes to version control
11. Share with the team that tests have to work on both versions
12. Merge the branch into master