Fixes for tests in 13 #257
Conversation
| @@ -598,7 +599,7 @@ Let's put an early return in the FT to separate | |||
| what we got working from those that still need to be dealt with: | |||
|
|
|||
| [role="sourcecode"] | |||
| .src/functional_tests/test_list_item_validation.py (ch13l???) | |||
| .src/functional_tests/test_list_item_validation.py (ch13l030-3) | |||
There was a problem hiding this comment.
new commit id, see new history in https://github.com/hjwp/book-example/commits/chapter_13_database_layer_validation/
There was a problem hiding this comment.
This is related to #240
| @@ -608,8 +609,7 @@ class ItemValidationTest(FunctionalTest): | |||
| self.browser.find_element(By.ID, "id_new_item").send_keys(Keys.ENTER) | |||
| self.wait_for_row_in_list_table("1: Buy milk") | |||
|
|
|||
| return | |||
| # TODO fix the remaining test scenarios | |||
| return # TODO re-enable the rest of this test. | |||
There was a problem hiding this comment.
decided to tweak this listing slightly. sorry i'm a micromanager! 😅
| selenium.common.exceptions.NoSuchElementException: Message: Unable to locate | ||
| element: .invalid-feedback; [...] | ||
| [...] | ||
| AssertionError: '2: Use peacock feathers to make a fly' not found in ['1: Buy |
There was a problem hiding this comment.
a nice side-effect of this fix - the book tests failed on this bit, saying it couldn't find this part of the traceback. sure enough, it's because this error was coming from the FT that we've put an early return in, so it doesn't actually appear any more.
this is exactly what the book tests are for, yay!
There was a problem hiding this comment.
Oh that's a nice catch!
| - | ||
| # Perversely, she now decides to submit a second blank list item | ||
| ---- | ||
| ==== |
There was a problem hiding this comment.
i thought i'd add the listing explicitly here. this causes the book tests to actually try and apply the code change.
there's also a magic way of applying commits by adding role=dofirst-ch13l0xx to the asciidoc source, but that's cheating. this is nice and exlicit.
also - sometimes it's nice to use source,diff as the listing type, and show a diff rather than a python syntax highlighted codeblock. works well here.
The tests here were failing because a couple of changes we made to the listings were not in sync witht he commit history of the branch in the
book-examplerepo. Here's how I fixed things at a high level:ch13l???.reset --hardto the commit just before where we want to add the early return code--ch13l030-3--at the end of the commit messagegit cherry-pickall the rest of the commits from the old commit historythat procedure,
reset --hard <commit N>+commit <new commit N+1>+git cherry-pick <old-commit-N+1...end>is one i use quite often. it's a bit like a rebase, rewriting history.Then I followed a similar procedure to introduce an extra commit for when we remove the early return as well. I added that to the book chapter text too.
Finally I noticed a problem with applying one of the later commits, it couldn't apply the commit patch successfully. I managed to figure out that was because of the change where we swapped the order of
form.save()andform.full_clean(). SO for that I did agit rebase --interactiveand marked the commit where we introduce that form.full_clean() for editing, and changed it to match the book.that gave me a conflict at the end of the rebase, which is expected, and so i fixed that..... i'm aware this explanation is getting a little abstract probably. but i thought it was good to write it down.
happy to go over this sort of procedure in detail with you one of these days! there just never seems to be enough timeeeeeeee. but, you have to invest time to make time! so.