Adding the search term to the title bar, removing with_search argument

tests/test_page.py

@@ -81,7 +81,7 @@ def test_page_unauthenticated(reddit, terminal, config, oauth):
         page.controller.trigger('3')
         page.refresh_content.assert_called_with(order='rising')
         page.controller.trigger('4')
-        page.refresh_content.assert_called_with(order='new', with_search=True)
+        page.refresh_content.assert_called_with(order='new')
 
         logged_in_methods = [
             'a',  # Upvote

tests/test_subreddit.py

@@ -87,6 +87,7 @@ def test_subreddit_title(subreddit_page, terminal, capsys):
 
 
 def test_subreddit_search(subreddit_page, terminal):
+    window = terminal.stdscr.subwin
 
     # Search the current subreddit
     with mock.patch.object(terminal, 'prompt_input'):
@@ -96,12 +97,31 @@ def test_subreddit_search(subreddit_page, terminal):
         assert terminal.prompt_input.called
         assert not terminal.loader.exception
 
+        # The page title should display the query
+        subreddit_page.draw()
+        title = 'Searching /r/python: search term'.encode('utf-8')
+        window.addstr.assert_any_call(0, 0, title)
+
+    # Ordering the results should preserve the query
+    window.addstr.reset_mock()
+    subreddit_page.refresh_content(order='hot')
+    subreddit_page.refresh_content(order='top-all')
+    subreddit_page.refresh_content(order='new')
+    assert subreddit_page.content.name == '/r/python'
+    assert subreddit_page.content.query == 'search term'
+    assert not terminal.loader.exception
+
     # Searching with an empty query shouldn't crash
     with mock.patch.object(terminal, 'prompt_input'):
         terminal.prompt_input.return_value = None
         subreddit_page.controller.trigger('f')
         assert not terminal.loader.exception
 
+    # Changing to a new subreddit should clear the query
+    window.addstr.reset_mock()
+    subreddit_page.refresh_content(name='/r/learnpython')
+    assert subreddit_page.content.query is None
+
 
 def test_subreddit_prompt(subreddit_page, terminal):