Skip to content

Commit

Permalink
Merge branch 'main' into feature/secureli-154-prompt-to-install-linters
Browse files Browse the repository at this point in the history
  • Loading branch information
kevin-orlando authored Nov 10, 2023
2 parents c0a4c81 + af842fb commit 5f8be36
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ A special thanks to everyone that has contributed to seCureLI so far:
- Korey Earl
- Martin Gallegos
- Ryan Graue
- Tyler Durkota
- Jordan Hill
- Kira Hollerman
- Myung Kim
Expand Down
2 changes: 1 addition & 1 deletion secureli/utilities/git_meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def origin_url() -> str:
git_config_parser = configparser.ConfigParser()
git_config_parser.read(".git/config")
return (
git_config_parser['remote "origin"'].get("url", "UNKNOWN")
git_config_parser['remote "origin"'].get("url", "UNKNOWN", raw=True)
if git_config_parser.has_section('remote "origin"')
else "UNKNOWN"
)
Expand Down
17 changes: 17 additions & 0 deletions tests/utilities/test_git_meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

from secureli.utilities.git_meta import git_user_email, origin_url, current_branch_name

mock_git_origin_url = r"[email protected]:my-org/repo%20with%20spaces.git"


@pytest.fixture()
def mock_subprocess(mocker: MockerFixture) -> MagicMock:
Expand Down Expand Up @@ -36,6 +38,17 @@ def mock_open_git_head(mocker: MockerFixture) -> MagicMock:
return mock_open_git_head


@pytest.fixture()
def mock_open_git_origin(mocker: MockerFixture) -> MagicMock:
mock_open_git_config = mocker.mock_open(
read_data='[remote "origin"]'
f"\n url = {mock_git_origin_url}"
"\n fetch = +refs/heads/*:refs/remotes/origin/*"
)
mocker.patch("builtins.open", mock_open_git_config)
return mock_open_git_config


@pytest.fixture()
def mock_open_io_error(mocker: MockerFixture) -> MagicMock:
mock_open_io_error = mocker.patch("builtins.open")
Expand Down Expand Up @@ -71,3 +84,7 @@ def test_current_branch_name_yields_unknown_due_to_io_error(
result = current_branch_name()

assert result == "UNKNOWN"


def test_configparser_can_read_origin_url_with_percent(mock_open_git_origin: MagicMock):
assert origin_url() == mock_git_origin_url

0 comments on commit 5f8be36

Please sign in to comment.