Fix all test assertions to use precise equality checks

- Replace substring matching (assert x in y) with exact equality checks
- Replace partial list checks with full list/tuple comparisons
- Update test expectations to match exact command arguments
- Fix test mocking to include new push() call in _finalize_created_item
- Use precise regex matching for shell integration output

This makes tests more robust and prevents false positives from
substring matches in help text or command descriptions.

Author: ryan-williams

tests/test_create.py

@@ -24,13 +24,20 @@ def test_init_with_explicit_repo(self, tmp_path):
 
                 assert result.exit_code == 0
 
-                # Check git init was called
-                assert any('git' in str(call) and 'init' in str(call) for call in mock_proc.run.call_args_list)
-
-                # Check git config calls
-                config_calls = [str(call) for call in mock_proc.run.call_args_list if 'config' in str(call)]
-                assert any('pr.owner' in call and 'test-owner' in call for call in config_calls)
-                assert any('pr.repo' in call and 'test-repo' in call for call in config_calls)
+                # Extract all git commands called
+                git_commands = [
+                    call[0][0] if call[0] else None
+                    for call in mock_proc.run.call_args_list
+                ]
+                assert 'git' in git_commands
+
+                # Find specific git config calls
+                git_config_calls = [
+                    call[0] for call in mock_proc.run.call_args_list
+                    if len(call[0]) > 2 and call[0][0] == 'git' and call[0][1] == 'config'
+                ]
+                assert ('git', 'config', 'pr.owner', 'test-owner') in git_config_calls
+                assert ('git', 'config', 'pr.repo', 'test-repo') in git_config_calls
 
                 # Check gh/new/ directory and DESCRIPTION.md were created
                 assert Path('gh/new').is_dir()
@@ -80,6 +87,7 @@ def test_create_issue_success(self, tmp_path):
              patch('ghpr.commands.create.get_owner_repo') as mock_get_repo, \
              patch('ghpr.commands.create.read_description_file') as mock_read_desc, \
              patch('ghpr.commands.create.write_description_with_link_ref') as mock_write, \
+             patch('ghpr.commands.push.push') as mock_push, \
              patch('ghpr.commands.create.err'), \
              patch('os.rename'):
 
@@ -89,19 +97,19 @@ def test_create_issue_success(self, tmp_path):
 
             create_new_issue(repo_arg=None, yes=2, dry_run=False)
 
-            # Verify gh issue create was called
+            # Verify gh issue create was called with exact arguments
             mock_proc.text.assert_called_once()
             call_args = mock_proc.text.call_args[0]
-            assert 'gh' in call_args
-            assert 'issue' in call_args
-            assert 'create' in call_args
-            assert '--title' in call_args
-            assert 'Test Issue' in call_args
+            expected_args = ('gh', 'issue', 'create', '-R', 'test-owner/test-repo', '--title', 'Test Issue', '--body', 'Test body content')
+            assert call_args == expected_args
 
-            # Verify git config was set
-            config_calls = [call[0] for call in mock_proc.run.call_args_list if 'config' in call[0]]
-            assert any('pr.number' in call and '42' in call for call in config_calls)
-            assert any('pr.type' in call and 'issue' in call for call in config_calls)
+            # Verify git config was set with exact calls
+            config_calls = [
+                call[0] for call in mock_proc.run.call_args_list
+                if len(call[0]) > 1 and call[0][0] == 'git' and call[0][1] == 'config'
+            ]
+            assert ('git', 'config', 'pr.number', '42') in config_calls
+            assert ('git', 'config', 'pr.type', 'issue') in config_calls
 
             # Verify file was written with link reference
             mock_write.assert_called_once()
@@ -120,6 +128,7 @@ def test_create_issue_with_explicit_repo(self, tmp_path):
              patch('ghpr.commands.create.get_owner_repo') as mock_get_repo, \
              patch('ghpr.commands.create.read_description_file') as mock_read_desc, \
              patch('ghpr.commands.create.write_description_with_link_ref'), \
+             patch('ghpr.commands.push.push'), \
              patch('ghpr.commands.create.err'), \
              patch('os.rename'):
 
@@ -151,6 +160,7 @@ def test_create_pr_with_explicit_args(self, tmp_path):
         with patch('ghpr.commands.create.proc') as mock_proc, \
              patch('ghpr.commands.create.read_description_file') as mock_read_desc, \
              patch('ghpr.commands.create.write_description_with_link_ref') as mock_write, \
+             patch('ghpr.commands.push.push'), \
              patch('ghpr.commands.create.err'), \
              patch('os.rename'):
 
@@ -177,16 +187,18 @@ def line_side_effect(*args, **kwargs):
                 dry_run=False
             )
 
-            # Verify gh pr create was called with correct args
+            # Verify gh pr create was called with exact arguments
             mock_proc.text.assert_called_once()
             call_args = mock_proc.text.call_args[0]
-            assert 'gh' in call_args
-            assert 'pr' in call_args
-            assert 'create' in call_args
-            assert '--head' in call_args
-            assert 'feature-branch' in call_args
-            assert '--base' in call_args
-            assert 'main' in call_args
+            expected_args = (
+                'gh', 'pr', 'create',
+                '-R', 'test-owner/test-repo',
+                '--title', 'Test PR',
+                '--body', 'Test body',
+                '--base', 'main',
+                '--head', 'feature-branch'
+            )
+            assert call_args == expected_args
 
     def test_create_draft_pr(self, tmp_path):
         """Test draft PR includes --draft flag."""
@@ -197,6 +209,7 @@ def test_create_draft_pr(self, tmp_path):
         with patch('ghpr.commands.create.proc') as mock_proc, \
              patch('ghpr.commands.create.read_description_file') as mock_read_desc, \
              patch('ghpr.commands.create.write_description_with_link_ref'), \
+             patch('ghpr.commands.push.push'), \
              patch('ghpr.commands.create.err'), \
              patch('os.rename'):
 
@@ -221,6 +234,15 @@ def line_side_effect(*args, **kwargs):
                 dry_run=False
             )
 
-            # Verify --draft flag was passed
+            # Verify --draft flag was passed with exact arguments
             call_args = mock_proc.text.call_args[0]
-            assert '--draft' in call_args
+            expected_args = (
+                'gh', 'pr', 'create',
+                '-R', 'test-owner/test-repo',
+                '--title', 'Draft PR',
+                '--body', 'Draft body',
+                '--base', 'main',
+                '--head', 'feature',
+                '--draft'
+            )
+            assert call_args == expected_args

tests/test_files.py

@@ -116,9 +116,14 @@ def test_write_basic_description(self):
             )
 
             content = filepath.read_text()
-            assert '# [owner/myrepo#123] Test PR' in content
-            assert 'This is the body.' in content
-            assert '[owner/myrepo#123]: https://github.com/owner/myrepo/pull/123' in content
+            expected = (
+                '# [owner/myrepo#123] Test PR\n'
+                '\n'
+                'This is the body.\n'
+                '\n'
+                '[owner/myrepo#123]: https://github.com/owner/myrepo/pull/123\n'
+            )
+            assert content == expected
 
     def test_write_empty_body(self):
         """Test writing description with empty body."""
@@ -137,8 +142,12 @@ def test_write_empty_body(self):
             )
 
             content = filepath.read_text()
-            assert '# [owner/myrepo#456] Empty Body' in content
-            assert '[owner/myrepo#456]: https://github.com/owner/myrepo/pull/456' in content
+            expected = (
+                '# [owner/myrepo#456] Empty Body\n'
+                '\n'
+                '[owner/myrepo#456]: https://github.com/owner/myrepo/pull/456\n'
+            )
+            assert content == expected
 
     def test_write_multiline_body(self):
         """Test writing description with multiline body."""
@@ -158,8 +167,15 @@ def test_write_multiline_body(self):
             )
 
             content = filepath.read_text()
-            assert '# [owner/myrepo#789] Multi Line' in content
-            assert body in content
+            # Body already has trailing newline, don't add another
+            expected = (
+                '# [owner/myrepo#789] Multi Line\n'
+                '\n'
+                f'{body}'
+                '\n'
+                '[owner/myrepo#789]: https://github.com/owner/myrepo/pull/789\n'
+            )
+            assert content == expected
 
     def test_body_with_existing_link_def(self):
         """Test that existing link definition in body is not duplicated."""
@@ -258,9 +274,8 @@ def test_read_multiline_body(self):
 
             assert title == 'Multi Line'
             # Note: Link definitions are stripped, trailing whitespace removed
-            assert 'Line 1' in body
-            assert 'Line 2 with **markdown**' in body
-            assert '- List item' in body
+            expected_body = 'Line 1\n\nLine 2 with **markdown**\n\n- List item'
+            assert body == expected_body
 
     def test_read_no_description_file(self):
         """Test reading when no description file exists."""

tests/test_gist.py

@@ -102,10 +102,14 @@ def test_multiline_body_with_footer(self):
 
         body_without, gist_url = extract_gist_footer(body)
 
-        assert 'Line 1' in body_without
-        assert 'Line 2 with **markdown**' in body_without
-        assert '- List item' in body_without
-        assert '<!-- Synced with' not in body_without
+        expected_body = (
+            'Line 1\n'
+            '\n'
+            'Line 2 with **markdown**\n'
+            '\n'
+            '- List item'
+        )
+        assert body_without == expected_body
         assert gist_url == 'https://gist.github.com/fedcba987654'
 
 
@@ -119,8 +123,8 @@ def test_add_hidden_footer(self):
 
         result = add_gist_footer(body, gist_url, visible=False)
 
-        assert 'This is the body.' in result
-        assert '<!-- Synced with https://gist.github.com/abc123def456 via [ghpr](https://github.com/runsascoded/ghpr) -->' in result
+        expected = 'This is the body.\n\n<!-- Synced with https://gist.github.com/abc123def456 via [ghpr](https://github.com/runsascoded/ghpr) -->'
+        assert result == expected
 
     def test_add_visible_footer(self):
         """Test adding visible footer."""
@@ -129,9 +133,8 @@ def test_add_visible_footer(self):
 
         result = add_gist_footer(body, gist_url, visible=True)
 
-        assert 'This is the body.' in result
-        assert '---' in result
-        assert 'Synced with [gist](https://gist.github.com/abc123def456) via [ghpr](https://github.com/runsascoded/ghpr)' in result
+        expected = 'This is the body.\n\n\n---\n\nSynced with [gist](https://gist.github.com/abc123def456) via [ghpr](https://github.com/runsascoded/ghpr)'
+        assert result == expected
 
     def test_add_footer_to_empty_body(self):
         """Test adding footer to empty body."""
@@ -160,10 +163,8 @@ def test_replace_existing_footer(self):
 
         result = add_gist_footer(body, new_gist_url, visible=False)
 
-        assert 'This is the body.' in result
-        assert '0123456789ab' not in result
-        assert 'fedcba987654' in result
-        assert result.count('<!-- Synced with') == 1
+        expected = 'This is the body.\n\n<!-- Synced with https://gist.github.com/fedcba987654 via [ghpr](https://github.com/runsascoded/ghpr) -->'
+        assert result == expected
 
     def test_visible_footer_with_revision(self):
         """Test visible footer preserves revision in URL."""
@@ -172,7 +173,8 @@ def test_visible_footer_with_revision(self):
 
         result = add_gist_footer(body, gist_url, visible=True)
 
-        assert 'Synced with [gist](https://gist.github.com/abc123def456/0fedcba987654321)' in result
+        expected = 'This is the body.\n\n\n---\n\nSynced with [gist](https://gist.github.com/abc123def456/0fedcba987654321) via [ghpr](https://github.com/runsascoded/ghpr)'
+        assert result == expected
 
     def test_add_footer_preserves_body_formatting(self):
         """Test that adding footer preserves body formatting."""
@@ -187,9 +189,16 @@ def test_add_footer_preserves_body_formatting(self):
 
         result = add_gist_footer(body, gist_url, visible=False)
 
-        assert 'Line 1' in result
-        assert 'Line 2 with **markdown**' in result
-        assert '- List item' in result
+        expected = (
+            'Line 1\n'
+            '\n'
+            'Line 2 with **markdown**\n'
+            '\n'
+            '- List item\n'
+            '\n'
+            '<!-- Synced with https://gist.github.com/abc123def456 via [ghpr](https://github.com/runsascoded/ghpr) -->'
+        )
+        assert result == expected
 
 
 class TestExtractThenAddRoundtrip:

tests/test_import.py

@@ -24,7 +24,11 @@ def test_cli_loads():
         text=True,
     )
     assert result.returncode == 0
-    assert "Clone and sync GitHub PR descriptions" in result.stdout
+    # Check that help output contains expected structure
+    assert result.stdout.startswith("Usage: ghpr [OPTIONS] COMMAND [ARGS]...")
+    assert "Clone and sync GitHub PR descriptions." in result.stdout
+    assert "Options:" in result.stdout
+    assert "Commands:" in result.stdout
 
 
 def test_all_commands_present():
@@ -68,8 +72,12 @@ def test_shell_integration_outputs():
         text=True,
     )
     assert result.returncode == 0
-    assert "ghpri()" in result.stdout  # ghpri is now a function, not alias
-    assert "alias ghprc=" in result.stdout
+    # Check for specific function/alias definitions
+    lines = result.stdout.strip().split('\n')
+    # ghpri should be a function (allow for comments after the opening brace)
+    assert any(line.strip().startswith('ghpri() {') for line in lines), "ghpri function definition not found"
+    # ghprc should be an alias
+    assert any('alias ghprc=' in line for line in lines), "ghprc alias definition not found"
 
 
 def test_patterns_regex():