Skip to content

Partial reverse of 74222e4 to remove the monthly contributor error dialog #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarcelGeo merged 3 commits into from
Jan 16, 2025
Merged

Partial reverse of 74222e4 to remove the monthly contributor error dialog #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41ae3ac
Partial reverse of 74222e4 to remove the monthly contributor error di…
ValentinBuira Jan 15, 2025
413ada4
Merge branch 'master' into revert-monthly-contributor
ValentinBuira Jan 16, 2025
ea7ef0e
style
ValentinBuira Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion mergin/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
class ErrorCode(Enum):
ProjectsLimitHit = "ProjectsLimitHit"
StorageLimitHit = "StorageLimitHit"
MonthlyContributorsLimitHit = "MonthlyContributorsLimitHit"


class ClientError(Exception):
Expand Down
39 changes: 1 addition & 38 deletions mergin/test/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@


def get_limit_overrides(storage: int):
return {"storage": storage, "projects": 2, "api_allowed": True, "monthly_contributors": -1}
return {"storage": storage, "projects": 2, "api_allowed": True}


@pytest.fixture(scope="function")
Expand Down Expand Up @@ -2719,43 +2719,6 @@ def test_error_projects_limit_hit(mcStorage: MerginClient):
assert e.value.url == f"{mcStorage.url}v1/project/testpluginstorage"


# TODO: refactor tests to create workspaces on each run and apply test_error_monthly_contributors_limit_hit
def test_error_monthly_contributors_limit_hit(mcStorage: MerginClient):
test_project = "test_monthly_contributors_limit_hit"
project_dir = os.path.join(TMP_DIR, test_project)
test_project_fullname = STORAGE_WORKSPACE + "/" + test_project
cleanup(mcStorage, test_project_fullname, [project_dir])

client_workspace = None
for workspace in mcStorage.workspaces_list():
if workspace["name"] == STORAGE_WORKSPACE:
client_workspace = workspace
break

client_workspace_id = client_workspace["id"]
client_workspace_storage = client_workspace["storage"]
mcStorage.patch(
f"/v1/tests/workspaces/{client_workspace_id}",
{"limits_override": {**get_limit_overrides(client_workspace_storage), "monthly_contributors": 0}},
{"Content-Type": "application/json"},
)

mcStorage.create_project_and_push(test_project_fullname, project_dir)
shutil.copy(os.path.join(TEST_DATA_DIR, "test.txt"), project_dir)
with pytest.raises(ClientError) as e:
mcStorage.push_project(project_dir)

assert e.value.server_code == ErrorCode.MonthlyContributorsLimitHit.value
assert e.value.detail == (
"Maximum number of workspace contributors is reached. "
"Please upgrade your subscription to push changes or create projects. (MonthlyContributorsLimitHit)"
)
assert e.value.http_error == 422
assert e.value.http_method == "POST"
assert e.value.url == f"{mcStorage.url}v1/project/push/testpluginstorage/{test_project}"
assert e.value.server_response.get("contributors_quota") == 0


def test_workspace_requests(mc2: MerginClient):
test_project = "test_permissions"
test_project_fullname = API_USER2 + "/" + test_project
Expand Down
Loading